Merge pull request #61 from d6u/master

Upgrade to Babel 6

Author: yyx990803

lib/loader.js

@@ -12,7 +12,7 @@ var defaultLang = {
 var defaultLoaders = {
   html: 'vue-html',
   css: 'style!css',
-  js: 'babel?optional[]=runtime&loose=all&nonStandard=false'
+  js: 'babel?presets[]=es2015&plugins[]=transform-runtime'
 }
 
 var rewriterInjectRE = /\b((css|(vue-)?html)(\?[^!]+)?!?)\b/

package.json

@@ -35,13 +35,17 @@
     "vue-html-loader": "^1.0.0",
     "css-loader": "^0.21.0",
     "style-loader": "^0.13.0",
-    "babel-loader": "^5.3.2",
-    "babel-runtime": "^5.8.25",
+    "babel-loader": "^6.0.1",
+    "babel-plugin-transform-runtime": "^6.1.2",
+    "babel-preset-es2015": "^6.1.2",
+    "babel-runtime": "^6.0.14",
     "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.1.2",
+    "babel-loader": "^6.0.1",
+    "babel-plugin-transform-runtime": "^6.1.2",
+    "babel-preset-es2015": "^6.1.2",
     "chai": "^3.0.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",