Merge pull request laravel-mix#1211 from yansern/master

JeffreyWay · web-flow · commit 0c0ee9a6cfca · 2017-09-22T11:20:07.000-04:00
Make esModule option configurable.
diff --git a/src/builder/webpack-rules.js b/src/builder/webpack-rules.js
@@ -244,7 +244,7 @@ module.exports = function () {
             postcss: Config.postCss,
             preLoaders: Config.vue.preLoaders,
             postLoaders: Config.vue.postLoaders,
-            esModule: false
+            esModule: Config.vue.esModule
         }
     });
 
diff --git a/src/config.js b/src/config.js
@@ -154,7 +154,8 @@ module.exports = function () {
          */
         vue: {
             preLoaders: {},
-            postLoaders: {}
+            postLoaders: {},
+            esModule: false
         },
 
 

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ module.exports = function () {`
`244`	`244`	`postcss: Config.postCss,`
`245`	`245`	`preLoaders: Config.vue.preLoaders,`
`246`	`246`	`postLoaders: Config.vue.postLoaders,`
`247`		`- esModule: false`
	`247`	`+ esModule: Config.vue.esModule`
`248`	`248`	`}`
`249`	`249`	`});`
`250`	`250`