Merge branch 'master' of https://github.com/vuejsdevelopers/vuejs-calendar

Anthony Gore · Anthony Gore · commit f05fcb90d957 · 2018-04-15T16:20:42.000+07:00
# Conflicts:
#	package.json
diff --git a/package.json b/package.json
@@ -50,8 +50,10 @@
     "vue-style-loader": "~1.0.0",
     "vue-template-compiler": "~2.1.0",
     "vuex": "~2.1.1",
+    "webpack": "~2.7.0",
     "webpack-dev-middleware": "~1.9.0",
     "webpack-hot-middleware": "~2.14.0",
+    "webpack-merge": "~2.3.1",
     "webpack-module-hot-accept": "~1.0.4"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -17,7 +17,7 @@ var baseConfig = {
         use: [{
           loader: 'babel-loader',
           options: {
-            "presets": [ [ "es2015" ] ],
+            "presets": [ [ "env" ] ],
             "plugins": [ "transform-es2015-destructuring", "transform-runtime" ]
           }
         }],
@@ -41,6 +41,7 @@ var baseConfig = {
         options: {
           loaders: {
             'scss': 'vue-style-loader!css-loader!sass-loader',
+            'js': 'babel-loader?presets[]=env'
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ var baseConfig = {`
`17`	`17`	`use: [{`
`18`	`18`	`loader: 'babel-loader',`
`19`	`19`	`options: {`
`20`		`- "presets": [ [ "es2015" ] ],`
	`20`	`+ "presets": [ [ "env" ] ],`
`21`	`21`	`"plugins": [ "transform-es2015-destructuring", "transform-runtime" ]`
`22`	`22`	`}`
`23`	`23`	`}],`
`@@ -41,6 +41,7 @@ var baseConfig = {`
`41`	`41`	`options: {`
`42`	`42`	`loaders: {`
`43`	`43`	`'scss': 'vue-style-loader!css-loader!sass-loader',`
	`44`	`+ 'js': 'babel-loader?presets[]=env'`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`	`}`