Skip to content

Commit ef73d14

Browse files
alexandernanbergKent C. Dodds
authored andcommitted
feat: upgrade to babel 7 (#62)
1 parent 5418949 commit ef73d14

3 files changed

Lines changed: 24 additions & 30 deletions

File tree

package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,21 @@
3131
"author": "Kent C. Dodds <kent@doddsfamily.us> (http://kentcdodds.com/)",
3232
"license": "MIT",
3333
"dependencies": {
34+
"@babel/cli": "^7.0.0",
35+
"@babel/core": "^7.0.0",
36+
"@babel/plugin-proposal-class-properties": "^7.0.0",
37+
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
38+
"@babel/preset-env": "^7.0.0",
39+
"@babel/preset-react": "^7.0.0",
3440
"all-contributors-cli": "^5.0.0",
3541
"arrify": "^1.0.1",
36-
"babel-cli": "^6.26.0",
37-
"babel-core": "^6.26.3",
42+
"babel-core": "^7.0.0-0",
3843
"babel-jest": "^23.4.2",
39-
"babel-plugin-external-helpers": "^6.22.0",
4044
"babel-plugin-macros": "^2.3.0",
41-
"babel-plugin-minify-dead-code-elimination": "^0.3.0",
45+
"babel-plugin-minify-dead-code-elimination": "^0.4.0",
4246
"babel-plugin-module-resolver": "^3.1.1",
43-
"babel-plugin-transform-class-properties": "^6.24.1",
44-
"babel-plugin-transform-inline-environment-variables": "^0.3.0",
45-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
46-
"babel-plugin-transform-react-jsx": "^6.24.1",
47+
"babel-plugin-transform-inline-environment-variables": "^0.4.0",
4748
"babel-plugin-transform-react-remove-prop-types": "^0.4.13",
48-
"babel-preset-env": "^1.6.1",
49-
"babel-preset-react": "^6.24.1",
5049
"browserslist": "^4.0.0",
5150
"concurrently": "^3.5.1",
5251
"cross-env": "^5.1.4",
@@ -68,8 +67,8 @@
6867
"read-pkg-up": "^4.0.0",
6968
"resolve": "^1.6.0",
7069
"rimraf": "^2.6.2",
71-
"rollup": "^0.63.0",
72-
"rollup-plugin-babel": "^3.0.3",
70+
"rollup": "^0.65.0",
71+
"rollup-plugin-babel": "^4.0.0",
7372
"rollup-plugin-commonjs": "^9.1.0",
7473
"rollup-plugin-json": "^3.0.0",
7574
"rollup-plugin-node-builtins": "^2.1.2",

src/config/babelrc.js

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,36 @@ const envTargets = isTest
2727
: {node: '4.5'}
2828
const envOptions = {modules: false, loose: true, targets: envTargets}
2929

30-
module.exports = {
30+
module.exports = () => ({
3131
presets: [
32-
[require.resolve('babel-preset-env'), envOptions],
33-
ifAnyDep(['react', 'preact'], require.resolve('babel-preset-react')),
32+
[require.resolve('@babel/preset-env'), envOptions],
33+
ifAnyDep(
34+
['react', 'preact'],
35+
[
36+
require.resolve('@babel/preset-react'),
37+
{pragma: isPreact ? 'React.h' : undefined},
38+
],
39+
),
3440
].filter(Boolean),
3541
plugins: [
3642
require.resolve('babel-plugin-macros'),
37-
isRollup ? require.resolve('babel-plugin-external-helpers') : null,
38-
// we're actually not using JSX at all, but I'm leaving this
39-
// in here just in case we ever do (this would be easy to miss).
4043
alias
4144
? [
4245
require.resolve('babel-plugin-module-resolver'),
4346
{root: ['./src'], alias},
4447
]
4548
: null,
46-
isPreact
47-
? [
48-
require.resolve('babel-plugin-transform-react-jsx'),
49-
{pragma: 'React.h'},
50-
]
51-
: null,
5249
[
5350
require.resolve('babel-plugin-transform-react-remove-prop-types'),
5451
isPreact ? {removeImport: true} : {mode: 'unsafe-wrap'},
5552
],
5653
isUMD
5754
? require.resolve('babel-plugin-transform-inline-environment-variables')
5855
: null,
59-
// TODO: use loose mode when upgrading to babel@7
60-
require.resolve('babel-plugin-transform-class-properties'),
61-
require.resolve('babel-plugin-transform-object-rest-spread'),
56+
[require.resolve('@babel/plugin-proposal-class-properties'), {loose: true}],
6257
require.resolve('babel-plugin-minify-dead-code-elimination'),
6358
treeshake
6459
? null
65-
: require.resolve('babel-plugin-transform-es2015-modules-commonjs'),
60+
: require.resolve('@babel/plugin-transform-modules-commonjs'),
6661
].filter(Boolean),
67-
}
62+
})

src/scripts/build/babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if (!useSpecifiedOutDir && !args.includes('--no-clean')) {
2626
}
2727

2828
const result = spawn.sync(
29-
resolveBin('babel-cli', {executable: 'babel'}),
29+
resolveBin('@babel/cli', {executable: 'babel'}),
3030
[...outDir, ...copyFiles, ...ignore, ...config, 'src'].concat(args),
3131
{stdio: 'inherit'},
3232
)

0 commit comments

Comments
 (0)