feat(cli): if starterkit has pl config, deep merge it in

Author: EvanLovely

packages/cli/bin/cli-actions/init.js

@@ -1,5 +1,6 @@
 'use strict';
 const patternlab = require('@pattern-lab/core');
+const merge = require('deepmerge');
 const ask = require('../ask');
 const scaffold = require('../scaffold');
 const installEdition = require('../install-edition');
@@ -50,14 +51,22 @@ const init = options =>
         patternlabConfig,
         projectDir
       ); // 3.1
-      patternlabConfig = Object.assign(patternlabConfig, newConf); // 3.2
+      if (newConf) {
+        patternlabConfig = merge(patternlabConfig, newConf); // 3.2
+      }
       spinner.succeed(`⊙ patternlab → Installed edition: ${edition}`);
     }
     if (starterkit) {
       spinner.text = `⊙ patternlab → Installing starterkit ${starterkit}`;
       spinner.start();
-      yield installStarterkit(starterkit, patternlabConfig);
+      const starterkitConfig = yield installStarterkit(
+        starterkit,
+        patternlabConfig
+      );
       spinner.succeed(`⊙ patternlab → Installed starterkit: ${starterkit}`);
+      if (starterkitConfig) {
+        patternlabConfig = merge(patternlabConfig, starterkitConfig);
+      }
     } // 4
     yield writeJsonAsync(
       path.resolve(projectDir, 'patternlab-config.json'),

packages/cli/bin/install-edition.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const merge = require('deepmerge');
 const EOL = require('os').EOL;
 const {
   checkAndInstallPackage,

packages/cli/bin/install-starterkit.js

@@ -1,20 +1,27 @@
 'use strict';
 const path = require('path');
-const checkAndInstallPackage = require('./utils').checkAndInstallPackage;
-const copyAsync = require('./utils').copyAsync;
-const wrapAsync = require('./utils').wrapAsync;
+const fs = require('fs-extra');
+const {
+  copyAsync,
+  wrapAsync,
+  checkAndInstallPackage,
+  readJsonAsync,
+} = require('./utils');
 
 const installStarterkit = (starterkit, config) =>
   wrapAsync(function*() {
     const sourceDir = config.paths.source.root;
     const name = starterkit.value || starterkit;
     const url = name.startsWith('@pattern-lab/') ? name : `pattern-lab/${name}`;
     yield checkAndInstallPackage(name, url);
-    yield copyAsync(
-      path.resolve('./node_modules', name, 'dist'),
-      path.resolve(sourceDir)
-    );
-    return name;
+    const kitPath = path.resolve('./node_modules', name);
+    yield copyAsync(path.resolve(kitPath, 'dist'), path.resolve(sourceDir));
+    let kitConfig;
+    const kitConfigPath = path.resolve(kitPath, 'patternlab-config.json');
+    if (fs.existsSync(kitConfigPath)) {
+      kitConfig = yield readJsonAsync(kitConfigPath);
+    }
+    return kitConfig;
   });
 
 module.exports = installStarterkit;

packages/cli/package.json

@@ -14,6 +14,7 @@
     "archiver": "2.1.1",
     "chalk": "2.4.1",
     "commander": "2.15.1",
+    "deepmerge": "^2.1.1",
     "execa": "0.10.0",
     "fs-extra": "6.0.1",
     "glob": "7.1.2",