Skip to content

Commit b86148f

Browse files
committed
Revert "fix(tests): resolve cross-platform npm and path issues"
This reverts commit 698a7ae.
1 parent 698a7ae commit b86148f

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

packages/cli/src/commands/npm/socket-npm-integration.test.mts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ if (!npmDirs.length) {
5151
// Ensure npm is installed in the fixture.
5252
await spawn('npm', ['install', ...(useDebug ? [] : [FLAG_SILENT])], {
5353
cwd: npmPath,
54-
env: {
55-
...process.env,
56-
PATH: `${npmBinPath}${pathSep}${ENV.PATH}`,
57-
},
5854
stdio: useDebug ? 'inherit' : 'ignore',
5955
})
6056

packages/cli/src/shadow/npm/paths.mts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ export function getArboristPackagePath() {
2626
let _arboristClassPath: string | undefined
2727
export function getArboristClassPath() {
2828
if (_arboristClassPath === undefined) {
29-
_arboristClassPath = normalizePath(
30-
path.join(getArboristPackagePath(), 'lib/arborist/index.js'),
29+
_arboristClassPath = path.join(
30+
getArboristPackagePath(),
31+
'lib/arborist/index.js',
3132
)
3233
}
3334
return _arboristClassPath
@@ -36,28 +37,25 @@ export function getArboristClassPath() {
3637
let _arboristEdgeClassPath: string | undefined
3738
export function getArboristEdgeClassPath() {
3839
if (_arboristEdgeClassPath === undefined) {
39-
_arboristEdgeClassPath = normalizePath(
40-
path.join(getArboristPackagePath(), 'lib/edge.js'),
41-
)
40+
_arboristEdgeClassPath = path.join(getArboristPackagePath(), 'lib/edge.js')
4241
}
4342
return _arboristEdgeClassPath
4443
}
4544

4645
let _arboristNodeClassPath: string | undefined
4746
export function getArboristNodeClassPath() {
4847
if (_arboristNodeClassPath === undefined) {
49-
_arboristNodeClassPath = normalizePath(
50-
path.join(getArboristPackagePath(), 'lib/node.js'),
51-
)
48+
_arboristNodeClassPath = path.join(getArboristPackagePath(), 'lib/node.js')
5249
}
5350
return _arboristNodeClassPath
5451
}
5552

5653
let _arboristOverrideSetClassPath: string | undefined
5754
export function getArboristOverrideSetClassPath() {
5855
if (_arboristOverrideSetClassPath === undefined) {
59-
_arboristOverrideSetClassPath = normalizePath(
60-
path.join(getArboristPackagePath(), 'lib/override-set.js'),
56+
_arboristOverrideSetClassPath = path.join(
57+
getArboristPackagePath(),
58+
'lib/override-set.js',
6159
)
6260
}
6361
return _arboristOverrideSetClassPath

0 commit comments

Comments
 (0)