From 76b6880288a48b0b4f1ce3293bad21fa4282c07d Mon Sep 17 00:00:00 2001 From: Ezra Pool Date: Thu, 13 Sep 2018 23:55:31 +0200 Subject: [PATCH] babel7 compat? --- lib/compiler.js | 2 +- lib/compilers/babel.js | 8 ++++---- lib/ensure-require.js | 4 ++-- package.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/compiler.js b/lib/compiler.js index cde3d99..22485ee 100644 --- 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 index be317b4..ad6a0b5 100644 --- a/lib/compilers/babel.js +++ b/lib/compilers/babel.js @@ -5,8 +5,8 @@ var assign = require('object-assign') var ensureRequire = require('../ensure-require') var defaultBabelOptions = { - presets: ['es2015'], - plugins: ['transform-runtime'] + presets: ['@babel/preset-env'], + plugins: ['@babel/plugin-transform-runtime'] } var babelRcPath = path.resolve(process.cwd(), '.babelrc') @@ -27,7 +27,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', '@babel/runtime', '@babel/plugin-transform-runtime']) } catch (e) { console.error(e.message) console.error( @@ -39,7 +39,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/ensure-require.js b/lib/ensure-require.js index 26faa54..5e704b7 100644 --- a/lib/ensure-require.js +++ b/lib/ensure-require.js @@ -15,8 +15,8 @@ module.exports = function (name, deps) { } try { // hack for babel-runtime because it does not expose "main" field - if (req === 'babel-runtime') { - req = 'babel-runtime/core-js' + if (req === '@babel/runtime') { + req = '@babel/runtime/core-js' } require.resolve(req) } catch (e) { diff --git a/package.json b/package.json index c1caee7..4ca1147 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,10 @@ "vue-template-es2015-compiler": "^1.2.2" }, "devDependencies": { - "babel-core": "^6.0.0", - "babel-plugin-transform-runtime": "^6.0.0", - "babel-preset-es2015": "^6.0.0", - "babel-runtime": "^6.0.0", + "@babel/core": "^7.0.0", + "@babel/plugin-transform-runtime": "^7.0.0", + "@babel/preset-env": "^7.0.0", + "@babel/runtime": "^7.0.0", "browserify": "^13.0.1", "chai": "^3.5.0", "coffee-script": "^1.10.0", pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy