fix: allow using forks for prebuilt modules

src/module-type/index.ts

@@ -53,6 +53,24 @@ export class NativeModule {
 
     return binary?.napi_versions;
   }
+
+  /**
+   * Search dependencies for package using either `packageName` or
+   * `@namespace/packageName` in the case of forks.
+   */
+  async findPackageInDependencies(packageName: string, packageProperty = 'dependencies'): Promise<string | null> {
+    const dependencies = await this.packageJSONFieldWithDefault(packageProperty, {});
+    if (typeof dependencies !== 'object') return null;
+
+    // Look for direct dependency match
+    // eslint-disable-next-line no-prototype-builtins
+    if (dependencies.hasOwnProperty(packageName)) return packageName;
+
+    const forkedPackage = Object.keys(dependencies).find(dependency =>
+      dependency.startsWith('@') && dependency.endsWith(`/${packageName}`));
+
+    return forkedPackage || null;
+  }
 }
 
 export async function locateBinary(basePath: string, suffix: string): Promise<string | null> {

src/module-type/node-pre-gyp.ts

@@ -7,13 +7,17 @@ const d = debug('electron-rebuild');
 
 export class NodePreGyp extends NativeModule {
   async usesTool(): Promise<boolean> {
-    const dependencies = await this.packageJSONFieldWithDefault('dependencies', {});
-    // eslint-disable-next-line no-prototype-builtins
-    return dependencies.hasOwnProperty('@mapbox/node-pre-gyp');
+    const packageName = await this.findPackageInDependencies('node-pre-gyp');
+    return !!packageName;
   }
 
   async locateBinary(): Promise<string | null> {
-    return locateBinary(this.modulePath, 'node_modules/@mapbox/node-pre-gyp/bin/node-pre-gyp');
+    const packageName = await this.findPackageInDependencies('node-pre-gyp');
+    if (!packageName) return null;
+    return locateBinary(
+      this.modulePath,
+      `node_modules/${packageName}/bin/node-pre-gyp`
+    );
   }
 
   async run(nodePreGypPath: string): Promise<void> {

src/module-type/prebuild-install.ts

@@ -8,13 +8,17 @@ const d = debug('electron-rebuild');
 
 export class PrebuildInstall extends NativeModule {
   async usesTool(): Promise<boolean> {
-    const dependencies = await this.packageJSONFieldWithDefault('dependencies', {});
-    // eslint-disable-next-line no-prototype-builtins
-    return dependencies.hasOwnProperty('prebuild-install');
+    const packageName = await this.findPackageInDependencies('prebuild-install');
+    return !!packageName;
   }
 
   async locateBinary(): Promise<string | null> {
-    return locateBinary(this.modulePath, 'node_modules/prebuild-install/bin.js');
+    const packageName = await this.findPackageInDependencies('prebuild-install');
+    if (!packageName) return null;
+    return locateBinary(
+      this.modulePath,
+      `node_modules/${packageName}/bin.js`
+    );
   }
 
   async run(prebuildInstallPath: string): Promise<void> {

src/module-type/prebuildify.ts

@@ -32,14 +32,11 @@ export function determineNativePrebuildExtension(arch: string): string {
 
 export class Prebuildify extends NativeModule {
   async usesTool(): Promise<boolean> {
-    const devDependencies = await this.packageJSONFieldWithDefault('devDependencies', {});
-    // eslint-disable-next-line no-prototype-builtins
-    return devDependencies.hasOwnProperty('prebuildify');
+    const packageName = await this.findPackageInDependencies('prebuildify', 'devDependencies');
+    return !!packageName;
   }
 
   async findPrebuiltModule(): Promise<boolean> {
-    const nodeArch = getNodeArch(this.rebuilder.arch, process.config.variables as ConfigVariables);
-
     d(`Checking for prebuilds for "${this.moduleName}"`);
 
     const prebuildsDir = path.join(this.modulePath, 'prebuilds');
@@ -48,6 +45,7 @@ export class Prebuildify extends NativeModule {
       return false;
     }
 
+    const nodeArch = getNodeArch(this.rebuilder.arch, process.config.variables as ConfigVariables);
     const prebuiltModuleDir = path.join(prebuildsDir, `${this.rebuilder.platform}-${determineNativePrebuildArch(nodeArch)}`);
     const nativeExt = determineNativePrebuildExtension(nodeArch);
     const electronNapiModuleFilename = path.join(prebuiltModuleDir, `electron.napi.${nativeExt}`);

test/fixture/forked-module-test/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "forked-module-test",
+  "productName": "Native App",
+  "version": "1.0.0",
+  "description": "",
+  "main": "src/index.js",
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@electron/node-pre-gyp": "npm:@mapbox/node-pre-gyp@1.0.11",
+    "@electron/prebuild-install": "npm:prebuild-install@7.1.2"
+  },
+  "devDependencies": {
+    "@electron/prebuildify": "npm:prebuildify@6.0.1"
+  }
+}

test/helpers/module-setup.ts

@@ -1,9 +1,12 @@
+import debug from 'debug';
 import crypto from 'crypto';
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
 import { spawn } from '@malept/cross-spawn-promise';
 
+const d = debug('electron-rebuild');
+
 const originalGypMSVSVersion: string | undefined = process.env.GYP_MSVS_VERSION;
 const TIMEOUT_IN_MINUTES = process.platform === 'win32' ? 5 : 2;
 
@@ -23,6 +26,7 @@ const testModuleTmpPath = fs.mkdtempSync(path.resolve(os.tmpdir(), 'e-r-test-mod
 export async function resetTestModule(testModulePath: string, installModules = true, fixtureName = 'native-app1'): Promise<void> {
   const oneTimeModulePath = path.resolve(testModuleTmpPath, `${crypto.createHash('SHA1').update(testModulePath).digest('hex')}-${fixtureName}-${installModules}`);
   if (!await fs.pathExists(oneTimeModulePath)) {
+    d(`creating test module '%s' in %s`, fixtureName, oneTimeModulePath);
     await fs.mkdir(oneTimeModulePath, { recursive: true });
     await fs.copy(path.resolve(__dirname, `../../test/fixture/${ fixtureName }`), oneTimeModulePath);
     if (installModules) {

test/module-type-node-pre-gyp.ts

@@ -81,4 +81,11 @@ describe('node-pre-gyp', function () {
     nodePreGyp = new NodePreGyp(rebuilder, modulePath);
     expect(await nodePreGyp.findPrebuiltModule()).to.equal(true);
   });
+
+  it('should find module fork', async () => {
+    await resetTestModule(testModulePath, false, 'forked-module-test');
+    const rebuilder = new Rebuilder(rebuilderArgs);
+    const nodePreGyp = new NodePreGyp(rebuilder, testModulePath);
+    expect(await nodePreGyp.usesTool()).to.equal(true);
+  });
 });

test/module-type-prebuild-install.ts

@@ -73,4 +73,11 @@ describe('prebuild-install', () => {
       expect(await prebuild.findPrebuiltModule()).to.equal(true);
     });
   });
+
+  it('should find module fork', async () => {
+    await resetTestModule(testModulePath, false, 'forked-module-test');
+    const rebuilder = new Rebuilder(rebuilderArgs);
+    const nodePreGyp = new PrebuildInstall(rebuilder, testModulePath);
+    expect(await nodePreGyp.usesTool()).to.equal(true);
+  });
 });

test/module-type-prebuildify.ts

@@ -133,4 +133,10 @@ describe('prebuildify', () => {
       expect(await prebuildify.findPrebuiltModule()).to.equal(true);
     });
   });
+
+  it('should find module fork', async () => {
+    const rebuilder = createRebuilder();
+    const prebuildify = new Prebuildify(rebuilder, path.join(__dirname, 'fixture', 'forked-module-test'));
+    expect(await prebuildify.usesTool()).to.equal(true);
+  });
 });