File tree 4 files changed +16
-8
lines changed
tap-snapshots/test/lib/commands
4 files changed +16
-8
lines changed Original file line number Diff line number Diff line change @@ -9,14 +9,18 @@ if (-not (Test-Path $NODE_EXE)) {
9
9
}
10
10
11
11
$NPM_PREFIX_JS = " $PSScriptRoot /node_modules/npm/bin/npm-prefix.js"
12
+ $NPM_CLI_JS = " $PSScriptRoot /node_modules/npm/bin/npm-cli.js"
12
13
$NPM_PREFIX = (& $NODE_EXE $NPM_PREFIX_JS )
13
14
14
15
if ($LASTEXITCODE -ne 0 ) {
15
16
Write-Host " Could not determine Node.js install directory"
16
17
exit 1
17
18
}
18
19
19
- $NPM_CLI_JS = " $NPM_PREFIX /node_modules/npm/bin/npm-cli.js"
20
+ $NPM_PREFIX_NPM_CLI_JS = " $NPM_PREFIX /node_modules/npm/bin/npm-cli.js"
21
+ if (Test-Path $NPM_PREFIX_NPM_CLI_JS ) {
22
+ $NPM_CLI_JS = $NPM_PREFIX_NPM_CLI_JS
23
+ }
20
24
21
25
# Support pipeline input
22
26
if ($MyInvocation.ExpectingInput ) {
Original file line number Diff line number Diff line change @@ -9,14 +9,18 @@ if (-not (Test-Path $NODE_EXE)) {
9
9
}
10
10
11
11
$NPM_PREFIX_JS = " $PSScriptRoot /node_modules/npm/bin/npm-prefix.js"
12
+ $NPX_CLI_JS = " $PSScriptRoot /node_modules/npm/bin/npx-cli.js"
12
13
$NPM_PREFIX = (& $NODE_EXE $NPM_PREFIX_JS )
13
14
14
15
if ($LASTEXITCODE -ne 0 ) {
15
16
Write-Host " Could not determine Node.js install directory"
16
17
exit 1
17
18
}
18
19
19
- $NPX_CLI_JS = " $NPM_PREFIX /node_modules/npm/bin/npx-cli.js"
20
+ $NPM_PREFIX_NPX_CLI_JS = " $NPM_PREFIX /node_modules/npm/bin/npx-cli.js"
21
+ if (Test-Path $NPM_PREFIX_NPX_CLI_JS ) {
22
+ $NPX_CLI_JS = $NPM_PREFIX_NPX_CLI_JS
23
+ }
20
24
21
25
# Support pipeline input
22
26
if ($MyInvocation.ExpectingInput ) {
Original file line number Diff line number Diff line change @@ -731,11 +731,11 @@ Object {
731
731
"warn": Array [
732
732
String(
733
733
doctor getGitPath Error: test error
734
- doctor at which {STACK}
735
- doctor at Doctor.getGitPath {STACK}
736
- doctor at Doctor.exec {STACK}
737
- doctor at processTicksAndRejections {STACK}
738
- doctor at MockNpm.exec {STACK}
734
+ doctor at {STACK}
735
+ doctor at {STACK}
736
+ doctor at {STACK}
737
+ doctor at {STACK}
738
+ doctor at {STACK}
739
739
),
740
740
],
741
741
}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ const cleanCacheSha = (str) =>
11
11
str . replace ( / c o n t e n t - v 2 \/ s h a 5 1 2 \/ [ ^ " ] + / g, 'content-v2/sha512/{sha}' )
12
12
13
13
t . cleanSnapshot = p => cleanCacheSha ( cleanDate ( cleanCwd ( p ) ) )
14
- . replace ( / \s \( ( \{ C W D \} | n o d e : ) .* \d + : \d + \) $ / gm, ' {STACK}' )
14
+ . replace ( / ( d o c t o r \s + a t \s ) .* $ / gm, '$1 {STACK}' )
15
15
16
16
const npmManifest = ( version ) => {
17
17
return {
You can’t perform that action at this time.
0 commit comments