fix: correctly set the devDir path for node-gyp (#596)

Co-authored-by: Mark Lee <malept@users.noreply.github.com>
electron · Feb 6, 2021 · 5dadede · 5dadede
1 parent efd73ef
commit 5dadede
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/module-rebuilder.ts b/src/module-rebuilder.ts
@@ -85,8 +85,7 @@ export class ModuleRebuilder {
       `--target=${this.rebuilder.electronVersion}`,
       `--arch=${this.rebuilder.arch}`,
       `--dist-url=${this.rebuilder.headerURL}`,
-      '--build-from-source',
-      `--devdir="${ELECTRON_GYP_DIR}"`
+      '--build-from-source'
     ];
 
     if (process.env.DEBUG) {
@@ -206,6 +205,7 @@ export class ModuleRebuilder {
 
     const nodeGyp = NodeGyp();
     nodeGyp.parseArgv(nodeGypArgs);
+    nodeGyp.devDir = ELECTRON_GYP_DIR;
     let command = nodeGyp.todo.shift();
     const originalWorkingDir = process.cwd();
     try {

diff --git a/test/rebuild.ts b/test/rebuild.ts
@@ -92,6 +92,13 @@ describe('rebuilder', () => {
         await expectNativeModuleToNotBeRebuilt(testModulePath, 'ffi-napi');
       });
 
+      it('should not download files in the module directory', async () => {
+        const modulePath = path.resolve(testModulePath, 'node_modules/ref-napi');
+        const fileNames = await fs.readdir(modulePath);
+
+        expect(fileNames).to.not.contain(testElectronVersion);
+      });
+
       after(async () => {
         delete process.env.ELECTRON_REBUILD_TESTS;
         await cleanupTestModule();