Skip to content
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

feat: implement new npm-packlist behavior #5602

Merged
merged 2 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ graph LR;
libnpmaccess-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmaccess-->npmcli-template-oss["@npmcli/template-oss"];
libnpmdiff-->npm-package-arg;
libnpmdiff-->npmcli-arborist["@npmcli/arborist"];
libnpmdiff-->npmcli-disparity-colors["@npmcli/disparity-colors"];
libnpmdiff-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmdiff-->npmcli-installed-package-contents["@npmcli/installed-package-contents"];
Expand Down Expand Up @@ -54,6 +55,7 @@ graph LR;
libnpmorg-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmorg-->npmcli-template-oss["@npmcli/template-oss"];
libnpmpack-->npm-package-arg;
libnpmpack-->npmcli-arborist["@npmcli/arborist"];
libnpmpack-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmpack-->npmcli-run-script["@npmcli/run-script"];
libnpmpack-->npmcli-template-oss["@npmcli/template-oss"];
Expand Down Expand Up @@ -139,8 +141,6 @@ graph LR;
npm-package-arg-->semver;
npm-package-arg-->validate-npm-package-name;
npm-packlist-->ignore-walk;
npm-packlist-->npm-bundled;
npm-packlist-->npm-normalize-package-bin;
npm-profile-->npm-registry-fetch;
npm-profile-->proc-log;
npm-registry-fetch-->make-fetch-happen;
Expand Down Expand Up @@ -333,6 +333,7 @@ graph LR;
libnpmdiff-->diff;
libnpmdiff-->minimatch;
libnpmdiff-->npm-package-arg;
libnpmdiff-->npmcli-arborist["@npmcli/arborist"];
libnpmdiff-->npmcli-disparity-colors["@npmcli/disparity-colors"];
libnpmdiff-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmdiff-->npmcli-installed-package-contents["@npmcli/installed-package-contents"];
Expand Down Expand Up @@ -379,6 +380,7 @@ graph LR;
libnpmorg-->tap;
libnpmpack-->nock;
libnpmpack-->npm-package-arg;
libnpmpack-->npmcli-arborist["@npmcli/arborist"];
libnpmpack-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmpack-->npmcli-run-script["@npmcli/run-script"];
libnpmpack-->npmcli-template-oss["@npmcli/template-oss"];
Expand Down Expand Up @@ -554,10 +556,7 @@ graph LR;
npm-package-arg-->proc-log;
npm-package-arg-->semver;
npm-package-arg-->validate-npm-package-name;
npm-packlist-->glob;
npm-packlist-->ignore-walk;
npm-packlist-->npm-bundled;
npm-packlist-->npm-normalize-package-bin;
npm-pick-manifest-->npm-install-checks;
npm-pick-manifest-->npm-normalize-package-bin;
npm-pick-manifest-->npm-package-arg;
Expand Down Expand Up @@ -756,12 +755,13 @@ Each group depends on packages lower down the chain, nothing depends on
packages higher up the chain.

- npm
- libnpmexec, libnpmfund
- @npmcli/arborist, libnpmpublish
- @npmcli/metavuln-calculator, libnpmdiff, libnpmpack
- libnpmpublish
- libnpmdiff, libnpmexec, libnpmfund, libnpmpack
- @npmcli/arborist
- @npmcli/metavuln-calculator
- pacote, libnpmaccess, libnpmhook, libnpmorg, libnpmsearch, libnpmteam, npm-profile
- npm-registry-fetch
- make-fetch-happen, libnpmversion, @npmcli/config, init-package-json
- @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, @npmcli/git, @npmcli/run-script, npm-packlist, read-package-json, @npmcli/query, readdir-scoped-modules, promzard
- npm-bundled, read-package-json-fast, @npmcli/fs, unique-filename, @npmcli/promise-spawn, npm-package-arg, normalize-package-data, bin-links, nopt, npm-install-checks, npmlog, dezalgo, read
- @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, @npmcli/git, @npmcli/run-script, read-package-json, @npmcli/query, readdir-scoped-modules, promzard
- npm-bundled, read-package-json-fast, @npmcli/fs, unique-filename, @npmcli/promise-spawn, npm-package-arg, npm-packlist, normalize-package-data, bin-links, nopt, npm-install-checks, npmlog, dezalgo, read
- npm-normalize-package-bin, @npmcli/name-from-folder, semver, @npmcli/move-file, fs-minipass, infer-owner, ssri, unique-slug, proc-log, @npmcli/node-gyp, hosted-git-info, validate-npm-package-name, ignore-walk, minipass-fetch, @npmcli/package-json, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, parse-conflict-json, wrappy, treeverse, @npmcli/eslint-config, @npmcli/template-oss, @npmcli/disparity-colors, @npmcli/ci-detect, mute-stream, ini, npm-audit-report, npm-user-validate
3 changes: 2 additions & 1 deletion lib/commands/cache.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const cacache = require('cacache')
const Arborist = require('@npmcli/arborist')
const { promisify } = require('util')
const pacote = require('pacote')
const path = require('path')
Expand Down Expand Up @@ -164,7 +165,7 @@ class Cache extends BaseCommand {
return pacote.tarball.stream(spec, stream => {
stream.resume()
return stream.promise()
}, this.npm.flatOptions)
}, { ...this.npm.flatOptions, Arborist })
}))
}

Expand Down
2 changes: 2 additions & 0 deletions lib/package-url-cmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const pacote = require('pacote')
const hostedGitInfo = require('hosted-git-info')
const Arborist = require('@npmcli/arborist')

const openUrl = require('./utils/open-url.js')
const log = require('./utils/log-shim')
Expand Down Expand Up @@ -31,6 +32,7 @@ class PackageUrlCommand extends BaseCommand {
...this.npm.flatOptions,
where: this.npm.localPrefix,
fullMetadata: true,
Arborist,
}
const mani = await pacote.manifest(arg, opts)
const url = this.getUrl(arg, mani)
Expand Down
19 changes: 10 additions & 9 deletions node_modules/@npmcli/metavuln-calculator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npmcli/metavuln-calculator",
"version": "3.1.1",
"version": "4.0.0-pre.0",
"main": "lib/index.js",
"files": [
"bin/",
Expand All @@ -18,9 +18,6 @@
"posttest": "npm run lint",
"snap": "tap",
"postsnap": "npm run lint",
"preversion": "npm test",
"postversion": "npm publish",
"prepublishOnly": "git push origin --follow-tags",
"eslint": "eslint",
"lint": "eslint \"**/*.js\"",
"lintfix": "npm run lint -- --fix",
Expand All @@ -29,25 +26,29 @@
},
"tap": {
"check-coverage": true,
"coverage-map": "map.js"
"coverage-map": "map.js",
"nyc-arg": [
"--exclude",
"tap-snapshots/**"
]
},
"devDependencies": {
"@npmcli/eslint-config": "^3.0.1",
"@npmcli/template-oss": "3.5.0",
"@npmcli/template-oss": "4.4.2",
"require-inject": "^1.4.4",
"tap": "^16.0.1"
},
"dependencies": {
"cacache": "^16.0.0",
"json-parse-even-better-errors": "^2.3.1",
"pacote": "^13.0.3",
"pacote": "^14.0.0 || ^14.0.0-pre.0",
"semver": "^7.3.5"
},
"engines": {
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "3.5.0"
"version": "4.4.2"
}
}
15 changes: 0 additions & 15 deletions node_modules/npm-bundled/LICENSE

This file was deleted.

Loading