From 8ac54c827beff248946addec1f612b030e02bd74 Mon Sep 17 00:00:00 2001
From: "lcxfs1991@gmail.com" <lcxfs1991@gmail.com>
Date: Fri, 9 Jun 2017 10:15:53 +0800
Subject: [PATCH 1/4] add npm option

---
 README.md        | 2 ++
 src/installer.js | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4cae2f5..da30d4a 100644
--- 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
index c753555..4f44877 100644
--- 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"]
   });
 

From 027185ecce38ab52e0b6aa7c4b4c3a23c501309a Mon Sep 17 00:00:00 2001
From: "lcxfs1991@gmail.com" <lcxfs1991@gmail.com>
Date: Fri, 9 Jun 2017 10:19:50 +0800
Subject: [PATCH 2/4] try to fix test

---
 test/plugin.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/plugin.test.js b/test/plugin.test.js
index 19782c6..721f200 100644
--- 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);

From c672ed299d9bcb7721e240a571f96e31c4f803e8 Mon Sep 17 00:00:00 2001
From: "lcxfs1991@gmail.com" <lcxfs1991@gmail.com>
Date: Mon, 26 Jun 2017 17:43:27 +0800
Subject: [PATCH 3/4] support webpack3

---
 package.json  | 2 +-
 src/plugin.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d5e9759..fb844eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "npm-install-webpack-plugin",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Webpack loader to automatically npm install & save dependencies.",
   "main": "index.js",
   "engines": {
diff --git a/src/plugin.js b/src/plugin.js
index 35b2747..f57f6c4 100644
--- 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,

From e29b7e9c5a02bf92b275d70549f67702ee964b74 Mon Sep 17 00:00:00 2001
From: "lcxfs1991@gmail.com" <lcxfs1991@gmail.com>
Date: Mon, 26 Jun 2017 17:44:24 +0800
Subject: [PATCH 4/4] reset package version to 4.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fb844eb..d5e9759 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "npm-install-webpack-plugin",
-  "version": "4.0.5",
+  "version": "4.0.4",
   "description": "Webpack loader to automatically npm install & save dependencies.",
   "main": "index.js",
   "engines": {