fix: force npm to use the bundled node-gyp

atom-community · Jun 25, 2022 · 27ca8dd · 27ca8dd
1 parent 689b5f1
commit 27ca8dd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/bin/apm b/bin/apm
@@ -28,7 +28,7 @@ done
 
 binDir=`pwd -P`
 
-# Force npm to use the bundled node-gyp
+# set the path to the node-gyp fallback
 export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js
 
 cliPath="$binDir/../lib/cli.js"

diff --git a/bin/apm.cmd b/bin/apm.cmd
@@ -12,7 +12,7 @@ if not defined apm_git_path (
   if defined apm_git_path set "Path=!apm_git_path!;!PATH!"
 )
 
-:: Force npm to use the bundled node-gyp
+:: set the path to the node-gyp fallback
 set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js"
 set "npm_config_node_gyp=%npm_config_node_gyp:\=/%"
 

diff --git a/bin/npm b/bin/npm
@@ -2,7 +2,7 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PATH="$SCRIPT_DIR:$PATH"
 
-# Force npm to use the bundled node-gyp
+# set the path to the node-gyp fallback
 export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js
 
 "$SCRIPT_DIR"/../node_modules/.bin/npm $@
diff --git a/bin/npm.cmd b/bin/npm.cmd
@@ -3,7 +3,7 @@ setlocal EnableDelayedExpansion
 
 set "PATH=%~dp0;%PATH%"
 
-:: Force npm to use the bundled node-gyp
+:: set the path to the node-gyp fallback
 set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js"
 set "npm_config_node_gyp=%npm_config_node_gyp:\=/%"
 

diff --git a/bin/pnpm b/bin/pnpm
@@ -2,7 +2,7 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PATH="$SCRIPT_DIR:$PATH"
 
-# Force npm to use the bundled node-gyp
+# set the path to the node-gyp fallback
 export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js
 
 "$SCRIPT_DIR"/../node_modules/.bin/pnpm $@
diff --git a/bin/pnpm.cmd b/bin/pnpm.cmd
@@ -3,7 +3,7 @@ setlocal EnableDelayedExpansion
 
 set "PATH=%~dp0;%PATH%"
 
-:: Force npm to use the bundled node-gyp
+:: set the path to the node-gyp fallback
 set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js"
 set "npm_config_node_gyp=%npm_config_node_gyp:\=/%"
 

diff --git a/package.json b/package.json
@@ -92,5 +92,10 @@
     "prettier": "^2.7.1",
     "prettier-config-atomic": "^3.0.10",
     "shx": "^0.3.3"
+  },
+  "pnpm": {
+    "overrides": {
+      "npm>node-gyp": "^9.0.0"
+    }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml