Skip to content

Commit c6078de

Browse files
authored
Merge pull request #1 from clay/babel
update babel to v7
2 parents bacd1c6 + 6467103 commit c6078de

File tree

5 files changed

+2275
-838
lines changed

5 files changed

+2275
-838
lines changed

lib/compiler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var insertCSSPath = normalize.lib('insert-css')
1919

2020
var hasBabel = true
2121
try {
22-
require('babel-core')
22+
require('@babel/core')
2323
} catch (e) {
2424
hasBabel = false
2525
}

lib/compilers/babel.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ var assign = require('object-assign')
55
var ensureRequire = require('../ensure-require')
66

77
var defaultBabelOptions = {
8-
presets: ['es2015'],
9-
plugins: ['transform-runtime']
8+
presets: ['@babel/preset-env']
109
}
1110

1211
var babelRcPath = path.resolve(process.cwd(), '.babelrc')
@@ -27,7 +26,7 @@ function getBabelRc () {
2726
module.exports = function (raw, cb, compiler, filePath) {
2827
if ((compiler.options.babel || babelOptions) === defaultBabelOptions) {
2928
try {
30-
ensureRequire('babel', ['babel-preset-es2015', 'babel-runtime', 'babel-plugin-transform-runtime'])
29+
ensureRequire('babel', ['@babel/preset-env'])
3130
} catch (e) {
3231
console.error(e.message)
3332
console.error(
@@ -39,7 +38,7 @@ module.exports = function (raw, cb, compiler, filePath) {
3938
}
4039

4140
try {
42-
var babel = require('babel-core')
41+
var babel = require('@babel/core')
4342
var options = assign({
4443
comments: false,
4544
filename: filePath,

lib/normalize.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports.lib = function (file) {
66
if (IS_TEST) {
77
return path.resolve(__dirname, file)
88
} else {
9-
return 'vueify/lib/' + file
9+
return '@nymag/vueify/lib/' + file
1010
}
1111
}
1212

0 commit comments

Comments
 (0)