Merge pull request #939 from pattern-lab/dev

BETA

Author: bmuenzenmeyer

.eslintrc .eslintrc.json.eslintrc renamed to .eslintrc.json

@@ -47,7 +47,7 @@ This ensures that any changes you've made will still result in a clean and funct
 
 ## Coding style
 
-Formatting is automated via [Prettier](https://prettier.io/), setup to run on precommit. We suggest [editor integration](https://prettier.io/docs/en/editors.html) for this and for eslint. Prettier is further configured within `.prettierrc`. Eslint validates syntax and usage that Prettier doesn't handle. Configuration for both is found within the `.eslintrc` file.
+Formatting is automated via [Prettier](https://prettier.io/), setup to run on precommit. We suggest [editor integration](https://prettier.io/docs/en/editors.html) for this and for eslint. Prettier is further configured within `.prettierrc`. Eslint validates syntax and usage that Prettier doesn't handle. Configuration for both is found within the `.eslintrc.json` file.
 
 The `.editorconfig` controls spaces / tabs within supported editors. Check out their [site](http://editorconfig.org/).
 

.github/CONTRIBUTING.md

@@ -8,3 +8,4 @@
 packages/core/scripts/api.handlebars
 packages/core/scripts/events.handlebars
 packages/core/test/files/annotations.js
+**/uikit-workshop/src/js/**/*

.prettierignore

@@ -4,14 +4,14 @@ before_install:
   - phantomjs --version
 
 before_script:
-  - npm install -g lerna@3.0.0-beta.21
+  - npm install -g lerna@3.2.1
   - npm run bootstrap
-  - lerna add @pattern-lab/engine-mustache
-  - lerna add @pattern-lab/engine-handlebars
-  - lerna add @pattern-lab/engine-underscore
-  - lerna add @pattern-lab/engine-liquid
-  - lerna add @pattern-lab/engine-twig
-  - lerna add @pattern-lab/engine-react
+  - lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
+  - lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
+  - lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
+  - lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
+  - lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
+  - lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
 
 branches:
   only:

.travis.yml

@@ -1,12 +1,24 @@
 {
-  "lerna": "3.0.0-beta.21",
+  "lerna": "3.2.1",
   "packages": [
     "packages/*"
   ],
   "version": "independent",
   "command": {
     "init": {
       "exact": true
+    },
+    "bootstrap": {
+      "hoist": [
+        "tap",
+        "eslin*",
+        "husky",
+        "prettier",
+        "pretty-quick"
+      ]
+    },
+    "publish": {
+      "allowBranch": "master"
     }
   },
   "npmClientArgs": [

lerna.json

@@ -1,12 +1,14 @@
 {
   "devDependencies": {
-    "lerna": "3.0.0-beta.21"
+    "lerna": "3.2.1"
   },
+  "private": true,
   "scripts": {
-    "bootstrap": "lerna bootstrap --hoist tap --hoist eslin* --hoist husky --hoist prettier --hoist pretty-quick",
+    "bootstrap": "lerna bootstrap",
     "precommit": "pretty-quick --staged",
     "prettier": "prettier --config .prettierrc --write ./**/*.js",
-    "test": "lerna run test"
+    "test": "lerna run test",
+    "clean": "git clean -dfx"
   },
   "nyc": {
     "exclude": [

package.json

@@ -4,114 +4,85 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 <a name="0.0.1-alpha.23"></a>
-## [0.0.1-alpha.23](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.22...@pattern-lab/cli@0.0.1-alpha.23) (2018-07-09)
 
+## [0.0.1-alpha.23](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.22...@pattern-lab/cli@0.0.1-alpha.23) (2018-07-09)
 
 ### Bug Fixes
 
 * **install:** copy dependencies ([1acef87](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/1acef87))
 
-
-
-
-
 <a name="0.0.1-alpha.22"></a>
+
 ## [0.0.1-alpha.22](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.21...@pattern-lab/cli@0.0.1-alpha.22) (2018-07-06)
 
 **Note:** Version bump only for package @pattern-lab/cli
 
-
-
-
-
 <a name="0.0.1-alpha.21"></a>
-## [0.0.1-alpha.21](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.20...@pattern-lab/cli@0.0.1-alpha.21) (2018-07-06)
 
+## [0.0.1-alpha.21](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.20...@pattern-lab/cli@0.0.1-alpha.21) (2018-07-06)
 
 ### Bug Fixes
 
 * **install:** add break statements to install edition command ([3b1813c](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/3b1813c))
 * **install:** use process to find package.json ([200c7cb](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/200c7cb))
 
-
 ### Features
 
 * **package:** add npmrc file ([55f5bc2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/55f5bc2))
 * **package:** pin all dependencies ([415698e](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/415698e))
 * **package:** remove package-lock.json files ([5ab3995](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/5ab3995))
 
-
-
-
-
 <a name="0.0.1-alpha.20"></a>
-## [0.0.1-alpha.20](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.19...@pattern-lab/cli@0.0.1-alpha.20) (2018-07-05)
 
+## [0.0.1-alpha.20](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.19...@pattern-lab/cli@0.0.1-alpha.20) (2018-07-05)
 
 ### Bug Fixes
 
 * **cli:** change whitespace to spaces per standard ([4556fc7](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/4556fc7))
 * **tests:** change test command name similar to live-server until this passes CI ([5c39be1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/5c39be1))
 
-
 ### Features
 
 * **serve:** change calling method ([3b86a0d](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/3b86a0d))
 * **tests:** use lerna run test at the monorepo level ([38a01b1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/38a01b1))
 
-
-
-
 <a name="0.0.1-alpha.19"></a>
-## [0.0.1-alpha.19](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.18...@pattern-lab/cli@0.0.1-alpha.19) (2018-05-19)
 
+## [0.0.1-alpha.19](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.18...@pattern-lab/cli@0.0.1-alpha.19) (2018-05-19)
 
 ### Bug Fixes
 
 * **cli:** change line-endings of cli entrypoint ([3fc86c2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/3fc86c2))
 * **wording:** reconcile Pattern Lab vs PatternLab ([f3d1e0d](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/f3d1e0d))
 
-
-
-
 <a name="0.0.1-alpha.18"></a>
-## [0.0.1-alpha.18](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.17...@pattern-lab/cli@0.0.1-alpha.18) (2018-05-04)
 
+## [0.0.1-alpha.18](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.17...@pattern-lab/cli@0.0.1-alpha.18) (2018-05-04)
 
 ### Bug Fixes
 
 * **version:** use static core method getVersion ([f9dcd4d](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/f9dcd4d))
 
-
-
-
 <a name="0.0.1-alpha.17"></a>
-## [0.0.1-alpha.17](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.16...@pattern-lab/cli@0.0.1-alpha.17) (2018-05-04)
 
+## [0.0.1-alpha.17](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.16...@pattern-lab/cli@0.0.1-alpha.17) (2018-05-04)
 
 ### Bug Fixes
 
 * **package:** update publish config and installation target ([27d2c8f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/27d2c8f))
 
-
-
-
 <a name="0.0.1-alpha.16"></a>
-## [0.0.1-alpha.16](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.15...@pattern-lab/cli@0.0.1-alpha.16) (2018-05-04)
 
+## [0.0.1-alpha.16](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.15...@pattern-lab/cli@0.0.1-alpha.16) (2018-05-04)
 
 ### Features
 
 * **API:** standardize v() and version() into a single call ([6309e69](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/6309e69))
 
-
 ### BREAKING CHANGES
 
 * **API:** change `version()` to return a string representation of the version, removing `v()`
 
-
-
-
 <a name="0.0.1-alpha.15"></a>
 
 ## [0.0.1-alpha.15](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.1-alpha.14...@pattern-lab/cli@0.0.1-alpha.15) (2018-03-21)

packages/cli/CHANGELOG.md

@@ -1,5 +1,9 @@
 'use strict';
+
+const path = require('path');
+
 const _ = require('lodash');
+
 const checkAndInstallPackage = require('./utils').checkAndInstallPackage;
 const wrapAsync = require('./utils').wrapAsync;
 
@@ -8,7 +12,21 @@ const installPlugin = (plugin, config) =>
     const name = plugin.name || plugin;
     yield checkAndInstallPackage(name);
     // Put the installed plugin in the patternlab-config.json
-    _.set(config, `plugins[${name}]['enabled']`, false);
+    _.set(config, `plugins[${name}]['enabled']`, true);
+    _.set(config, `plugins[${name}]['initialized']`, false);
+
+    // Get the options from the plugin, if any
+    const pluginPathConfig = path.resolve(
+      path.join(process.cwd(), 'node_modules', name, 'config.json')
+    );
+    try {
+      const pluginConfigJSON = require(pluginPathConfig);
+      if (!_.has(config.plugins[name].options)) {
+        _.set(config, `plugins[${name}]['options]`, pluginConfigJSON);
+      }
+    } catch (ex) {
+      //a config.json file is not required at this time
+    }
     return name;
   });
 

packages/cli/bin/install-plugin.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 const cli = require('commander');
+const path = require('path');
 const build = require('./cli-actions/build');
 const disable = require('./cli-actions/disable');
 const enable = require('./cli-actions/enable');
@@ -42,7 +43,7 @@ cli
     '-c, --config <path>',
     'Specify config file. Default looks up the project dir',
     val => val.trim(),
-    './patternlab-config.json'
+    path.resolve(process.cwd(), 'patternlab-config.json')
   )
   .option('-v, --verbose', 'Show verbose console logs', verboseLogs)
   .option('--silent', 'Turn off console logs', silenceLogs);

packages/cli/bin/patternlab.js

@@ -175,21 +175,39 @@ const checkAndInstallPackage = (packageName, url) =>
  */
 const noop = () => {};
 
+/**
+ * @func writeJsonAsync
+ * Wrapper for fs.writeJsonAsync with consistent spacing
+ * @param {string} filePath
+ * @param {object} data
+ */
+const writeJsonAsync = (filePath, data) =>
+  wrapAsync(function*() {
+    yield fs.outputJSON(filePath, data, { spaces: 2 });
+  });
+
+/**
+ * @func getJSONKey
+ * Installs package, then returns the value for the given JSON file's key within
+ * @param {string} packageName - the node_module to install / load
+ * @param {object} key - the key to find
+ * @param {object} fileName - the filePath of the JSON
+ */
 const getJSONKey = (packageName, key, fileName = 'package.json') =>
   wrapAsync(function*() {
     yield checkAndInstallPackage(packageName);
-    const packageJSON = yield fs.readJson(
+    const jsonData = yield fs.readJson(
       path.resolve('node_modules', packageName, fileName)
     );
-    return packageJSON[key];
+    return jsonData[key];
   });
 
 module.exports = {
   copyWithPattern,
   copyAsync: fs.copy,
   mkdirsAsync: fs.mkdirs,
   moveAsync: fs.move,
-  writeJsonAsync: fs.outputJson,
+  writeJsonAsync: writeJsonAsync,
   readJsonAsync: fs.readJson,
   error,
   info,