Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3b1813c
fix(install): add break statements to install edition command
bmuenzenmeyer Jul 5, 2018
31b6ac6
Merge pull request #876 from pattern-lab/fix/875-edition-install
bmuenzenmeyer Jul 5, 2018
55f5bc2
feat(package): add npmrc file
bmuenzenmeyer Jul 6, 2018
5ab3995
feat(package): remove package-lock.json files
bmuenzenmeyer Jul 6, 2018
415698e
feat(package): pin all dependencies
bmuenzenmeyer Jul 6, 2018
bc7c8a2
feat(package): update lerna
bmuenzenmeyer Jul 6, 2018
afa2270
chore(ignore): ignore dependency graph
bmuenzenmeyer Jul 6, 2018
f5f7409
chore(package): hoist devDependencies
bmuenzenmeyer Jul 6, 2018
8702fb2
feat(package): add npmrc to top-level
bmuenzenmeyer Jul 6, 2018
d6695d9
Merge branch 'dev' into lerna-upgrade
bmuenzenmeyer Jul 6, 2018
f4c7bbd
Update README.md
bmuenzenmeyer Jul 6, 2018
8b1e35c
Update README.md
bmuenzenmeyer Jul 6, 2018
659be93
Merge pull request #878 from pattern-lab/update-installation-instruct…
bmuenzenmeyer Jul 6, 2018
200c7cb
fix(install): use process to find package.json
bmuenzenmeyer Jul 6, 2018
52a08f9
Merge pull request #877 from pattern-lab/lerna-upgrade
bmuenzenmeyer Jul 6, 2018
1ffafb7
Merge pull request #879 from pattern-lab/fix/874-packagejson-overwrite
bmuenzenmeyer Jul 6, 2018
e439f4e
fix(package): fix fat-fingered dependency
bmuenzenmeyer Jul 6, 2018
1b299a0
Publish
bmuenzenmeyer Jul 6, 2018
886220e
fix(tests): bump lerna
bmuenzenmeyer Jul 6, 2018
87347d5
fix(dependencies): pin all packages marked as latest
bmuenzenmeyer Jul 6, 2018
c40f4d9
Merge pull request #882 from pattern-lab/deps-deps-deps
bmuenzenmeyer Jul 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.9.0",
"lerna": "3.0.0-beta.21",
"packages": [
"packages/*"
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package-lock=false
save-exact=true
20 changes: 20 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion packages/cli/bin/install-edition.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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 = {
Expand All @@ -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;
Expand Down
Loading