Merge pull request #881 from pattern-lab/dev

Next version

Author: bmuenzenmeyer

.gitignore

@@ -10,3 +10,4 @@ packages/*/public
 !packages/core/test/patterns/public/.gitkeep
 !packages/core/test/patterns/testDependencyGraph.json
 lerna-debug.log
+packages/edition-node-gulp/dependencyGraph.json

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -4,7 +4,7 @@ before_install:
   - phantomjs --version
 
 before_script:
-  - npm install -g lerna@2.9.0
+  - npm install -g lerna@3.0.0-beta.21
   - npm run bootstrap
   - lerna add @pattern-lab/engine-mustache
   - lerna add @pattern-lab/engine-handlebars

README.md

@@ -32,10 +32,11 @@ The below assume a new directory and project is required.
     ```bash
     mkdir new-project
     cd new-project
-    npm init -y && npx -p @pattern-lab/cli -c 'patternlab init'
+    npm init -y && npx @pattern-lab/cli -c patternlab init
     ```
     > If you get an error stating that `npx` is not installed, ensure you are on `npm 5.2.0` or later by running `npm -v` or install it globally with `npm install -g npx`. [Learn more about npx.](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b)
 1. Follow the on-screen prompts to choose your Edition and a Starterkit should you want one.
+1. Run `npm install` one last time to ensure any transient packages from the CLI are installed.
 1. Open `package.json` and add the following to your `scripts` object
     ```diff
     "scripts": {

lerna.json

@@ -1,5 +1,5 @@
 {
-  "lerna": "2.9.0",
+  "lerna": "3.0.0-beta.21",
   "packages": [
     "packages/*"
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "lerna": "2.9.0"
+    "lerna": "3.0.0-beta.21"
   },
   "scripts": {
     "bootstrap": "lerna bootstrap --hoist tap --hoist eslin* --hoist husky --hoist prettier --hoist pretty-quick",

packages/cli/.npmrc

@@ -0,0 +1,2 @@
+package-lock=false 
+save-exact=true 

packages/cli/CHANGELOG.md

@@ -3,6 +3,26 @@
 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.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)
+
+
+### 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)
 

packages/cli/bin/install-edition.js

@@ -1,6 +1,6 @@
 'use strict';
 const path = require('path');
-const pkg = require('../package.json');
+const pkg = require(path.resolve(process.cwd(), 'package.json'));
 const {
   checkAndInstallPackage,
   copyAsync,
@@ -29,6 +29,7 @@ const installEdition = (edition, config) =>
           path.resolve('./node_modules', edition, 'gulpfile.js'),
           path.resolve(sourceDir, '../', 'gulpfile.js')
         );
+        break;
       }
       case '@pattern-lab/edition-node': {
         const scriptsJSON = {
@@ -40,6 +41,7 @@ const installEdition = (edition, config) =>
         };
         pkg.scripts = Object.assign({}, pkg.scripts || {}, scriptsJSON);
         yield writeJsonAsync('./package.json', pkg, { spaces: 2 });
+        break;
       }
     }
     return config;