From 16db9a75bdac20c6e0ee597aecd360f178f85e53 Mon Sep 17 00:00:00 2001 From: Chris Sidi Date: Tue, 19 Nov 2024 13:51:07 -0500 Subject: [PATCH 1/2] chore: update `npm-cli-repos.txt` --- DEPENDENCIES.json | 1 - DEPENDENCIES.md | 5 +---- scripts/npm-cli-repos.txt | 11 ++--------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/DEPENDENCIES.json b/DEPENDENCIES.json index dc8ab0751f6ff..ebbccd5e342c4 100644 --- a/DEPENDENCIES.json +++ b/DEPENDENCIES.json @@ -75,7 +75,6 @@ "proc-log", "validate-npm-package-name", "json-parse-even-better-errors", - "fs-minipass", "ssri", "unique-slug", "@npmcli/node-gyp", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 51a390150b471..7a0461657ca94 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -8,7 +8,6 @@ graph LR; bin-links-->proc-log; bin-links-->read-cmd-shim; bin-links-->write-file-atomic; - cacache-->fs-minipass; cacache-->npmcli-fs["@npmcli/fs"]; cacache-->ssri; cacache-->unique-filename; @@ -86,7 +85,6 @@ graph LR; normalize-package-data-->semver; npm-->abbrev; npm-->cacache; - npm-->fs-minipass; npm-->hosted-git-info; npm-->ini; npm-->init-package-json; @@ -231,7 +229,6 @@ graph LR; npmcli-smoke-tests-->npmcli-promise-spawn["@npmcli/promise-spawn"]; npmcli-smoke-tests-->npmcli-template-oss["@npmcli/template-oss"]; pacote-->cacache; - pacote-->fs-minipass; pacote-->npm-package-arg; pacote-->npm-packlist; pacote-->npm-pick-manifest; @@ -788,4 +785,4 @@ packages higher up the chain. - @npmcli/git, make-fetch-happen - @npmcli/installed-package-contents, npm-pick-manifest, cacache, promzard - @npmcli/docs, @npmcli/smoke-tests, @npmcli/fs, npm-bundled, npm-install-checks, npm-package-arg, normalize-package-data, unique-filename, npm-packlist, bin-links, nopt, parse-conflict-json, read-package-json-fast, @npmcli/mock-globals, read - - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, @npmcli/promise-spawn, ini, hosted-git-info, proc-log, validate-npm-package-name, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/node-gyp, @npmcli/redact, @npmcli/agent, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, proggy, minify-registry-metadata, mute-stream, npm-audit-report, npm-user-validate + - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, @npmcli/promise-spawn, ini, hosted-git-info, proc-log, validate-npm-package-name, json-parse-even-better-errors, ssri, unique-slug, @npmcli/node-gyp, @npmcli/redact, @npmcli/agent, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, proggy, minify-registry-metadata, mute-stream, npm-audit-report, npm-user-validate diff --git a/scripts/npm-cli-repos.txt b/scripts/npm-cli-repos.txt index e69d02c7ec9bd..1d2b57e1252e4 100644 --- a/scripts/npm-cli-repos.txt +++ b/scripts/npm-cli-repos.txt @@ -1,18 +1,12 @@ abbrev-js agent -are-we-there-yet -benchmarks bin-links cacache cli cmd-shim -create-oss -disparity-colors documentation eslint-config fs -fs-minipass -gauge git hosted-git-info ignore-walk @@ -43,7 +37,6 @@ npm-pick-manifest npm-profile npm-registry-fetch npm-user-validate -npmlog package-json pacote parse-conflict-json @@ -54,15 +47,15 @@ promzard query read read-cmd-shim -read-package-json read-package-json-fast +redact rfcs run-script ssri stafftools statusboard -tap-nock template-oss +types unique-filename unique-slug validate-npm-package-name From 47b9c11d843e9b9b22a94706b8b8ffbb58d19fde Mon Sep 17 00:00:00 2001 From: Chris Sidi Date: Tue, 19 Nov 2024 13:52:35 -0500 Subject: [PATCH 2/2] chore: associate `node-which` repo with `which` package --- DEPENDENCIES.json | 5 +++-- DEPENDENCIES.md | 11 ++++++++--- scripts/dependency-graph.js | 3 ++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/DEPENDENCIES.json b/DEPENDENCIES.json index ebbccd5e342c4..c61ea32e2e167 100644 --- a/DEPENDENCIES.json +++ b/DEPENDENCIES.json @@ -40,6 +40,7 @@ "make-fetch-happen" ], [ + "@npmcli/smoke-tests", "@npmcli/installed-package-contents", "npm-pick-manifest", "cacache", @@ -47,9 +48,9 @@ ], [ "@npmcli/docs", - "@npmcli/smoke-tests", "@npmcli/fs", "npm-bundled", + "@npmcli/promise-spawn", "npm-install-checks", "npm-package-arg", "normalize-package-data", @@ -69,7 +70,7 @@ "semver", "npm-normalize-package-bin", "@npmcli/name-from-folder", - "@npmcli/promise-spawn", + "which", "ini", "hosted-git-info", "proc-log", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 7a0461657ca94..a5b50e24e6e1c 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -132,6 +132,7 @@ graph LR; npm-->semver; npm-->ssri; npm-->validate-npm-package-name; + npm-->which; npm-bundled-->npm-normalize-package-bin; npm-install-checks-->semver; npm-package-arg-->hosted-git-info; @@ -198,6 +199,7 @@ graph LR; npmcli-git-->npmcli-promise-spawn["@npmcli/promise-spawn"]; npmcli-git-->proc-log; npmcli-git-->semver; + npmcli-git-->which; npmcli-installed-package-contents-->npm-bundled; npmcli-installed-package-contents-->npm-normalize-package-bin; npmcli-map-workspaces-->npmcli-name-from-folder["@npmcli/name-from-folder"]; @@ -220,14 +222,17 @@ graph LR; npmcli-package-json-->npmcli-git["@npmcli/git"]; npmcli-package-json-->proc-log; npmcli-package-json-->semver; + npmcli-promise-spawn-->which; npmcli-run-script-->npmcli-node-gyp["@npmcli/node-gyp"]; npmcli-run-script-->npmcli-package-json["@npmcli/package-json"]; npmcli-run-script-->npmcli-promise-spawn["@npmcli/promise-spawn"]; npmcli-run-script-->proc-log; + npmcli-run-script-->which; npmcli-smoke-tests-->npmcli-eslint-config["@npmcli/eslint-config"]; npmcli-smoke-tests-->npmcli-mock-registry["@npmcli/mock-registry"]; npmcli-smoke-tests-->npmcli-promise-spawn["@npmcli/promise-spawn"]; npmcli-smoke-tests-->npmcli-template-oss["@npmcli/template-oss"]; + npmcli-smoke-tests-->which; pacote-->cacache; pacote-->npm-package-arg; pacote-->npm-packlist; @@ -783,6 +788,6 @@ packages higher up the chain. - @npmcli/map-workspaces, @npmcli/run-script, libnpmaccess, libnpmorg, libnpmpublish, libnpmsearch, libnpmteam, init-package-json, npm-profile - @npmcli/package-json, npm-registry-fetch - @npmcli/git, make-fetch-happen - - @npmcli/installed-package-contents, npm-pick-manifest, cacache, promzard - - @npmcli/docs, @npmcli/smoke-tests, @npmcli/fs, npm-bundled, npm-install-checks, npm-package-arg, normalize-package-data, unique-filename, npm-packlist, bin-links, nopt, parse-conflict-json, read-package-json-fast, @npmcli/mock-globals, read - - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, @npmcli/promise-spawn, ini, hosted-git-info, proc-log, validate-npm-package-name, json-parse-even-better-errors, ssri, unique-slug, @npmcli/node-gyp, @npmcli/redact, @npmcli/agent, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, proggy, minify-registry-metadata, mute-stream, npm-audit-report, npm-user-validate + - @npmcli/smoke-tests, @npmcli/installed-package-contents, npm-pick-manifest, cacache, promzard + - @npmcli/docs, @npmcli/fs, npm-bundled, @npmcli/promise-spawn, npm-install-checks, npm-package-arg, normalize-package-data, unique-filename, npm-packlist, bin-links, nopt, parse-conflict-json, read-package-json-fast, @npmcli/mock-globals, read + - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, which, ini, hosted-git-info, proc-log, validate-npm-package-name, json-parse-even-better-errors, ssri, unique-slug, @npmcli/node-gyp, @npmcli/redact, @npmcli/agent, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, proggy, minify-registry-metadata, mute-stream, npm-audit-report, npm-user-validate diff --git a/scripts/dependency-graph.js b/scripts/dependency-graph.js index 5a946f0a88558..bcacbc2279ae1 100644 --- a/scripts/dependency-graph.js +++ b/scripts/dependency-graph.js @@ -38,8 +38,9 @@ function difference (set1, set2) { // these have a different package name than the repo name, and are ours. const aliases = { - semver: 'node-semver', abbrev: 'abbrev-js', + semver: 'node-semver', + which: 'node-which', } // These are entries in npm-cli-repos.txt that correlate to namespaced repos.