From 122fffea992198afc9bcc4d2a994e11c2aa3174e Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sun, 29 Apr 2018 14:05:45 +0200
Subject: [PATCH] Fix pathRules migration (#1885)
Fix pathRules migration
---
lib/config/migration.js | 7 ++++---
test/config/__snapshots__/migration.spec.js.snap | 12 +-----------
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/lib/config/migration.js b/lib/config/migration.js
index 1153f98082..fc7682d4a2 100644
--- a/lib/config/migration.js
+++ b/lib/config/migration.js
@@ -20,6 +20,7 @@ const removedOptions = [
'groupCommitMessage',
'groupPrTitle',
'groupPrBody',
+ 'pathRules',
];
// Returns a migrated config
@@ -37,10 +38,10 @@ function migrateConfig(config) {
Array.isArray(migratedConfig.pathRules) &&
migratedConfig.pathRules.length
) {
- migratedConfig.packageRules = (migratedConfig.pathRules || []).concat(
- config.packageRules
+ isMigrated = true;
+ migratedConfig.packageRules = migratedConfig.pathRules.concat(
+ migratedConfig.packageRules || []
);
- delete migratedConfig.pathRules;
}
for (const [key, val] of Object.entries(config)) {
if (removedOptions.includes(key)) {
diff --git a/test/config/__snapshots__/migration.spec.js.snap b/test/config/__snapshots__/migration.spec.js.snap
index 2fdcf10753..e15ba3d3f3 100644
--- a/test/config/__snapshots__/migration.spec.js.snap
+++ b/test/config/__snapshots__/migration.spec.js.snap
@@ -45,7 +45,7 @@ Object {
"automerge": true,
},
"nvmrc": Object {
- "pathRules": Array [
+ "packageRules": Array [
Object {
"extends": Array [
"node",
@@ -92,16 +92,6 @@ Object {
"patch": Object {
"automerge": true,
},
- "pathRules": Array [
- Object {
- "extends": Array [
- "foo",
- ],
- "paths": Array [
- "examples/**",
- ],
- },
- ],
"prTitle": "{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}some pr title",
"schedule": "on the first day of the month",
"semanticCommitScope": "deps",
--
GitLab