fix: node gyp scripts (#60)

* fix: node gyp scripts * fix: gyp scripts
cnpm · Nov 14, 2023 · 9c24bbb · 9c24bbb
1 parent 824c496
commit 9c24bbb
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -113,7 +113,6 @@ bindings/*/index.node
 .idea
 packages/cli/test/fixtures/project-scripts/apps/a/1
 packages/downloader/test/nginx.conf
-package-lock.json
 
 # napi-rs generate wrong type ignore for tmp
 packages/binding/index.d.ts

diff --git a/integration/fixtures/gyp/package-lock.json b/integration/fixtures/gyp/package-lock.json
diff --git a/integration/fixtures/gyp/package.json b/integration/fixtures/gyp/package.json
@@ -0,0 +1,6 @@
+{
+  "repository": "git@github.com:cnpm/rapid.git",
+  "dependencies": {
+    "fsevents": "^1.2.13"
+  }
+}
diff --git a/integration/index.2.test.js b/integration/index.2.test.js
@@ -171,7 +171,6 @@ describe('test/index.v2.test.js', () => {
   it('should auto clean when reinstall', async () => {
     cwd = path.join(__dirname, './fixtures/esbuild');
 
-
     await coffee
       .fork(rapid, [
         'install',
@@ -203,4 +202,5 @@ describe('test/index.v2.test.js', () => {
     const res = await execa.command('mount', { stdio: 'pipe' });
     assert(res.stdout.indexOf('integration/fixtures/esbuild/node_modules') === res.stdout.lastIndexOf('integration/fixtures/esbuild/node_modules'));
   });
+
 });
diff --git a/packages/cli/lib/node-gyp-bin/node-gyp b/packages/cli/lib/node-gyp-bin/node-gyp
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+node "`dirname "$0"`/node-gyp.js" "$@"
diff --git a/packages/cli/lib/node-gyp-bin/node-gyp.cmd b/packages/cli/lib/node-gyp-bin/node-gyp.cmd
@@ -0,0 +1 @@
+node "%~dp0\node-gyp.js" %*
diff --git a/packages/cli/lib/node-gyp-bin/node-gyp.js b/packages/cli/lib/node-gyp-bin/node-gyp.js
@@ -0,0 +1,3 @@
+'use strict';
+
+return require('node-gyp/bin/node-gyp.js');
diff --git a/packages/cli/lib/util.js b/packages/cli/lib/util.js
@@ -534,7 +534,7 @@ exports.runScript = async (pkgDir, script, options) => {
     // ignore error
   }
   env.PATH = [
-    path.join(__dirname, '../node-gyp-bin'),
+    path.join(__dirname, './node-gyp-bin'),
     path.join(options.cwd, 'node_modules', '.bin'),
     path.join(pkgDir, 'node_modules', '.bin'),
     process.env.PATH,

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -31,7 +31,8 @@
     "semver": "^7.3.8",
     "urllib": "^3.16.1",
     "yargs": "^17.7.2",
-    "yargs-parser": "^9.0.2"
+    "yargs-parser": "^9.0.2",
+    "node-gyp": "^9.0.0"
   },
   "homepage": "https://github.com/cnpm/rapid",
   "repository": {