Skip to content

Commit 1e1e086

Browse files
mathiasbynensmaxbeatty
authored andcommitted
Use package-lock.json instead of npm-shrinkwrap.json (#400)
* Use `package-lock.json` instead of `npm-shrinkwrap.json` * upgrade lab closes #392
1 parent 3fd2ecd commit 1e1e086

File tree

4 files changed

+1536
-1580
lines changed

4 files changed

+1536
-1580
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v7.4.0
1+
8

CONTRIBUTING.md

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,4 @@ SELENIUM_SERVER=http://127.0.0.1:4444/wd/hub npm run test-e2e
4646

4747
## Adding new dependencies
4848

49-
1. Install using `npm` and either `--save` or `--save-dev`. **Do not edit `package.json` manually.**
50-
2. Run `npm shrinkwrap --dev` to update `npm-shrinkwrap.json`
51-
52-
If you get an error while shrinkwrapping, try pruning your `node_modules` directory by running `npm prune`. If that doesn't work, try removing what you have installed currently, reinstalling based on `package.json` instead of `npm-shrinkwrap.json`, and then shrinkwrap again.
53-
54-
```
55-
rm -r node_modules/ && npm install --no-shrinkwrap && npm shrinkwrap --dev
56-
```
57-
58-
### Greenkeeper
59-
60-
Greenkeeper [is working on updating `npm-shrinkwrap.json`](https://github.com/greenkeeperio/greenkeeper/issues/96). In the meantime, here is how [**@maxbeatty**](https://github.com/maxbeatty) has been shrinkwrapping the updates:
61-
62-
1. Get remote branch `git pull origin`
63-
2. Checkout branch locally `git co greenkeeper-<package>-0.0.0`
64-
3. Install updated dependency defined in `package.json` instead of `npm-shrinkwrap.json` `npm i --no-shrinkwrap`
65-
4. Remove anything you no longer need `npm prune`
66-
5. Shrinkwrap the updated dependency `npm shrinkwrap --dev`
67-
6. Commit `git commit -am 'shrinkwrap updated dependency'`
68-
7. Push so updated dependency is tested and Pull Request can be merged `git push origin greenkeeper-<package>-0.0.0`
49+
Install using `npm` and either `--save` or `--save-dev`. **Do not edit `package.json` manually.**

0 commit comments

Comments
 (0)