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.

Sign up for GitHub

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

Jump to bottom

feat!: adds --ignore-scripts flag to pack #7850

Open
wants to merge 3 commits into
base: latest
Choose a base branch
from
Open

feat!: adds --ignore-scripts flag to pack #7850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df07a3a
deps!: pacote@20.0.0
reggi Oct 17, 2024
abfc1ba
deps: @npmcli/metavuln-calculator@8.0.1
reggi Oct 17, 2024
72fa7ad
feat!: adds `--ignore-scripts` flag to `pack`
reggi Oct 17, 2024
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
1 change: 1 addition & 0 deletions lib/commands/pack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class Pack extends BaseCommand {
'workspace',
'workspaces',
'include-workspace-root',
'ignore-scripts',
]

static usage = ['<package-spec>']
Expand Down
2 changes: 1 addition & 1 deletion mock-registry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"json-stringify-safe": "^5.0.1",
"nock": "^13.3.3",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"tap": "^16.3.8"
}
}
4 changes: 2 additions & 2 deletions node_modules/@npmcli/metavuln-calculator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npmcli/metavuln-calculator",
"version": "8.0.0",
"version": "8.0.1",
"main": "lib/index.js",
"files": [
"bin/",
Expand Down Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"cacache": "^19.0.0",
"json-parse-even-better-errors": "^4.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"proc-log": "^5.0.0",
"semver": "^7.3.5"
},
Expand Down
3 changes: 3 additions & 0 deletions node_modules/pacote/lib/dir.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ class DirFetcher extends Fetcher {
if (!mani.scripts || !mani.scripts.prepare) {
return
}
if (this.opts.ignoreScripts) {
return
}

// we *only* run prepare.
// pre/post-pack is run by the npm CLI for publish and pack,
Expand Down
2 changes: 1 addition & 1 deletion node_modules/pacote/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pacote",
"version": "19.0.1",
"version": "20.0.0",
"description": "JavaScript package downloader",
"author": "GitHub Inc.",
"bin": {
Expand Down
26 changes: 13 additions & 13 deletions package-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"npm-registry-fetch": "^18.0.1",
"npm-user-validate": "^3.0.0",
"p-map": "^4.0.0",
"pacote": "^19.0.1",
"pacote": "^20.0.0",
"parse-conflict-json": "^4.0.0",
"proc-log": "^5.0.0",
"qrcode-terminal": "^0.12.0",
Expand Down Expand Up @@ -232,7 +232,7 @@
"json-stringify-safe": "^5.0.1",
"nock": "^13.3.3",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"tap": "^16.3.8"
},
"engines": {
Expand Down Expand Up @@ -1621,14 +1621,14 @@
}
},
"node_modules/@npmcli/metavuln-calculator": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-8.0.0.tgz",
"integrity": "sha512-zR2TGfhR8fH1u4VRz9fuC7r1nI9dweViRDsFnMH8J89OA90lJNwF6idTttEzYSWaOTW4NVoAIB6+ujV+/wI+kg==",
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-8.0.1.tgz",
"integrity": "sha512-WXlJx9cz3CfHSt9W9Opi1PTFc4WZLFomm5O8wekxQZmkyljrBRwATwDxfC9iOXJwYVmfiW1C1dUe0W2aN0UrSg==",
"license": "ISC",
"dependencies": {
"cacache": "^19.0.0",
"json-parse-even-better-errors": "^4.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"proc-log": "^5.0.0",
"semver": "^7.3.5"
},
Expand Down Expand Up @@ -11262,9 +11262,9 @@
"license": "BlueOak-1.0.0"
},
"node_modules/pacote": {
"version": "19.0.1",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.1.tgz",
"integrity": "sha512-zIpxWAsr/BvhrkSruspG8aqCQUUrWtpwx0GjiRZQhEM/pZXrigA32ElN3vTcCPUDOFmHr6SFxwYrvVUs5NTEUg==",
"version": "20.0.0",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz",
"integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==",
"inBundle": true,
"license": "ISC",
"dependencies": {
Expand Down Expand Up @@ -16905,7 +16905,7 @@
"npm-package-arg": "^12.0.0",
"npm-pick-manifest": "^10.0.0",
"npm-registry-fetch": "^18.0.1",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"parse-conflict-json": "^4.0.0",
"proc-log": "^5.0.0",
"proggy": "^3.0.0",
Expand Down Expand Up @@ -16986,7 +16986,7 @@
"diff": "^5.1.0",
"minimatch": "^9.0.4",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"tar": "^6.2.1"
},
"devDependencies": {
Expand All @@ -17006,7 +17006,7 @@
"@npmcli/run-script": "^9.0.1",
"ci-info": "^4.0.0",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"proc-log": "^5.0.0",
"read": "^4.0.0",
"read-package-json-fast": "^4.0.0",
Expand Down Expand Up @@ -17067,7 +17067,7 @@
"@npmcli/arborist": "^8.0.0",
"@npmcli/run-script": "^9.0.1",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0"
"pacote": "^20.0.0"
},
"devDependencies": {
"@npmcli/eslint-config": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"npm-registry-fetch": "^18.0.1",
"npm-user-validate": "^3.0.0",
"p-map": "^4.0.0",
"pacote": "^19.0.1",
"pacote": "^20.0.0",
"parse-conflict-json": "^4.0.0",
"proc-log": "^5.0.0",
"qrcode-terminal": "^0.12.0",
Expand Down
3 changes: 2 additions & 1 deletion tap-snapshots/test/lib/docs.js.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,7 +3680,7 @@ npm pack <package-spec>
Options:
[--dry-run] [--json] [--pack-destination <pack-destination>]
[-w|--workspace <workspace-name> [-w|--workspace <workspace-name> ...]]
[-ws|--workspaces] [--include-workspace-root]
[-ws|--workspaces] [--include-workspace-root] [--ignore-scripts]

Run "npm help pack" for more info

Expand All @@ -3694,6 +3694,7 @@ npm pack <package-spec>
#### \`workspace\`
#### \`workspaces\`
#### \`include-workspace-root\`
#### \`ignore-scripts\`
`

exports[`test/lib/docs.js TAP usage ping > must match snapshot 1`] = `
Expand Down
4 changes: 3 additions & 1 deletion workspaces/arborist/lib/arborist/rebuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ module.exports = cls => class Builder extends cls {

// links should run prepare scripts and only link bins after that
if (type === 'links') {
await this.#runScripts('prepare')
if (!this.options.ignoreScripts) {
await this.#runScripts('prepare')
}
}
if (this.options.binLinks) {
await this.#linkAllBins()
Expand Down
2 changes: 1 addition & 1 deletion workspaces/arborist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"npm-package-arg": "^12.0.0",
"npm-pick-manifest": "^10.0.0",
"npm-registry-fetch": "^18.0.1",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"parse-conflict-json": "^4.0.0",
"proc-log": "^5.0.0",
"proggy": "^3.0.0",
Expand Down
35 changes: 35 additions & 0 deletions workspaces/arborist/test/arborist/rebuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,3 +817,38 @@ t.test('no workspaces', async t => {
},
])
})

t.test('do not run lifecycle scripts of linked deps twice', async t => {
const testdir = t.testdir({
project: {
'package.json': JSON.stringify({
name: 'my-project',
version: '1.0.0',
dependencies: {
foo: 'file:../foo',
},
}),
node_modules: {
foo: t.fixture('symlink', '../../foo'),
},
},
foo: {
'package.json': JSON.stringify({
name: 'foo',
version: '1.0.0',
scripts: {
postinstall: 'echo "ok"',
},
}),
},
})

const path = resolve(testdir, 'project')
const Arborist = t.mock('../../lib/arborist/index.js', {
'@npmcli/run-script': () => {
throw new Error('should not run any scripts')
},
})
const arb = new Arborist({ path, registry, ignoreScripts: true })
await arb.rebuild()
})
2 changes: 1 addition & 1 deletion workspaces/libnpmdiff/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"diff": "^5.1.0",
"minimatch": "^9.0.4",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"tar": "^6.2.1"
},
"templateOSS": {
Expand Down
2 changes: 1 addition & 1 deletion workspaces/libnpmexec/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@npmcli/run-script": "^9.0.1",
"ci-info": "^4.0.0",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0",
"pacote": "^20.0.0",
"proc-log": "^5.0.0",
"read": "^4.0.0",
"read-package-json-fast": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/libnpmpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@npmcli/arborist": "^8.0.0",
"@npmcli/run-script": "^9.0.1",
"npm-package-arg": "^12.0.0",
"pacote": "^19.0.0"
"pacote": "^20.0.0"
},
"engines": {
"node": "^20.17.0 || >=22.9.0"
Expand Down
Loading