upgrade to babel 6

yyx990803 · yyx990803 · commit 84394f665c91 · 2015-11-09T13:37:31.000-05:00
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -112,7 +112,10 @@ compiler.compile = function (content, filePath, cb) {
     // script
     var script = extract(parts, 'script')
     if (script) {
-      output += script + '\n'
+      output +=
+        script + '\n' +
+        // babel 6 compat
+        'if (module.exports.__esModule) module.exports = module.exports.default\n'
     }
     // template
     var template = extract(parts, 'template')
diff --git a/lib/compilers/babel.js b/lib/compilers/babel.js
@@ -1,5 +1,5 @@
 var options = require('./options')
-var babel = require('babel')
+var babel = require('babel-core')
 
 module.exports = function (raw, cb) {
   try {
diff --git a/lib/compilers/options.js b/lib/compilers/options.js
@@ -3,9 +3,8 @@ module.exports = {
     remove: false
   },
   babel: {
-    loose: 'all',
-    optional: ['runtime'],
-    nonStandard: false
+    presets: ['es2015'],
+    plugins: ['transform-runtime']
   },
   coffee: {
     bare: true
diff --git a/package.json b/package.json
@@ -17,12 +17,14 @@
     "url": "https://github.com/vuejs/vueify/issues"
   },
   "scripts": {
-    "test": "NODE_ENV=production mocha test/test.js --slow=1000"
+    "test": "NODE_ENV=production mocha test/test.js --slow=2000 --timeout=5000"
   },
   "homepage": "https://github.com/vuejs/vueify",
   "dependencies": {
     "autoprefixer": "^6.0.3",
-    "babel": "^5.8.23",
+    "babel-core": "^6.1.2",
+    "babel-preset-es2015": "^6.1.2",
+    "babel-plugin-transform-runtime": "^6.1.2",
     "cssnano": "^3.3.2",
     "es6-promise": "^3.0.2",
     "hash-sum": "^1.0.2",
@@ -35,7 +37,7 @@
   },
   "peerDependencies": {
     "vueify-insert-css": "^1.0.0",
-    "babel-runtime": "^5.8.25",
+    "babel-runtime": "^6.0.14",
     "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
diff --git a/test/expects/basic.js b/test/expects/basic.js
@@ -1,28 +1,40 @@
 var __vueify_style__ = require("vueify-insert-css").insert("html{font-size:20px}")
 "use strict";
 
-var _classCallCheck = require("babel-runtime/helpers/class-call-check")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-exports.__esModule = true;
+var _createClass2 = require("babel-runtime/helpers/createClass");
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var Test = (function () {
   function Test() {
-    _classCallCheck(this, Test);
+    (0, _classCallCheck3.default)(this, Test);
   }
 
-  Test.prototype.ok = function ok() {};
-
+  (0, _createClass3.default)(Test, [{
+    key: "ok",
+    value: function ok() {}
+  }]);
   return Test;
 })();
 
 var evens = [2, 4, 6, 8];
 var odds = evens.map(function (v) {
   return v + 1;
 });
-exports["default"] = {
+exports.default = {
   data: function data() {
     return odds;
   }
 };
-module.exports = exports["default"];
+if (module.exports.__esModule) module.exports = module.exports.default
 ;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1 :id=\"id\" @click=\"hi\">hello</h1>"
diff --git a/test/expects/custom.js b/test/expects/custom.js
@@ -1 +1,2 @@
 console.log('ok')
+if (module.exports.__esModule) module.exports = module.exports.default
diff --git a/test/expects/multiple-scripts.js b/test/expects/multiple-scripts.js
@@ -9,3 +9,4 @@ b = x(function() {
 var p = function p(x) {
   return x || 5;
 };
+if (module.exports.__esModule) module.exports = module.exports.default
diff --git a/test/expects/multiple.js b/test/expects/multiple.js
@@ -13,4 +13,5 @@ module.exports = {
   }
 };
 
+if (module.exports.__esModule) module.exports = module.exports.default
 ;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1>Jade - node template engine<div id=\"container\" class=\"col\"><a href=\"http://vuejs.org\">You are amazing</a><p>Jade is a terse and simple\ntemplating language with a\nstrong focus on performance\nand powerful features.</p></div></h1>"
diff --git a/test/expects/src.js b/test/expects/src.js
@@ -1,9 +1,11 @@
 var __vueify_style__ = require("vueify-insert-css").insert("h1{font-size:12px}")
 'use strict';
 
-exports.__esModule = true;
-exports['default'] = {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = {
   el: '#hi'
 };
-module.exports = exports['default'];
+if (module.exports.__esModule) module.exports = module.exports.default
 ;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1>hi</h1>"

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`console.log('ok')`
	`2`	`+if (module.exports.__esModule) module.exports = module.exports.default`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@ module.exports = {`
`13`	`13`	`}`
`14`	`14`	`};`
`15`	`15`
	`16`	`+if (module.exports.__esModule) module.exports = module.exports.default`
`16`	`17`	`;(typeof module.exports === "function"? module.exports.options: module.exports).template = "<h1>Jade - node template engine<div id=\"container\" class=\"col\"><a href=\"http://vuejs.org\">You are amazing</a><p>Jade is a terse and simple\ntemplating language with a\nstrong focus on performance\nand powerful features.</p></div></h1>"`