Merge branch 'dev' into feature/1045--pseudo-twigphp

Author: sghoweri

.gitignore

@@ -5,6 +5,7 @@ Thumbs.db
 .nyc_output/
 .vscode/
 .idea/
+.env
 packages/core/test/public
 packages/*/public
 !packages/core/test/patterns/public/.gitkeep

package.json

@@ -10,7 +10,12 @@
     "eslint-plugin-prettier": "^3.1.0",
     "lerna": "3.11.0",
     "prettier": "^1.14.3",
-    "pretty-quick": "^1.11.1"
+    "pretty-quick": "^1.11.1",
+    "auto": "^7.8.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pattern-lab/patternlab-node.git"
   },
   "private": true,
   "scripts": {
@@ -22,7 +27,9 @@
     "lint:fix": "npm run lint -- --fix",
     "lint": "eslint --max-warnings 0 './packages/{core,cli,uikit-workshop}/**/*.js ' --ignore-path .eslintignore",
     "test": "lerna run test",
-    "clean": "git clean -dfx"
+    "clean": "git clean -dfx",
+    "publish": "npx lerna publish -m \"[skip travis] chore(release): publish %s\"",
+    "postpublish": "auto release"
   },
   "nyc": {
     "exclude": [

packages/cli/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2019-08-23)
+
+
+### Bug Fixes
+
+* **cli:** merge config arrays via overwrite instead of concatenate ([42e5f7b](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/42e5f7b))
+* **cli:** proper path resolution to helpers ([a18fe5e](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/a18fe5e))
+
+
+### BREAKING CHANGES
+
+* **cli:** previously, we concatenated arrays, which is unlikely to be intended
+
+
+
+
+
+# [0.1.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2019-08-23)
+
+
+### Bug Fixes
+
+* updates to fix eslint / prettier issues; update packages/core to reuse root .eslintrc.js file ([5b7a057](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/5b7a057))
+* **cli:** add custom install logic to edition-node ([f04fd26](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/f04fd26))
+* **cli:** re-order and clarify engines ([e39e301](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/e39e301))
+
+
+### Features
+
+* **starterkits:** add starterkit-handlebars-demo ([384d2cf](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/384d2cf))
+
+
+
+
+
+
 ## [0.0.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2019-05-16)
 
 **Note:** Version bump only for package @pattern-lab/cli

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

@@ -13,6 +13,9 @@ const writeJsonAsync = require('../utils').writeJsonAsync;
 
 const defaultPatternlabConfig = patternlab.getDefaultConfig();
 
+// https://github.com/TehShrike/deepmerge#overwrite-array
+const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
+
 const init = options =>
   wrapAsync(function*() {
     const sourceDir = 'source';
@@ -52,7 +55,9 @@ const init = options =>
         projectDir
       ); // 3.1
       if (newConf) {
-        patternlabConfig = merge(patternlabConfig, newConf); // 3.2
+        patternlabConfig = merge(patternlabConfig, newConf, {
+          arrayMerge: overwriteMerge,
+        }); // 3.2
       }
       spinner.succeed(`⊙ patternlab → Installed edition: ${edition}`);
     }
@@ -65,7 +70,9 @@ const init = options =>
       );
       spinner.succeed(`⊙ patternlab → Installed starterkit: ${starterkit}`);
       if (starterkitConfig) {
-        patternlabConfig = merge(patternlabConfig, starterkitConfig);
+        patternlabConfig = merge(patternlabConfig, starterkitConfig, {
+          arrayMerge: overwriteMerge,
+        });
       }
     } // 4
     yield writeJsonAsync(

packages/cli/bin/inquiries/edition.js

@@ -15,19 +15,15 @@ const editionSetup = [
     message: 'Which edition do you want to use (defaults to edition-node)?',
     choices: [
       {
-        name: 'edition-twig (php engine)',
-        value: '@pattern-lab/edition-twig',
-      },
-      {
-        name: 'edition-node',
+        name: 'edition-node (handlebars engine)',
         value: '@pattern-lab/edition-node',
       },
       {
-        name: 'edition-node-grunt',
-        value: '@pattern-lab/edition-node-grunt',
+        name: 'edition-twig (php engine)',
+        value: '@pattern-lab/edition-twig',
       },
       {
-        name: 'edition-node-gulp',
+        name: 'edition-node-gulp (legacy)',
         value: '@pattern-lab/edition-node-gulp',
       },
       new inquirer.Separator(),

packages/cli/bin/inquiries/starterkit.js

@@ -10,45 +10,34 @@ const starterkitSetup = [
     message: 'Which starterkit do you want to use?',
     choices: [
       {
-        name: 'starterkit-mustache-demo',
-        value: '@pattern-lab/starterkit-mustache-demo',
+        name: 'starterkit-handlebars-demo [Recommended]',
+        value: '@pattern-lab/starterkit-handlebars-demo',
       },
+      {
+        name: 'starterkit-twig-demo [Recommended]',
+        value: '@pattern-lab/starterkit-twig-demo',
+      },         
       {
         name: 'starterkit-mustache-bootstrap',
         value: 'starterkit-mustache-bootstrap',
-      },
+      },    
+      {
+        name: 'starterkit-mustache-demo',
+        value: '@pattern-lab/starterkit-mustache-demo',
+      },      
       {
         name: 'starterkit-mustache-foundation',
         value: 'starterkit-mustache-foundation',
-      },
-      // {
-      //   name: 'starterkit-twig-base',
-      //   value: 'starterkit-twig-base',
-      // },
-      {
-        name: 'starterkit-twig-demo',
-        value: '@pattern-lab/starterkit-twig-demo',
-      },
+      },      
       {
         name: 'starterkit-mustache-materialdesign',
         value: 'starterkit-mustache-materialdesign',
-      },
-      // {
-      //   name: 'starterkit-twig-drupal-demo',
-      //   value: 'starterkit-twig-drupal-demo',
-      // },
-      // {
-      //   name: 'starterkit-twig-drupal-minimal',
-      //   value: 'starterkit-twig-drupal-minimal',
-      // },
-      {
-        name: 'starterkit-mustache-webdesignday',
-        value: 'starterkit-mustache-webdesignday',
-      },
+      },      
       {
         name: 'starterkit-mustache-base',
         value: '@pattern-lab/starterkit-mustache-base',
       },
+   
       new inquirer.Separator(),
       {
         name: 'Custom starterkit',
@@ -61,8 +50,8 @@ const starterkitSetup = [
       },
     ],
     default: {
-      name: 'starterkit-mustache-base',
-      value: 'starterkit-mustache-base',
+      name: 'starterkit-handlebars-demo',
+      value: 'starterkit-handlebars-demo',
     },
   },
   {

packages/cli/bin/install-edition.js

@@ -12,6 +12,9 @@ const {
   getJSONKey,
 } = require('./utils');
 
+// https://github.com/TehShrike/deepmerge#overwrite-array
+const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
+
 const installEdition = (edition, config, projectDir) => {
   const pkg = require(path.resolve(projectDir, 'package.json'));
 
@@ -49,11 +52,26 @@ const installEdition = (edition, config, projectDir) => {
       }
       // 4.2
       case '@pattern-lab/edition-node': {
+        const editionPath = path.resolve('./node_modules', edition);
+        const editionConfigPath = path.resolve(
+          editionPath,
+          'patternlab-config.json'
+        );
+
+        const editionConfig = require(editionConfigPath);
+
         pkg.scripts = Object.assign(
           {},
           pkg.scripts || {},
           yield getJSONKey(edition, 'scripts')
         );
+
+        yield copyAsync(
+          path.join(editionPath, path.sep, 'helpers', path.sep, 'test.js'),
+          path.resolve(sourceDir, '../', 'helpers/test.js')
+        );
+
+        config = merge(config, editionConfig, { arrayMerge: overwriteMerge });
         break;
       }
       // 4.3
@@ -76,7 +94,7 @@ const installEdition = (edition, config, projectDir) => {
           path.resolve(sourceDir, '../', 'alter-twig.php')
         );
 
-        config = merge(config, editionConfig);
+        config = merge(config, editionConfig, { arrayMerge: overwriteMerge });
         break;
       }
     }

packages/cli/bin/install-plugin.js

@@ -22,7 +22,7 @@ const installPlugin = (plugin, config) =>
     try {
       const pluginConfigJSON = require(pluginPathConfig);
       if (!_.has(config.plugins[name].options)) {
-        _.set(config, `plugins[${name}]['options]`, pluginConfigJSON);
+        _.set(config, `plugins[${name}][options]`, pluginConfigJSON);
       }
     } catch (ex) {
       //a config.json file is not required at this time

packages/cli/bin/install-starterkit.js

@@ -12,8 +12,7 @@ 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 checkAndInstallPackage(name);
     const kitPath = path.resolve('./node_modules', name);
     yield copyAsync(path.resolve(kitPath, 'dist'), path.resolve(sourceDir));
     let kitConfig;

packages/cli/bin/utils.js

@@ -126,16 +126,15 @@ const copyWithPattern = (cwd, pattern, dest) =>
  * @func fetchPackage
  * @desc Fetches and saves packages from npm into node_modules and adds a reference in the package.json under dependencies
  * @param {string} packageName - The package name
- * @param {string} [url] - A URL which will be used to fetch the package from
  */
-const fetchPackage = (packageName, url) =>
+const fetchPackage = packageName =>
   wrapAsync(function*() {
     const useYarn = hasYarn();
     const pm = useYarn ? 'yarn' : 'npm';
     const installCmd = useYarn ? 'add' : 'install';
     try {
-      if (packageName || url) {
-        const cmd = yield spawn(pm, [installCmd, url || packageName]);
+      if (packageName) {
+        const cmd = yield spawn(pm, [installCmd, packageName]);
         error(cmd.stderr);
       }
     } catch (err) {
@@ -150,10 +149,9 @@ const fetchPackage = (packageName, url) =>
  * @func checkAndInstallPackage
  * Checks whether a package for a given packageName is installed locally. If package cannot be found, fetch and install it
  * @param {string} packageName - The package name
- * @param {string} [url] - A URL which will be used to fetch the package from
  * @return {boolean}
  */
-const checkAndInstallPackage = (packageName, url) =>
+const checkAndInstallPackage = packageName =>
   wrapAsync(function*() {
     try {
       require.resolve(packageName);
@@ -162,7 +160,7 @@ const checkAndInstallPackage = (packageName, url) =>
       debug(
         `checkAndInstallPackage: ${packageName} not installed. Fetching it now …`
       );
-      yield fetchPackage(packageName, url);
+      yield fetchPackage(packageName);
       return false;
     }
   });