Skip to content

Commit 5f39e7c

Browse files
ljharbljharb
committed
fix(pack, publish): default foreground-scripts to true
Fixes #6816
1 parent 162c82e commit 5f39e7c

File tree

6 files changed

+160
-0
lines changed

6 files changed

+160
-0
lines changed

‎lib/commands/pack.js

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ class Pack extends BaseCommand {
2121
static workspaces = true
2222
static ignoreImplicitWorkspace = false
2323

24+
constructor (...args) {
25+
super(...args)
26+
this.npm.config.set('foreground-scripts', true, 'default')
27+
}
28+
2429
async exec (args) {
2530
if (args.length === 0) {
2631
args = ['.']

‎lib/commands/publish.js

+5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ class Publish extends BaseCommand {
3737
static workspaces = true
3838
static ignoreImplicitWorkspace = false
3939

40+
constructor (...args) {
41+
super(...args)
42+
this.npm.config.set('foreground-scripts', true, 'default')
43+
}
44+
4045
async exec (args) {
4146
if (args.length === 0) {
4247
args = ['.']

‎tap-snapshots/test/lib/commands/pack.js.test.cjs

+21
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,27 @@ Array [
2626
]
2727
`
2828

29+
exports[`test/lib/commands/pack.js TAP foreground-scripts defaults to true > logs pack contents 1`] = `
30+
Array [
31+
undefined,
32+
"package: test-fg-scripts@0.0.0",
33+
undefined,
34+
"110B package.json",
35+
undefined,
36+
String(
37+
name: test-fg-scripts
38+
version: 0.0.0
39+
filename: test-fg-scripts-0.0.0.tgz
40+
package size: {size}
41+
unpacked size: 110 B
42+
shasum: {sha}
43+
integrity: {integrity}
44+
total files: 1
45+
),
46+
"",
47+
]
48+
`
49+
2950
exports[`test/lib/commands/pack.js TAP should log output as valid json > logs pack contents 1`] = `
3051
Array []
3152
`

‎tap-snapshots/test/lib/commands/publish.js.test.cjs

+43
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,49 @@ Array [
5656
]
5757
`
5858

59+
exports[`test/lib/commands/publish.js TAP foreground-scripts defaults to true > must match snapshot 1`] = `
60+
Array [
61+
Array [
62+
"",
63+
],
64+
Array [
65+
"",
66+
"package: test-fg-scripts@0.0.0",
67+
],
68+
Array [
69+
"=== Tarball Contents ===",
70+
],
71+
Array [
72+
"",
73+
"110B package.json",
74+
],
75+
Array [
76+
"=== Tarball Details ===",
77+
],
78+
Array [
79+
"",
80+
String(
81+
name: test-fg-scripts
82+
version: 0.0.0
83+
filename: test-fg-scripts-0.0.0.tgz
84+
package size: {size}
85+
unpacked size: 110 B
86+
shasum: {sha}
87+
integrity: {integrity}
88+
total files: 1
89+
),
90+
],
91+
Array [
92+
"",
93+
"",
94+
],
95+
Array [
96+
"",
97+
"Publishing to https://registry.npmjs.org/ with tag latest and default access (dry-run)",
98+
],
99+
]
100+
`
101+
59102
exports[`test/lib/commands/publish.js TAP has mTLS auth for scope configured registry > new package version 1`] = `
60103
+ @npm/test-package@1.0.0
61104
`

‎test/lib/commands/pack.js

+42
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,48 @@ t.test('dry run', async t => {
105105
t.throws(() => fs.statSync(path.resolve(npm.prefix, filename)))
106106
})
107107

108+
t.test('foreground-scripts defaults to true', async t => {
109+
const { npm, outputs, logs } = await loadMockNpm(t, {
110+
prefixDir: {
111+
'package.json': JSON.stringify({
112+
name: 'test-fg-scripts',
113+
version: '0.0.0',
114+
scripts: {
115+
prepack: 'echo prepack!',
116+
postpack: 'echo postpack!',
117+
},
118+
}
119+
),
120+
},
121+
config: { 'dry-run': true },
122+
})
123+
124+
/* eslint no-console: 0 */
125+
// TODO: replace this with `const results = t.intercept(console, 'log')`
126+
const log = console.log
127+
t.teardown(() => {
128+
console.log = log
129+
})
130+
const caughtLogs = []
131+
console.log = (...args) => {
132+
caughtLogs.push(args)
133+
}
134+
// end TODO
135+
136+
await npm.exec('pack', [])
137+
const filename = 'test-fg-scripts-0.0.0.tgz'
138+
t.same(
139+
caughtLogs,
140+
[
141+
['\n> test-fg-scripts@0.0.0 prepack\n> echo prepack!\n'],
142+
['\n> test-fg-scripts@0.0.0 postpack\n> echo postpack!\n'],
143+
],
144+
'prepack and postpack log to stdout')
145+
t.strictSame(outputs, [[filename]])
146+
t.matchSnapshot(logs.notice.map(([, m]) => m), 'logs pack contents')
147+
t.throws(() => fs.statSync(path.resolve(npm.prefix, filename)))
148+
})
149+
108150
t.test('invalid packument', async t => {
109151
const { npm, outputs } = await loadMockNpm(t, {
110152
prefixDir: {

‎test/lib/commands/publish.js

+44
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,50 @@ t.test('dry-run', async t => {
167167
t.matchSnapshot(logs.notice)
168168
})
169169

170+
t.test('foreground-scripts defaults to true', async t => {
171+
const { joinedOutput, npm, logs } = await loadMockNpm(t, {
172+
config: {
173+
'dry-run': true,
174+
...auth,
175+
},
176+
prefixDir: {
177+
'package.json': JSON.stringify({
178+
name: 'test-fg-scripts',
179+
version: '0.0.0',
180+
scripts: {
181+
prepack: 'echo prepack!',
182+
postpack: 'echo postpack!',
183+
},
184+
}
185+
),
186+
},
187+
})
188+
189+
/* eslint no-console: 0 */
190+
// TODO: replace this with `const results = t.intercept(console, 'log')`
191+
const log = console.log
192+
t.teardown(() => {
193+
console.log = log
194+
})
195+
const caughtLogs = []
196+
console.log = (...args) => {
197+
caughtLogs.push(args)
198+
}
199+
// end TODO
200+
201+
await npm.exec('publish', [])
202+
t.equal(joinedOutput(), `+ test-fg-scripts@0.0.0`)
203+
t.matchSnapshot(logs.notice)
204+
205+
t.same(
206+
caughtLogs,
207+
[
208+
['\n> test-fg-scripts@0.0.0 prepack\n> echo prepack!\n'],
209+
['\n> test-fg-scripts@0.0.0 postpack\n> echo postpack!\n'],
210+
],
211+
'prepack and postpack log to stdout')
212+
})
213+
170214
t.test('shows usage with wrong set of arguments', async t => {
171215
const { publish } = await loadMockNpm(t, { command: 'publish' })
172216
await t.rejects(publish.exec(['a', 'b', 'c']), publish.usage)

0 commit comments

Comments
 (0)