-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Build: Make installed-deps check layout-agnostic and surface opt-out env var #79687
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -5,6 +5,8 @@ | |
| * `package-lock.json` against `node_modules/.package-lock.json` (npm's hidden | ||
| * lockfile, written on every install to record the actual installed tree). | ||
| * | ||
| * Works with both the hoisted and isolated layouts. | ||
| * | ||
| * Exits non-zero with a hint to run `npm install` if the trees diverge. | ||
| */ | ||
|
|
||
|
|
@@ -85,6 +87,28 @@ if ( needsCheck ) { | |
| const lockPkgs = lock.packages || {}; | ||
| const hiddenPkgs = hidden.packages || {}; | ||
|
|
||
| // The package name is the path segment after the final `node_modules/`. | ||
| const NM = 'node_modules/'; | ||
| const packageName = ( pkgPath ) => { | ||
| const i = pkgPath.lastIndexOf( NM ); | ||
| return i === -1 ? pkgPath : pkgPath.slice( i + NM.length ); | ||
| }; | ||
|
|
||
| /* | ||
| * Index installed packages by `name@version` → set of `resolved` sources. | ||
| */ | ||
| const installedByKey = new Map(); | ||
| for ( const [ pkgPath, info ] of Object.entries( hiddenPkgs ) ) { | ||
| if ( info.link || ! info.version ) { | ||
| continue; | ||
| } | ||
| const key = `${ packageName( pkgPath ) }@${ info.version }`; | ||
| if ( ! installedByKey.has( key ) ) { | ||
| installedByKey.set( key, new Set() ); | ||
| } | ||
| installedByKey.get( key ).add( info.resolved ); | ||
| } | ||
|
|
||
| const reportedMismatches = []; | ||
| const MAX_REPORTED = 5; | ||
| let totalMismatches = 0; | ||
|
|
@@ -100,22 +124,24 @@ if ( needsCheck ) { | |
| continue; | ||
| } | ||
|
|
||
| const installed = hiddenPkgs[ pkgPath ]; | ||
| // Optional/extraneous deps may legitimately not be installed. | ||
| if ( info.optional || info.extraneous ) { | ||
| continue; | ||
| } | ||
|
|
||
| /* | ||
| * Match by name@version. For aliases `info.name` is the real name | ||
| */ | ||
| const leaf = packageName( pkgPath ); | ||
| const resolvedSet = | ||
| installedByKey.get( `${ info.name || leaf }@${ info.version }` ) || | ||
| installedByKey.get( `${ leaf }@${ info.version }` ); | ||
|
Comment on lines
+136
to
+138
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For aliases, |
||
|
|
||
| let mismatch; | ||
| if ( ! installed ) { | ||
| /* | ||
| * Optional deps may be skipped by npm on the current platform | ||
| * (e.g. macOS-only fsevents on Linux). Don't flag them as | ||
| * missing. Real drift on an optional dep would still be caught | ||
| * below as an integrity mismatch. | ||
| */ | ||
| if ( info.optional ) { | ||
| continue; | ||
| } | ||
| if ( ! resolvedSet ) { | ||
| mismatch = `missing: ${ pkgPath }`; | ||
| } else if ( installed.integrity !== info.integrity ) { | ||
| mismatch = `integrity mismatch: ${ pkgPath }`; | ||
| } else if ( info.resolved && ! resolvedSet.has( info.resolved ) ) { | ||
| mismatch = `source mismatch: ${ pkgPath }`; | ||
| } | ||
|
|
||
| if ( ! mismatch ) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The linked layout relocates packages under
.storeand omitsintegrity, so we match on resolved source rather than path/integrity.