Add specialized loader to include native node add-ons (decred#720)

guangminglion · Sep 29, 2017 · 3c102de · 3c102de
1 parent 67e5ea4
commit 3c102de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/app/main.development.js b/app/main.development.js
@@ -316,7 +316,7 @@ const launchDCRD = () => {
   if (os.platform() == "win32") {
     try {
       const util = require("util");
-      const win32ipc = require("./node_modules/win32ipc/build/Release/win32ipc");
+      const win32ipc = require("./node_modules/win32ipc/build/Release/win32ipc.node");
       var pipe = win32ipc.createPipe("out");
       args.push(util.format("--piperx=%d", pipe.readEnd));
     } catch(e) {
@@ -377,7 +377,7 @@ const launchDCRWallet = () => {
   if (os.platform() == "win32") {
     try {
       const util = require("util");
-      const win32ipc = require("./node_modules/win32ipc/build/Release/win32ipc");
+      const win32ipc = require("./node_modules/win32ipc/build/Release/win32ipc.node");
       var pipe = win32ipc.createPipe("out");
       args.push(util.format("--piperx=%d", pipe.readEnd));
     } catch (e) {

diff --git a/package.json b/package.json
@@ -61,7 +61,8 @@
       "package.json"
     ],
     "extraResources": [
-      { "from": "bin", "to": "bin"}
+      { "from": "bin", "to": "bin"},
+      "*.node"
     ],
     "win": {
       "target": "nsis"
@@ -191,6 +192,7 @@
     "lodash": "^4.17.4",
     "material-ui": "^0.17.4",
     "mv": "^2.1.1",
+    "node-addon-loader": "alexlyp/node-addon-loader#master",
     "prop-types": "^15.5.10",
     "qr-image": "^3.2.0",
     "react": "^15.3.2",

diff --git a/webpack.config.base.js b/webpack.config.base.js
@@ -30,12 +30,17 @@ export default {
           limit: 8192
         }
       }]
-    }, {
+    },
+    {
       test: /\.node$/,
       use: [{
-        loader: "node-loader"
+        loader: "node-addon-loader",
+        options: {
+          basePath: path.resolve(__dirname, "bin")
+        }
       }]
-    },]
+    }
+    ]
   },
 
   output: {
@@ -49,7 +54,7 @@ export default {
   // https://webpack.github.io/docs/configuration.html#resolve
   resolve: {
     extensions: [".js", ".jsx", ".json", ".node"],
-    mainFields: ["webpack", "browser", "web", "browserify", ["jam", "main"], "main"],
+    mainFields: ["webpack", "browser", "web", "browserify", ["jam", "main"], "main"]
   },
 
   plugins: [],