Merge pull request #93 from ficristo/extension-rebuild

Support native module in extensions

Author: ficristo

src/extensibility/Package.js

@@ -37,7 +37,8 @@ define(function (require, exports, module) {
         ExtensionLoader      = require("utils/ExtensionLoader"),
         NodeConnection       = require("utils/NodeConnection"),
         PreferencesManager   = require("preferences/PreferencesManager"),
-        PathUtils            = require("thirdparty/path-utils/path-utils");
+        PathUtils            = require("thirdparty/path-utils/path-utils"),
+        electronVersion      = brackets.metadata.devDependencies.electron;
 
     PreferencesManager.definePreference("proxy", "string", undefined, {
         description: Strings.DESCRIPTION_PROXY
@@ -115,6 +116,7 @@ define(function (require, exports, module) {
             // so npm can use it in the domain
             options = options || {};
             options.proxy = PreferencesManager.get("proxy");
+            options.electronVersion = electronVersion;
 
             extensionManager.validate(path, options)
                 .done(function (result) {
@@ -168,7 +170,8 @@ define(function (require, exports, module) {
                 systemExtensionDirectory: systemDirectory,
                 apiVersion: brackets.metadata.apiVersion,
                 nameHint: nameHint,
-                proxy: PreferencesManager.get("proxy")
+                proxy: PreferencesManager.get("proxy"),
+                electronVersion: electronVersion
             })
                 .done(function (result) {
                     result.keepFile = false;

src/extensibility/node/npm-installer.js

@@ -37,22 +37,13 @@ var Errors = {
  * Private function to run "npm install --production" command in the extension directory.
  *
  * @param {string} installDirectory Directory to remove
+ * @param {array} npmOptions can contain additional options like `--production` or `--proxy http://127.0.0.1:8888`
  * @param {function} callback NodeJS style callback to call after finish
  */
 function _performNpmInstall(installDirectory, npmOptions, callback) {
     var npmPath = path.resolve(path.dirname(require.resolve("npm")), "..", "bin", "npm-cli.js");
-    var args = [npmPath, "install"];
-    
-    // npmOptions can contain additional args like { "production": true, "proxy": "http://127.0.0.1:8888" }
-    Object.keys(npmOptions).forEach(function (key) {
-        var value = npmOptions[key];
-        if (value === true) {
-            args.push("--" + key);
-        } else if (typeof value === "string" && value.length > 0) {
-            args.push("--" + key, value);
-        }
-    });
-    
+    var args = [npmPath, "install"].concat(npmOptions);
+
     console.log("running npm " + args.slice(1).join(" ") + " in " + installDirectory);
 
     var child = spawn(process.execPath, args, { cwd: installDirectory });

src/extensibility/node/package-validator.js

@@ -295,10 +295,23 @@ function extractAndValidateFiles(zipPath, extractDir, options, callback) {
                     errors.push([Errors.MISSING_MAIN, zipPath, mainJS]);
                 }
 
-                performNpmInstallIfRequired({
-                    production: true,
-                    proxy: options.proxy
-                }, {
+                var npmOptions = ['--production'];
+
+                if (options.proxy) {
+                    npmOptions.push('--proxy ' + options.proxy);
+                }
+
+                npmOptions.push("--disturl=https://atom.io/download/electron");
+                npmOptions.push("--runtime=electron");
+                npmOptions.push("--target=" + options.electronVersion);
+
+                if (process.platform === "darwin") {
+                    npmOptions.push("--arch=x64");
+                } else {
+                    npmOptions.push("--arch=" + process.arch);
+                }
+
+                performNpmInstallIfRequired(npmOptions, {
                     errors: errors,
                     metadata: metadata,
                     commonPrefix: commonPrefix,
@@ -311,7 +324,9 @@ function extractAndValidateFiles(zipPath, extractDir, options, callback) {
     unzipper.extract({
         path: extractDir,
         filter: function (file) {
-            return file.type !== "SymbolicLink";
+            return file.type !== "SymbolicLink" &&
+              // Exclude toplevel .npmrc file
+              !(file.filename === ".npmrc" && file.path === ".npmrc");
         }
     });
 }