Skip to content

Commit f49f212

Browse files
Merge pull request #616 from teodragovic/migrate-rollup-babel
2 parents 8669b59 + de5b202 commit f49f212

4 files changed

Lines changed: 39 additions & 15 deletions

File tree

package-lock.json

Lines changed: 32 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"@babel/preset-env": "^7.8.7",
7070
"@babel/preset-flow": "^7.7.4",
7171
"@rollup/plugin-alias": "^3.0.1",
72+
"@rollup/plugin-babel": "^5.0.0",
7273
"@rollup/plugin-commonjs": "^11.0.2",
7374
"@rollup/plugin-json": "^4.0.2",
7475
"@rollup/plugin-node-resolve": "^6.1.0",
@@ -88,7 +89,6 @@
8889
"module-details-from-path": "^1.0.3",
8990
"pretty-bytes": "^5.3.0",
9091
"rollup": "^1.32.1",
91-
"rollup-plugin-babel": "^4.4.0",
9292
"rollup-plugin-bundle-size": "^1.0.1",
9393
"rollup-plugin-es3": "^1.1.0",
9494
"rollup-plugin-postcss": "^2.4.1",

src/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import autoprefixer from 'autoprefixer';
77
import cssnano from 'cssnano';
88
import { rollup, watch } from 'rollup';
99
import commonjs from '@rollup/plugin-commonjs';
10-
import babel from 'rollup-plugin-babel';
10+
import babel from '@rollup/plugin-babel';
1111
import customBabel from './lib/babel-custom';
1212
import nodeResolve from '@rollup/plugin-node-resolve';
1313
import { terser } from 'rollup-plugin-terser';
@@ -580,9 +580,10 @@ function createConfig(options, entry, format, writeMeta) {
580580
// if defines is not set, we shouldn't run babel through node_modules
581581
isTruthy(defines) &&
582582
babel({
583+
babelHelpers: 'bundled',
583584
babelrc: false,
584-
configFile: false,
585585
compact: false,
586+
configFile: false,
586587
include: 'node_modules/**',
587588
plugins: [
588589
[
@@ -592,6 +593,7 @@ function createConfig(options, entry, format, writeMeta) {
592593
],
593594
}),
594595
customBabel()({
596+
babelHelpers: 'bundled',
595597
extensions: EXTENSIONS,
596598
exclude: 'node_modules/**',
597599
passPerPreset: true, // @see https://babeljs.io/docs/en/options#passperpreset

src/lib/babel-custom.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createConfigItem } from '@babel/core';
2-
import babelPlugin from 'rollup-plugin-babel';
2+
import { createBabelInputPluginFactory } from '@rollup/plugin-babel';
33
import merge from 'lodash.merge';
44
import transformFastRest from './transform-fast-rest';
55
import { isTruthy } from '../utils';
@@ -50,7 +50,7 @@ const createConfigItems = (type, items) => {
5050
const presetEnvRegex = RegExp(/@babel\/(preset-)?env/);
5151

5252
export default () => {
53-
return babelPlugin.custom(babelCore => {
53+
return createBabelInputPluginFactory(babelCore => {
5454
return {
5555
// Passed the plugin options.
5656
options({ custom: customOptions, ...pluginOptions }) {

0 commit comments

Comments
 (0)