fix: babel 7 compat (#43)

vuejs · Jan 15, 2018 · cd39ea7 · cd39ea7
1 parent ec223e6
commit cd39ea7
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 157 deletions.
diff --git a/lib/compilers/babel-compiler.js b/lib/compilers/babel-compiler.js
@@ -2,12 +2,21 @@ const babel = require('babel-core')
 const loadBabelConfig = require('../load-babel-config.js')
 
 module.exports = function compileBabel (scriptContent, inputSourceMap) {
+  const babelConfig = loadBabelConfig()
+
+  if (!babelConfig) {
+    return {
+      code: scriptContent,
+      sourceMap: inputSourceMap
+    }
+  }
+
   const sourceMapOptions = {
     sourceMaps: true,
     inputSourceMap: inputSourceMap
   }
 
-  const babelOptions = Object.assign(sourceMapOptions, loadBabelConfig())
+  const babelOptions = Object.assign(sourceMapOptions, babelConfig)
 
   const res = babel.transform(scriptContent, babelOptions)
 

diff --git a/lib/load-babel-config.js b/lib/load-babel-config.js
@@ -2,21 +2,20 @@ const findBabelConfig = require('find-babel-config')
 const logger = require('./logger')
 const cache = require('./cache')
 
-var defaultBabelOptions = {
-  presets: [require.resolve('babel-preset-vue-app')]
-}
-
 module.exports = function getBabelConfig () {
   const cachedConfig = cache.get('babel-config')
   if (cachedConfig) {
     return cachedConfig
+  } else if (cachedConfig === false) {
+    return
   } else {
     const { file, config } = findBabelConfig.sync(process.cwd(), 0)
     if (!file) {
-      logger.info('no .babelrc found, defaulting to default babel options')
+      logger.info('no .babelrc found, skipping babel compilation')
+      cache.set('babel-config', false)
+      return
     }
-    const babelConfig = file ? config : defaultBabelOptions
-    cache.set('babel-config', babelConfig)
-    return babelConfig
+    cache.set('babel-config', config)
+    return config
   }
 }