Merge branch 'master' of https://github.com/webpack/webpack-cli

webpack · Mar 14, 2018 · 8787043 · 8787043
2 parents e21f88b + bd68b18
commit 8787043
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/generators/init-generator.js b/lib/generators/init-generator.js
@@ -156,7 +156,7 @@ module.exports = class InitGenerator extends Generator {
 							"style-loader",
 							"css-loader"
 						);
-						regExpForStyles = new RegExp(/\.(scss|css)$/);
+						regExpForStyles = `${new RegExp(/\.(scss|css)$/)}`;
 						if (this.isProd) {
 							ExtractUseProps = `
 								use: [{
@@ -187,7 +187,7 @@ module.exports = class InitGenerator extends Generator {
 						}
 						break;
 					case "LESS":
-						regExpForStyles = new RegExp(/\.(less|css)$/);
+						regExpForStyles = `${new RegExp(/\.(less|css)$/)}`;
 						this.dependencies.push(
 							"less-loader",
 							"less",
@@ -240,7 +240,7 @@ module.exports = class InitGenerator extends Generator {
 							"precss",
 							"autoprefixer"
 						);
-						regExpForStyles = new RegExp(/\.css$/);
+						regExpForStyles = `${new RegExp(/\.css$/)}`;
 						if (this.isProd) {
 							ExtractUseProps = `
 								use: [{
@@ -292,7 +292,7 @@ module.exports = class InitGenerator extends Generator {
 						break;
 					case "CSS":
 						this.dependencies.push("style-loader", "css-loader");
-						regExpForStyles = new RegExp(/\.css$/);
+						regExpForStyles = `${new RegExp(/\.css$/)}`;
 						if (this.isProd) {
 							ExtractUseProps = `
 								use: [{

diff --git a/lib/generators/utils/module.js b/lib/generators/utils/module.js
@@ -9,7 +9,7 @@
  */
 module.exports = _ => {
 	return {
-		test: new RegExp(/\.js$/),
+		test: `${new RegExp(/\.js$/)}`,
 		exclude: "/node_modules/",
 		loader: "'babel-loader'",
 		options: {