fix: Do not create LoaderOptionsPlugin if loaderOptions is empty (#72)

webpack · Feb 24, 2017 · b9d22c9 · b9d22c9
1 parent a46edbb
commit b9d22c9
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 2 deletions.
diff --git a/lib/transformations/loaderOptionsPlugin/__snapshots__/loaderOptionsPlugin.test.js.snap b/lib/transformations/loaderOptionsPlugin/__snapshots__/loaderOptionsPlugin.test.js.snap
@@ -1,4 +1,14 @@
-exports[`loaderOptionsPlugin transforms correctly 1`] = `
+exports[`loaderOptionsPlugin transforms correctly using "loaderOptionsPlugin-0" data 1`] = `
+"// Do not create LoaderOptionsPlugin is not necessary
+module.exports = {
+    plugins: [
+        new SomePlugin()
+    ]
+}
+"
+`;
+
+exports[`loaderOptionsPlugin transforms correctly using "loaderOptionsPlugin-1" data 1`] = `
 "module.exports = {
     debug: true,
     plugins: [
@@ -12,3 +22,16 @@ exports[`loaderOptionsPlugin transforms correctly 1`] = `
 }
 "
 `;
+
+exports[`loaderOptionsPlugin transforms correctly using "loaderOptionsPlugin-2" data 1`] = `
+"// Don\'t modify LoaderOptionsPlugin
+module.exports = {
+    plugins: [
+        new SomePlugin(),
+        new webpack.optimize.LoaderOptionsPlugin({
+            foo: \'bar\'
+        })
+    ]
+}
+"
+`;
diff --git a/lib/transformations/loaderOptionsPlugin/__testfixtures__/loaderOptionsPlugin-0.input.js b/lib/transformations/loaderOptionsPlugin/__testfixtures__/loaderOptionsPlugin-0.input.js
@@ -0,0 +1,6 @@
+// Do not create LoaderOptionsPlugin is not necessary
+module.exports = {
+    plugins: [
+        new SomePlugin()
+    ]
+}
diff --git a/...stfixtures__/loaderOptionsPlugin.input.js → ...fixtures__/loaderOptionsPlugin-1.input.js b/...stfixtures__/loaderOptionsPlugin.input.js → ...fixtures__/loaderOptionsPlugin-1.input.js
diff --git a/lib/transformations/loaderOptionsPlugin/__testfixtures__/loaderOptionsPlugin-2.input.js b/lib/transformations/loaderOptionsPlugin/__testfixtures__/loaderOptionsPlugin-2.input.js
@@ -0,0 +1,9 @@
+// Don't modify LoaderOptionsPlugin
+module.exports = {
+    plugins: [
+        new SomePlugin(),
+        new webpack.optimize.LoaderOptionsPlugin({
+            foo: 'bar'
+        })
+    ]
+}
diff --git a/lib/transformations/loaderOptionsPlugin/loaderOptionsPlugin.js b/lib/transformations/loaderOptionsPlugin/loaderOptionsPlugin.js
@@ -1,3 +1,4 @@
+const isEmpty = require('lodash/isEmpty');
 const findPluginsByName = require('../utils').findPluginsByName;
 const createOrUpdatePluginByName = require('../utils').createOrUpdatePluginByName;
 
@@ -20,6 +21,7 @@ module.exports = function(j, ast) {
 		.find(j.ArrayExpression)
 		.filter(path => path.parent.value.key.name === 'plugins')
 		.forEach(path => {
+			!isEmpty(loaderOptions) &&
 			createOrUpdatePluginByName(j, path, 'webpack.optimize.LoaderOptionsPlugin', loaderOptions);
 		});
 };
diff --git a/lib/transformations/loaderOptionsPlugin/loaderOptionsPlugin.test.js b/lib/transformations/loaderOptionsPlugin/loaderOptionsPlugin.test.js
@@ -1,3 +1,5 @@
 const defineTest = require('../defineTest');
 
-defineTest(__dirname, 'loaderOptionsPlugin');
+defineTest(__dirname, 'loaderOptionsPlugin', 'loaderOptionsPlugin-0');
+defineTest(__dirname, 'loaderOptionsPlugin', 'loaderOptionsPlugin-1');
+defineTest(__dirname, 'loaderOptionsPlugin', 'loaderOptionsPlugin-2');
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "interpret": "^1.0.1",
     "jscodeshift": "^0.3.30",
     "loader-utils": "^0.2.16",
+    "lodash": "^4.17.4",
     "recast": "git://github.com/kalcifer/recast.git#bug/allowbreak",
     "rx": "^4.1.0",
     "supports-color": "^3.1.2",