File tree Expand file tree Collapse file tree 4 files changed +16
-8
lines changed
tap-snapshots/test/lib/commands Expand file tree Collapse file tree 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)) {
99}
1010
1111$NPM_PREFIX_JS = " $PSScriptRoot /node_modules/npm/bin/npm-prefix.js"
12+ $NPM_CLI_JS = " $PSScriptRoot /node_modules/npm/bin/npm-cli.js"
1213$NPM_PREFIX = (& $NODE_EXE $NPM_PREFIX_JS )
1314
1415if ($LASTEXITCODE -ne 0 ) {
1516 Write-Host " Could not determine Node.js install directory"
1617 exit 1
1718}
1819
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+ }
2024
2125# Support pipeline input
2226if ($MyInvocation.ExpectingInput ) {
Original file line number Diff line number Diff line change @@ -9,14 +9,18 @@ if (-not (Test-Path $NODE_EXE)) {
99}
1010
1111$NPM_PREFIX_JS = " $PSScriptRoot /node_modules/npm/bin/npm-prefix.js"
12+ $NPX_CLI_JS = " $PSScriptRoot /node_modules/npm/bin/npx-cli.js"
1213$NPM_PREFIX = (& $NODE_EXE $NPM_PREFIX_JS )
1314
1415if ($LASTEXITCODE -ne 0 ) {
1516 Write-Host " Could not determine Node.js install directory"
1617 exit 1
1718}
1819
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+ }
2024
2125# Support pipeline input
2226if ($MyInvocation.ExpectingInput ) {
Original file line number Diff line number Diff line change @@ -731,11 +731,11 @@ Object {
731731 "warn": Array [
732732 String(
733733 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}
739739 ),
740740 ],
741741}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ const cleanCacheSha = (str) =>
1111 str . replace ( / c o n t e n t - v 2 \/ s h a 5 1 2 \/ [ ^ " ] + / g, 'content-v2/sha512/{sha}' )
1212
1313t . 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}' )
1515
1616const npmManifest = ( version ) => {
1717 return {
You can’t perform that action at this time.
0 commit comments