Merge branch 'dev' into feature-server-asset-change

Author: bmuenzenmeyer

CHANGELOG.md

@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.9.2](https://github.com/pattern-lab/patternlab-node/compare/v5.9.1...v5.9.2) (2020-04-24)
+
+**Note:** Version bump only for package pl-node
+
+
+
+
+
+## [5.9.1](https://github.com/pattern-lab/patternlab-node/compare/v5.9.0...v5.9.1) (2020-04-24)
+
+
+### Bug Fixes
+
+* **cli:** ensure specified directory exists prior to scaffold ([cc3b696](https://github.com/pattern-lab/patternlab-node/commit/cc3b69624d486c94ee3b1f4b1bbb0334a514fa59))
+
+
+
+
+
+# [5.9.0](https://github.com/pattern-lab/patternlab-node/compare/v5.8.0...v5.9.0) (2020-04-24)
+
+
+### Bug Fixes
+
+* **cli:** set current working directory before scaffolded npm init ([6d2186d](https://github.com/pattern-lab/patternlab-node/commit/6d2186d8e8a74634198a4474ca8ae83221dd70a9))
+* **core:** do not warn about uikit-polyfills ([6bb68e7](https://github.com/pattern-lab/patternlab-node/commit/6bb68e763769969546542bf7aaf6d1f4235c6622))
+* actually exit build when Twig render fails ([5d28a24](https://github.com/pattern-lab/patternlab-node/commit/5d28a24a53011396289c1e29e0a715cd82470185))
+* Update packages/engine-twig-php/lib/engine_twig_php.js ([c67d50e](https://github.com/pattern-lab/patternlab-node/commit/c67d50ebb5d69816b7514e85f129f8ecde984ad3))
+
+
+### Features
+
+* **docs:** yarnify ([5a47dc7](https://github.com/pattern-lab/patternlab-node/commit/5a47dc7b90dc5c43c12a51143b41943dcbd8564c))
+* **README:** add netlify badges ([941df8a](https://github.com/pattern-lab/patternlab-node/commit/941df8a59b6b75bc1255646005f329e40be68106))
+
+
+
+
+
 # [5.8.0](https://github.com/pattern-lab/patternlab-node/compare/v5.7.2...v5.8.0) (2020-04-03)
 
 

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.11.0",
-  "version": "5.8.0",
+  "version": "5.9.2",
   "packages": [
     "packages/*"
   ],

packages/cli/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.9.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.9.0...v5.9.1) (2020-04-24)
+
+
+### Bug Fixes
+
+* **cli:** ensure specified directory exists prior to scaffold ([cc3b696](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/cc3b69624d486c94ee3b1f4b1bbb0334a514fa59))
+
+
+
+
+
+# [5.9.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.8.0...v5.9.0) (2020-04-24)
+
+
+### Bug Fixes
+
+* **cli:** set current working directory before scaffolded npm init ([6d2186d](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/6d2186d8e8a74634198a4474ca8ae83221dd70a9))
+
+
+
+
+
 # [5.7.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.6.0...v5.7.0) (2020-02-17)
 
 

packages/cli/bin/scaffold.js

@@ -1,7 +1,7 @@
 'use strict';
 const path = require('path');
 const execa = require('execa');
-const fs = require('fs');
+const fs = require('fs-extra');
 const wrapAsync = require('./utils').wrapAsync;
 const mkdirsAsync = require('./utils').mkdirsAsync;
 
@@ -16,8 +16,12 @@ const mkdirsAsync = require('./utils').mkdirsAsync;
  */
 const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
   wrapAsync(function*() {
-    if (!fs.existsSync(path.resolve(projectDir, 'package.json'))) {
-      execa.sync('npm', ['init', '-y']);
+    const projectPath = path.join(process.cwd(), projectDir);
+    if (!fs.existsSync(path.join(projectPath, 'package.json'))) {
+      fs.ensureDirSync(projectPath);
+      execa.sync('npm', ['init', '-y'], {
+        cwd: projectPath,
+      });
     }
     /**
      * Create mandatory files structure

packages/cli/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pattern-lab/cli",
   "description": "Command-line interface (CLI) for the @pattern-lab/core.",
-  "version": "5.7.0",
+  "version": "5.9.1",
   "bin": {
     "patternlab": "bin/patternlab.js"
   },
   "author": {
     "name": "Raphael Okon"
   },
   "dependencies": {
-    "@pattern-lab/core": "^5.7.0",
+    "@pattern-lab/core": "^5.9.0",
     "@pattern-lab/live-server": "^5.0.0",
     "archiver": "2.1.1",
     "chalk": "2.4.1",

packages/core/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.9.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.8.0...v5.9.0) (2020-04-24)
+
+
+### Bug Fixes
+
+* **core:** do not warn about uikit-polyfills ([6bb68e7](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/6bb68e763769969546542bf7aaf6d1f4235c6622))
+
+
+
+
+
 # [5.7.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.6.0...v5.7.0) (2020-02-17)
 
 **Note:** Version bump only for package @pattern-lab/core

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pattern-lab/core",
   "description": "Create atomic design systems with Pattern Lab. This is the core API and orchestrator of the ecosystem.",
-  "version": "5.7.0",
+  "version": "5.9.0",
   "main": "./src/index.js",
   "dependencies": {
     "@pattern-lab/engine-mustache": "^5.0.0",

packages/core/src/lib/loaduikits.js

@@ -37,19 +37,20 @@ const readModuleFile = (kit, subPath) => {
 /**
  * Loads uikits, connecting configuration and installed modules
  * [1] Looks in node_modules for uikits.
- * [2] Only continue if uikit is enabled in patternlab-config.json
- * [3] Reads files from uikit that apply to every template
+ * [2] Filter out our uikit-polyfills package.
+ * [3] Only continue if uikit is enabled in patternlab-config.json
+ * [4] Reads files from uikit that apply to every template
  * @param {object} patternlab
  */
 module.exports = patternlab => {
   const paths = patternlab.config.paths;
 
-  const uikits = findModules(nodeModulesPath, isUIKitModule); // [1]
-
+  const uikits = findModules(nodeModulesPath, isUIKitModule) // [1]
+    .filter(kit => kit.name !== 'polyfills'); // [2]
   uikits.forEach(kit => {
     const configEntry = _.find(_.filter(patternlab.config.uikits, 'enabled'), {
       name: `uikit-${kit.name}`,
-    }); // [2]
+    }); // [3]
 
     if (!configEntry) {
       logger.warning(
@@ -83,7 +84,7 @@ module.exports = patternlab => {
           paths.source.patternlabFiles.patternSectionSubtype
         ),
         viewAll: readModuleFile(kit, paths.source.patternlabFiles.viewall),
-      }; // [3]
+      }; // [4]
     } catch (ex) {
       logger.error(ex);
       logger.error(

packages/core/test/loaduitkits_tests.js

@@ -3,6 +3,7 @@
 const tap = require('tap');
 const rewire = require('rewire');
 
+const logger = require('../src/lib/log');
 const loaduikits = rewire('../src/lib/loaduikits');
 
 const testConfig = require('./util/patternlab-config.json');
@@ -21,6 +22,10 @@ const findModulesMock = function() {
       name: 'baz',
       modulePath: 'node_modules/@pattern-lab/uikit-baz',
     },
+    {
+      name: 'polyfills',
+      modulePath: 'node_modules/@pattern-lab/uikit-polyfills',
+    },
   ];
 };
 
@@ -35,11 +40,40 @@ loaduikits.__set__({
   fs: fsMock,
 });
 
+logger;
+
+tap.test('loaduitkits - does not warn on uikit-polyfills', test => {
+  //arrange
+  const patternlab = {
+    config: testConfig,
+    uikits: {},
+  };
+
+  patternlab.config.logLevel = 'warning';
+  logger.log.on('warning', msg => test.notOk(msg.includes('uikit-polyfills')));
+
+  const uikitFoo = {
+    name: 'uikit-foo',
+    enabled: true,
+    outputDir: 'foo',
+    excludedPatternStates: ['legacy'],
+    excludedTags: ['baz'],
+  };
+
+  patternlab.config.uikits = [uikitFoo];
+
+  //act
+  loaduikits(patternlab).then(() => {
+    logger.warning = () => {};
+    test.done();
+  });
+});
+
 tap.test('loaduikits - maps fields correctly', function(test) {
   //arrange
   const patternlab = {
     config: testConfig,
-    uikits: [],
+    uikits: {},
   };
 
   const uikitFoo = {
@@ -78,7 +112,7 @@ tap.test('loaduikits - only adds files for enabled uikits', function(test) {
   //arrange
   const patternlab = {
     config: testConfig,
-    uikits: [],
+    uikits: {},
   };
 
   patternlab.config.uikits = [

packages/create/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.9.1](https://github.com/pattern-lab/patternlab-node/compare/v5.9.0...v5.9.1) (2020-04-24)
+
+**Note:** Version bump only for package create-pattern-lab
+
+
+
+
+
+# [5.9.0](https://github.com/pattern-lab/patternlab-node/compare/v5.8.0...v5.9.0) (2020-04-24)
+
+**Note:** Version bump only for package create-pattern-lab
+
+
+
+
+
 # [5.7.0](https://github.com/pattern-lab/patternlab-node/compare/v5.6.0...v5.7.0) (2020-02-17)
 
 **Note:** Version bump only for package create-pattern-lab