Merge pull request #1 from clay/babel

update babel to v7
clay · Sep 12, 2018 · c6078de · c6078de
2 parents bacd1c6 + 6467103
commit c6078de
Show file tree

Hide file tree

Showing 5 changed files with 2,275 additions and 838 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -19,7 +19,7 @@ var insertCSSPath = normalize.lib('insert-css')
 
 var hasBabel = true
 try {
-  require('babel-core')
+  require('@babel/core')
 } catch (e) {
   hasBabel = false
 }

diff --git a/lib/compilers/babel.js b/lib/compilers/babel.js
@@ -5,8 +5,7 @@ var assign = require('object-assign')
 var ensureRequire = require('../ensure-require')
 
 var defaultBabelOptions = {
-  presets: ['es2015'],
-  plugins: ['transform-runtime']
+  presets: ['@babel/preset-env']
 }
 
 var babelRcPath = path.resolve(process.cwd(), '.babelrc')
@@ -27,7 +26,7 @@ function getBabelRc () {
 module.exports = function (raw, cb, compiler, filePath) {
   if ((compiler.options.babel || babelOptions) === defaultBabelOptions) {
     try {
-      ensureRequire('babel', ['babel-preset-es2015', 'babel-runtime', 'babel-plugin-transform-runtime'])
+      ensureRequire('babel', ['@babel/preset-env'])
     } catch (e) {
       console.error(e.message)
       console.error(
@@ -39,7 +38,7 @@ module.exports = function (raw, cb, compiler, filePath) {
   }
 
   try {
-    var babel = require('babel-core')
+    var babel = require('@babel/core')
     var options = assign({
       comments: false,
       filename: filePath,

diff --git a/lib/normalize.js b/lib/normalize.js
@@ -6,7 +6,7 @@ exports.lib = function (file) {
   if (IS_TEST) {
     return path.resolve(__dirname, file)
   } else {
-    return 'vueify/lib/' + file
+    return '@nymag/vueify/lib/' + file
   }
 }