feat: add option to use globally installed npm

saucelabs · Aug 1, 2024 · 75dc181 · 75dc181
1 parent 4e7d786
commit 75dc181
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/npm.ts b/src/npm.ts
@@ -39,11 +39,8 @@ export default class NPM {
 
     let p;
 
-    if (
-      nodeCtx.nodePath.startsWith('node') &&
-      nodeCtx.npmPath.startsWith('npm')
-    ) {
-      p = spawn(nodeCtx.npmPath, ['install', ...pkgs], { shell: true });
+    if (nodeCtx.useGlobals) {
+      p = spawn("npm", ['install', ...pkgs], { shell: true });
     } else {
       p = spawn(nodeCtx.nodePath, [nodeCtx.npmPath, 'install', ...pkgs]);
     }
@@ -74,11 +71,8 @@ export default class NPM {
 
       let p;
 
-      if (
-        nodeCtx.nodePath.startsWith('node') &&
-        nodeCtx.npmPath.startsWith('npm')
-      ) {
-        p = spawn(nodeCtx.npmPath, ['config', 'set', ...args], { shell: true });
+      if (nodeCtx.useGlobals) {
+        p = spawn("npm", ['config', 'set', ...args], { shell: true });
       } else {
         p = spawn(nodeCtx.nodePath, [
           nodeCtx.npmPath,
@@ -102,11 +96,8 @@ export default class NPM {
   ): Promise<number | null> {
     return new Promise((resolve) => {
       let p;
-      if (
-        nodeCtx.nodePath.startsWith('node') &&
-        nodeCtx.npmPath.startsWith('npm')
-      ) {
-        p = spawn(nodeCtx.npmPath, ['rebuild', ...args], { shell: true });
+      if (nodeCtx.useGlobals) {
+        p = spawn("npm", ['rebuild', ...args], { shell: true });
       } else {
         p = spawn(nodeCtx.nodePath, [nodeCtx.npmPath, 'rebuild', ...args]);
       }

diff --git a/src/types.ts b/src/types.ts
@@ -43,4 +43,8 @@ export interface SuitesContainer {
 export interface NodeContext {
   nodePath: string;
   npmPath: string;
+
+  // Ignore the specific binary paths provided and rely on the binaries
+  // from PATH.
+  useGlobals: boolean;
 }