Fix windows packaging by making native modules external

Author: pimterry

build-release.sh

@@ -63,7 +63,7 @@ case "$TARGET_PLATFORM" in
     linux)
         EXPECTED_BIN_STRING="ELF"
         # Builds raw on non-Windows, but never used
-        PACKAGE_WHITELIST="registry.node"
+        PACKAGE_WHITELIST="registry-js"
         ;;
     win32)
         EXPECTED_BIN_STRING="MS Windows"
@@ -72,7 +72,7 @@ case "$TARGET_PLATFORM" in
     darwin)
         EXPECTED_BIN_STRING="Mach-O"
         # Builds raw on non-Windows, but never used
-        PACKAGE_WHITELIST="registry.node"
+        PACKAGE_WHITELIST="registry-js"
         ;;
     *)
         echo "Unknown platform $TARGET_PLATFORM"

pack.ts

@@ -19,26 +19,6 @@ const spawn = (command: string, args: string[] = [], options?: SpawnOptions) =>
     });
 }
 
-const updateRegistryJs = async (platform: string) => {
-    // Install registry JS for a given target platform, and copy its native
-    // module into our bundle.
-    const registryJsDir = path.join(OUTPUT_DIR, 'node_modules', 'registry-js');
-    await fs.rmdir(registryJsDir).catch(() => {});
-    await spawn('npm', [
-        'install',
-        'registry-js',
-        '--no-save'
-    ], {
-        cwd: OUTPUT_DIR,
-        stdio: 'inherit',
-        env: Object.assign({}, process.env, { 'npm_config_platform': platform })
-    });
-    await fs.copyFile(
-        path.join(registryJsDir, 'build', 'Release', 'registry.node'),
-        path.join(OUTPUT_DIR, 'bundle', 'registry.node'),
-    );
-};
-
 const packageApp = async () => {
     console.log('Preparing packaging directory');
     await fs.emptyDir(OUTPUT_DIR);
@@ -75,15 +55,12 @@ const packageApp = async () => {
 
     // Run build-release in this folder, for each platform:
     console.log('Building for Linux');
-    await updateRegistryJs('linux');
     await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 
     console.log('Building for Darwin');
-    await updateRegistryJs('darwin');
     await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 
     console.log('Building for Win32');
-    await updateRegistryJs('win32');
     await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 }
 

package-lock.json

@@ -44,8 +44,10 @@
     "lodash": "^4.17.13",
     "mockttp": "^0.18.0",
     "node-gsettings-wrapper": "^0.5.0",
+    "registry-js": "^1.4.0",
     "rimraf": "^2.6.2",
-    "tslib": "^1.9.3"
+    "tslib": "^1.9.3",
+    "win-version-info": "^3.0.1"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.19.4",
@@ -70,7 +72,6 @@
     "got": "^9.6.0",
     "graphql.js": "^0.6.1",
     "mocha": "^5.2.0",
-    "native-ext-loader": "^2.3.0",
     "needle": "^2.4.0",
     "node-dev": "^3.1.3",
     "node-fetch": "^2.6.0",
@@ -115,7 +116,9 @@
       "@oclif/command",
       "@oclif/config",
       "@oclif/plugin-help",
-      "@oclif/plugin-update"
+      "@oclif/plugin-update",
+      "registry-js",
+      "win-version-info"
     ],
     "update": {
       "s3": {

package.json

@@ -35,16 +35,13 @@ module.exports = {
                 test: /\.mjs$/,
                 include: /node_modules/,
                 type: "javascript/auto",
-            },
-            {
-                // Allows us to require native modules
-                test: /\.node$/,
-                loader: "native-ext-loader"
             }
         ]
     },
     externals: [
-        '@oclif/plugin-update/lib/commands/update'
+        '@oclif/plugin-update/lib/commands/update', // Lots of complicated dynamic requires in @oclif
+        'registry-js', // Native module
+        'win-version-info' // Native module
     ],
     plugins: [
         // Optimistic require for 'iconv' in 'encoding', falls back to 'iconv-lite'