Merge fa75d46 into 02abed1

pattern-lab · May 4, 2020 · a8a3fa4 · a8a3fa4
2 parents 02abed1 + fa75d46
commit a8a3fa4
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 11 deletions.
diff --git a/packages/cli/test/fixtures/patternlab-config.json b/packages/cli/test/fixtures/patternlab-config.json
@@ -72,6 +72,7 @@
 	"patternStateCascade": ["inprogress", "inreview", "complete"],
 	"patternExportDirectory": "./pattern_exports/",
 	"patternExportPatternPartials": [],
+	"patternMergeVariantArrays": true,
 	"serverOptions": {
 		"wait": 1000
 	},

diff --git a/packages/core/patternlab-config.json b/packages/core/patternlab-config.json
@@ -75,6 +75,7 @@
   "patternExportPatternPartials": [],
   "patternExportPreserveDirectoryStructure": true,
   "patternExportRaw": false,
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },

diff --git a/packages/core/src/lib/pseudopattern_hunter.js b/packages/core/src/lib/pseudopattern_hunter.js
@@ -60,10 +60,21 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
       }
 
       //extend any existing data with variant data
-      variantFileData = _.merge(
+      variantFileData = _.mergeWith(
         {},
         currentPattern.jsonFileData,
-        variantFileData
+        variantFileData,
+        (objValue, srcValue) => {
+          if (
+            _.isArray(objValue) &&
+            patternlab.config.patternMergeVariantArrays
+          ) {
+            return objValue.concat(srcValue);
+          }
+          // Lodash will only check for "undefined" and eslint needs a consistent
+          // return so do not remove
+          return undefined;
+        }
       );
 
       const variantName = pseudoPatterns[i]

diff --git a/packages/core/test/util/patternlab-config.json b/packages/core/test/util/patternlab-config.json
@@ -57,6 +57,7 @@
   "patternExportPatternPartials": [],
   "patternExportDirectory": "./pattern_exports/",
   "patternExtension": "mustache",
+  "patternMergeVariantArrays": true,
   "cacheBust": true,
   "outputFileSuffixes": {
     "rendered": ".rendered",

diff --git a/packages/development-edition-engine-handlebars/patternlab-config.json b/packages/development-edition-engine-handlebars/patternlab-config.json
@@ -70,6 +70,7 @@
   "patternExportPatternPartials": [],
   "patternExportPreserveDirectoryStructure": true,
   "patternExportRaw": false,
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },

diff --git a/packages/development-edition-engine-react/patternlab-config.json b/packages/development-edition-engine-react/patternlab-config.json
@@ -25,16 +25,7 @@
     "m": [500, 800],
     "l": [800, 2600]
   },
-<<<<<<< HEAD:packages/development-edition-engine-react/patternlab-config.json
   "logLevel": "info",
-=======
-  "patternExportAll": false,
-  "patternExportPreserveDirectoryStructure": false,
-  "patternExportRaw": false,
-  "patternExportPatternPartials": [],
-  "patternExportDirectory": "./pattern_exports/",
-  "cacheBust": true,
->>>>>>> 436dd99e50d808cd14691593b927209f1ecb663e:patternlab-config.json
   "outputFileSuffixes": {
     "rendered": ".rendered",
     "rawTemplate": "",
@@ -79,8 +70,12 @@
   },
   "patternExtension": "mustache",
   "patternStateCascade": ["inprogress", "inreview", "complete"],
+  "patternExportAll": false,
+  "patternExportPreserveDirectoryStructure": false,
+  "patternExportRaw": false,
   "patternExportDirectory": "./pattern_exports/",
   "patternExportPatternPartials": [],
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },

diff --git a/packages/development-edition-engine-twig/patternlab-config.json b/packages/development-edition-engine-twig/patternlab-config.json
@@ -80,6 +80,7 @@
   ],
   "patternExportDirectory": "pattern_exports",
   "patternExportPatternPartials": [],
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },

diff --git a/packages/edition-node-gulp/patternlab-config.json b/packages/edition-node-gulp/patternlab-config.json
@@ -75,6 +75,7 @@
   "patternExportPatternPartials": [],
   "patternExportPreserveDirectoryStructure": true,
   "patternExportRaw": false,
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },

diff --git a/packages/edition-node/patternlab-config.json b/packages/edition-node/patternlab-config.json
@@ -75,6 +75,7 @@
   "patternExportPatternPartials": [],
   "patternExportPreserveDirectoryStructure": true,
   "patternExportRaw": false,
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },

diff --git a/packages/edition-twig/patternlab-config.json b/packages/edition-twig/patternlab-config.json
@@ -139,6 +139,7 @@
   "patternExportPatternPartials": [],
   "patternExportPreserveDirectoryStructure": true,
   "patternExportRaw": false,
+  "patternMergeVariantArrays": true,
   "serverOptions": {
     "wait": 1000
   },