fix: potential fix for packaged executable

Author: tegefaulkes

scripts/build.mjs

@@ -9,70 +9,70 @@ import childProcess from 'node:child_process';
 import esbuild from 'esbuild';
 import config from 'polykey/config.js';
 import packageJSON from '../package.json' assert { type: 'json' };
-import { createRequire } from 'node:module';
 
 const projectPath = path.dirname(
   path.dirname(url.fileURLToPath(import.meta.url)),
 );
 
 const platform = os.platform();
 
-const nativeDirnameOverridePlugin = (nativePackages) => {
-  return {
-    name: 'native-dirname-override',
-    setup(build) {
-      const require = createRequire(import.meta.url);
-
-      for (const pkgName of nativePackages) {
-        let pkgJsonPath;
-        try {
-          pkgJsonPath = require.resolve(`${pkgName}/package.json`);
-        } catch {
-          console.log('Skipping', pkgName);
-          continue;
-        }
-        const pkgRoot = path.dirname(pkgJsonPath);
-
-        // Read package.json and resolve entry point
-        const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
-        let relativeEntry;
-
-        if (pkgJson.exports && typeof pkgJson.exports === 'object') {
-          const mainExport = pkgJson.exports['.'];
-          if (typeof mainExport === 'string') {
-            relativeEntry = mainExport;
-          } else if (mainExport?.require) {
-            relativeEntry = mainExport.require;
-          } else if (mainExport?.import) {
-            relativeEntry = mainExport.import;
-          }
-        }
-
-        if (!relativeEntry) {
-          relativeEntry = 'index.js';
-        }
-
-        const resolvedEntry = path.join(pkgRoot, relativeEntry);
-
-        build.onLoad({ filter: /.*/, namespace: 'file' }, async (args) => {
-          if (path.resolve(args.path) !== path.resolve(resolvedEntry)) return;
-
-          return {
-            contents: ` module.exports = require('node-gyp-build')(${JSON.stringify(
-              pkgRoot,
-            )}); `,
-            loader: 'js',
-          };
-        });
+const nativeNodeModulesPlugin = {
+  name: 'native-node-modules',
+  setup(build) {
+    build.onLoad({ filter: /\.*/, namespace: 'file' }, (args) => {
+      const filename = path.basename(args.path);
+      if (filename === 'rocksdb.js') {
+        return {
+          contents: `
+            import path from 'node:path';
+            import url from 'node:url';
+            import nodeGypBuild from 'node-gyp-build';
+            const projectPath = path.join(path.dirname(url.fileURLToPath(import.meta.url)), '..', 'node_modules', '@matrixai', 'db');
+            const rocksdb = nodeGypBuild(projectPath);
+            export default rocksdb;
+            //# sourceMappingURL=rocksdb.js.map
+         `,
+          loader: 'js',
+        };
       }
-    },
-  };
+      if (args.path.endsWith('fd-lock/index.js')) {
+        return {
+          contents: `
+            const path = require('path');
+            const binding = require('node-gyp-build')(path.join(__dirname, '..', 'node_modules', 'fd-lock'))
+            
+            lock.unlock = unlock
+            module.exports = lock
+            
+            function lock (fd) {
+              return !!binding.fd_lock(fd)
+            }
+            
+            function unlock (fd) {
+              return !!binding.fd_unlock(fd)
+            }
+          `,
+          loader: 'js',
+        };
+      }
+      if (args.path.endsWith('sodium-native/index.js')) {
+        return {
+          contents: `
+            const path = require('path');
+            module.exports = require('node-gyp-build')(path.join(__dirname, '..', 'node_modules', 'sodium-native'))
+          `,
+          loader: 'js',
+        };
+      }
+      return;
+    });
+  },
 };
 
 /* eslint-disable no-console */
 async function main(argv = process.argv) {
   argv = argv.slice(2);
-  const pkgIndex = argv.findIndex((v) => v == '--pkg');
+  const pkgIndex = argv.findIndex((v) => v === '--pkg');
   if (pkgIndex >= 0) argv.splice(pkgIndex, 1);
   const isPkg = pkgIndex >= 0;
   const buildPath = path.join(projectPath, 'build');
@@ -123,7 +123,25 @@ async function main(argv = process.argv) {
 
   // This specifies import paths that is left as an external require
   // This is kept to packages that have a native binding
-  const externalDependencies = Object.keys(packageJSON.optionalDependencies);
+  /** @type { import('esbuild').BuildOptions } */
+  const extraOptions = isPkg
+    ? {
+        external: [],
+        format: 'cjs',
+        inject: [path.join(projectPath, './shims/import-meta-url-shim.mjs')],
+        // Fix import.meta.url in CJS output
+        define: {
+          'import.meta.url': '__import_meta_url',
+        },
+        outExtension: { '.js': '.cjs' },
+      }
+    : {
+        // External: externalDependencies,
+        format: 'esm',
+        inject: [path.join(projectPath, './shims/require-shim.mjs')],
+        outExtension: { '.js': '.mjs' },
+      };
+
   /** @type { import('esbuild').BuildOptions } */
   const esbuildOptions = {
     // 2 entrypoints, the main script and the worker script
@@ -135,36 +153,18 @@ async function main(argv = process.argv) {
     bundle: true,
     platform: 'node',
     outdir: distPath,
-    // external: isPkg ? ['*.node'] : externalDependencies,
-    external: isPkg ? [] : externalDependencies,
-    // external: externalDependencies,
-    treeShaking: true,
+    treeShaking: false,
     // External source map for debugging
     sourcemap: true,
     // Minify and keep the original names
     minify: false,
     keepNames: true,
-    // Supporting ESM
-    format: isPkg ? 'cjs' : 'esm',
-    // format: 'esm',
-    inject: isPkg
-      ? [path.join(projectPath, './shims/import-meta-url-shim.mjs')]
-      : [path.join(projectPath, './shims/require-shim.mjs')],
-    // inject: [path.join(projectPath, './shims/require-shim.mjs')],
-    // Fix import.meta.url in CJS output
-    define: isPkg
-      ? {
-          'import.meta.url': '__import_meta_url',
-        }
-      : {},
-    outExtension: isPkg ? { '.js': '.cjs' } : { '.js': '.mjs' },
-    // outExtension: { '.js': '.mjs' },
-    plugins: isPkg ? [nativeDirnameOverridePlugin(externalDependencies)] : [],
+    plugins: [nativeNodeModulesPlugin],
+    ...extraOptions,
   };
   console.error('Running esbuild:');
   console.error(esbuildOptions);
   await esbuild.build(esbuildOptions);
-
   // Rename worker script
   console.error('Renaming worker script');
   childProcess.execFileSync(
@@ -187,7 +187,6 @@ async function main(argv = process.argv) {
       `dist/polykeyWorkerManifest.${isPkg ? 'cjs' : 'mjs'}.map`,
       'dist/polykeyWorkerManifest.js.map',
     ],
-    // ['dist/polykeyWorkerManifest.mjs.map', 'dist/polykeyWorkerManifest.js.map'],
     {
       stdio: ['inherit', 'inherit', 'inherit'],
       windowsHide: true,