feat: support custom npm clients (options.npm) (#113)

webpack-contrib · Jun 30, 2017 · 3168f63 · 3168f63
1 parent ed1edd6
commit 3168f63
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,8 @@ plugins: [
     peerDependencies: true,
     // Reduce amount of console logging
     quiet: false,
+    // npm command used inside company, yarn is not supported yet
+    npm: 'tnpm'
   });
 ],
 ```

diff --git a/src/installer.js b/src/installer.js
@@ -7,7 +7,12 @@ var util = require("util");
 var EXTERNAL = /^\w[a-z\-0-9\.]+$/; // Match "react", "path", "fs", "lodash.random", etc.
 var PEERS = /UNMET PEER DEPENDENCY ([a-z\-0-9\.]+)@(.+)/gm;
 
-var defaultOptions = { dev: false, peerDependencies: true, quiet: false };
+var defaultOptions = { 
+  dev: false, 
+  peerDependencies: true, 
+  quiet: false,
+  npm: 'npm',
+};
 var erroneous = [];
 
 function normalizeBabelPlugin(plugin, prefix) {
@@ -145,7 +150,7 @@ module.exports.install = function install(deps, options) {
   });
 
   // Ignore input, capture output, show errors
-  var output = spawn.sync("npm", args, {
+  var output = spawn.sync(options.npm, args, {
     stdio: ["ignore", "pipe", "inherit"]
   });
 

diff --git a/src/plugin.js b/src/plugin.js
@@ -136,7 +136,7 @@ NpmInstallPlugin.prototype.resolve = function(resolver, result, callback) {
     );
   }
 
-  if (major === "2") {
+  if (major === "2" || major === "3") {
     return this.compiler.resolvers[resolver].resolve(
       result.context || {},
       result.path,

diff --git a/test/plugin.test.js b/test/plugin.test.js
@@ -41,6 +41,7 @@ describe("plugin", function() {
       dev: false,
       peerDependencies: true,
       quiet: false,
+      npm: 'npm',
     };
 
     this.plugin = new Plugin(this.options);