-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
install: do not descend into directory deps' child modules
This builds on the work of #217, bringing back the logic in 2f0c883 for all deps other than 'directory' symlinks where it causes problems. This also causes the installer to *fix* shrinkwraps that inappropriately list the dependencies of directory symlink packages, which goes further to address the problems highlighted in https://npm.community/t/installing-the-same-module-under-multiple-relative-paths-fails-on-linux/8863 and https://npm.community/t/reinstall-breaks-after-npm-update-to-6-10-2/9327, even if a prior npm install created a broken package-lock.json file. Related: #217 Credit: @isaacs Fix: https://npm.community/t/reinstall-breaks-after-npm-update-to-6-10-2/9327 Fix: https://npm.community/t/installing-the-same-module-under-multiple-relative-paths-fails-on-linux/8863
- Loading branch information
Showing
3 changed files
with
146 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| const common = require('../common-tap.js') | ||
| const Tacks = require('tacks') | ||
| const {File, Dir} = Tacks | ||
| const pkg = common.pkg | ||
| const t = require('tap') | ||
|
|
||
| // via https://github.com/chhetrisushil/npm-update-test | ||
| const goodPackage2Entry = { | ||
| version: 'file:../package2', | ||
| dev: true | ||
| } | ||
|
|
||
| const badPackage2Entry = { | ||
| version: 'file:../package2', | ||
| dev: true, | ||
| dependencies: { | ||
| '@test/package3': { | ||
| version: '1.0.0' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| const goodPackage1Deps = { | ||
| '@test/package2': goodPackage2Entry, | ||
| '@test/package3': { | ||
| version: 'file:../package3', | ||
| dev: true | ||
| } | ||
| } | ||
|
|
||
| const badPackage1Deps = { | ||
| '@test/package2': badPackage2Entry, | ||
| '@test/package3': { | ||
| version: 'file:../package3', | ||
| dev: true | ||
| } | ||
| } | ||
|
|
||
| const badPackage1Lock = { | ||
| name: 'package1', | ||
| version: '1.0.0', | ||
| lockfileVersion: 1, | ||
| requires: true, | ||
| dependencies: badPackage1Deps | ||
| } | ||
|
|
||
| const goodPackage1Lock = { | ||
| name: 'package1', | ||
| version: '1.0.0', | ||
| lockfileVersion: 1, | ||
| requires: true, | ||
| dependencies: goodPackage1Deps | ||
| } | ||
|
|
||
| const package2Lock = { | ||
| name: 'package2', | ||
| version: '1.0.0', | ||
| lockfileVersion: 1, | ||
| requires: true, | ||
| dependencies: { | ||
| '@test/package3': { | ||
| version: 'file:../package3', | ||
| dev: true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| const package3Lock = { | ||
| name: 'package3', | ||
| version: '1.0.0', | ||
| lockfileVersion: 1 | ||
| } | ||
|
|
||
| t.test('setup fixture', t => { | ||
| const fixture = new Tacks(new Dir({ | ||
| package1: new Dir({ | ||
| 'package-lock.json': new File(badPackage1Lock), | ||
| 'package.json': new File({ | ||
| name: 'package1', | ||
| version: '1.0.0', | ||
| devDependencies: { | ||
| '@test/package2': 'file:../package2', | ||
| '@test/package3': 'file:../package3' | ||
| } | ||
| }) | ||
| }), | ||
| package2: new Dir({ | ||
| 'package-lock.json': new File(package2Lock), | ||
| 'package.json': new File({ | ||
| name: 'package2', | ||
| version: '1.0.0', | ||
| devDependencies: { | ||
| '@test/package3': 'file:../package3' | ||
| } | ||
| }) | ||
| }), | ||
| package3: new Dir({ | ||
| 'package-lock.json': new File(package3Lock), | ||
| 'package.json': new File({ | ||
| name: 'package3', | ||
| version: '1.0.0' | ||
| }) | ||
| }) | ||
| })) | ||
| fixture.create(pkg) | ||
| t.end() | ||
| }) | ||
|
|
||
| t.test('install does not error', t => | ||
| common.npm(['install', '--no-registry'], { cwd: pkg + '/package1' }) | ||
| .then(([code, out, err]) => { | ||
| t.equal(code, 0) | ||
| console.error({out, err}) | ||
| })) | ||
|
|
||
| t.test('updated package-lock.json to good state, left others alone', t => { | ||
| const fs = require('fs') | ||
| const getlock = n => { | ||
| const file = pkg + '/package' + n + '/package-lock.json' | ||
| const lockdata = fs.readFileSync(file, 'utf8') | ||
| return JSON.parse(lockdata) | ||
| } | ||
| t.strictSame(getlock(1), goodPackage1Lock) | ||
| t.strictSame(getlock(2), package2Lock) | ||
| t.strictSame(getlock(3), package3Lock) | ||
| t.end() | ||
| }) |