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

fix(libnpmpack): obey ignoreScripts #5651

Merged
merged 1 commit into from
Oct 12, 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
4 changes: 2 additions & 2 deletions workspaces/libnpmpack/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async function pack (spec = 'file:.', opts = {}) {

const stdio = opts.foregroundScripts ? 'inherit' : 'pipe'

if (spec.type === 'directory') {
if (spec.type === 'directory' && !opts.ignoreScripts) {
// prepack
await runScript({
...opts,
Expand All @@ -48,7 +48,7 @@ async function pack (spec = 'file:.', opts = {}) {
await writeFile(destination, tarball)
}

if (spec.type === 'directory') {
if (spec.type === 'directory' && !opts.ignoreScripts) {
// postpack
await runScript({
...opts,
Expand Down
5 changes: 1 addition & 4 deletions workspaces/libnpmpack/test/fixtures/tspawk.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ const spawk = require('spawk')
module.exports = tspawk

function tspawk (t) {
spawk.preventUnmatched()
t.teardown(function () {
spawk.unload()
})
t.afterEach(function () {
spawk.done()
spawk.unload()
})
return spawk
}
39 changes: 37 additions & 2 deletions workspaces/libnpmpack/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const t = require('tap')

const tspawk = require('./fixtures/tspawk.js')
const spawk = tspawk(t)

const fs = require('fs')
const path = require('path')
Expand Down Expand Up @@ -138,8 +139,6 @@ t.test('packs from registry spec', async t => {
})

t.test('runs scripts in foreground when foregroundScripts === true', async t => {
const spawk = tspawk(t)

const testDir = t.testdir({
'package.json': JSON.stringify({
name: 'my-cool-pkg',
Expand Down Expand Up @@ -172,3 +171,39 @@ t.test('runs scripts in foreground when foregroundScripts === true', async t =>
process.chdir(cwd)
})
})

t.test('doesn\'t run scripts when ignoreScripts === true', async t => {
const testDir = t.testdir({
'package.json': JSON.stringify({
name: 'my-cool-pkg',
version: '1.0.0',
scripts: {
prepack: 'touch prepack',
},
}, null, 2),
})

const cwd = process.cwd()
process.chdir(testDir)

const [scriptShell, scriptArgs] = makeSpawnArgs({
event: 'prepack',
path: testDir,
cmd: 'touch prepack',
})

const prepack = spawk.spawn(scriptShell, scriptArgs)

await pack('file:.', {
packDestination: testDir,
foregroundScripts: true,
ignoreScripts: true,
})

t.ok(!prepack.called)

t.teardown(async () => {
process.chdir(cwd)
spawk.clean()
})
})