fix test issues for babel 6

Author: yyx990803

lib/loader.js

@@ -29,6 +29,11 @@ module.exports = function (content) {
   var options = this.options.vue || {}
   var vueUrl = loaderUtils.getRemainingRequest(this)
 
+  // respect user babel options
+  if (this.options.babel) {
+    defaultLoaders.js = 'babel'
+  }
+
   // check if there are custom loaders specified with
   // vueLoader.withLoaders(), otherwise use defaults
   var loaders = assign({}, defaultLoaders, options.loaders)
@@ -139,8 +144,9 @@ module.exports = function (content) {
 
     // add require for script
     if (parts.script.length) {
-      output += 'module.exports = ' +
-        getRequire('script', parts.script[0], 0)
+      output +=
+        'module.exports = ' + getRequire('script', parts.script[0], 0) + '\n' +
+        'if (module.exports.__esModule) module.exports = module.exports.default\n'
     }
 
     // add require for template
@@ -178,6 +184,7 @@ module.exports = function (content) {
             'hotAPI.createRecord(id, module.exports)\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
               'var newOptions = ' + (scriptString ? 'require(' + scriptString + ')\n' : 'null\n') +
+              'if (newOptions.__esModule) newOptions = newOptions.default\n' +
               'var newTemplate = ' + (templateString ? 'require(' + templateString + ')\n' : 'null\n') +
               'hotAPI.update(id, newOptions, newTemplate)\n' +
             '})\n' +

package.json

@@ -20,7 +20,7 @@
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
     "lint": "eslint lib",
-    "test": "eslint lib && mocha test/test.js --slow 5000"
+    "test": "eslint lib && mocha test/test.js --slow 5000 --timeout 10000"
   },
   "dependencies": {
     "autoprefixer": "^6.0.3",
@@ -35,17 +35,18 @@
     "vue-html-loader": "^1.0.0",
     "css-loader": "^0.21.0",
     "style-loader": "^0.13.0",
-    "babel-loader": "^6.0.1",
+    "babel-loader": "^6.1.0",
     "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": "^6.1.2",
-    "babel-loader": "^6.0.1",
+    "babel-loader": "^6.1.0",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
+    "babel-runtime": "^6.0.14",
     "chai": "^3.0.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",

test/fixtures/basic.vue

@@ -9,8 +9,8 @@ comp-a h2 {
 </template>
 
 <script>
-module.exports = {
-  data: function () {
+export default {
+  data () {
     return {
       msg: 'Hello from Component A!'
     }

test/fixtures/pre.vue

@@ -12,7 +12,7 @@ comp-a
 comp-b
 </template>
 
-<script lang="babel">
+<script>
 export default {
   data () {
     return {

test/test.js

@@ -43,7 +43,7 @@ describe('vue-loader', function () {
   function test (options, assert) {
     var config = assign({}, globalConfig, options)
     webpack(config, function (err) {
-      expect(err).to.be.null
+      if (err) throw err
       getFile('test.build.js', function (data) {
         jsdom.env({
           html: testHTML,