Skip to content

Commit 4db5a4c

Browse files
jpdriverjpdriver
authored
Merge pull request #268 from FormidableLabs/jp-upgrade-babel
upgrade Babel, Rollup, Storybook
2 parents 07cf902 + 109e8c8 commit 4db5a4c

File tree

11 files changed

+7514
-5137
lines changed

11 files changed

+7514
-5137
lines changed

‎.babelrc

+18-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
{
22
"presets": [
3-
["env", { "loose": true }],
4-
"react"
3+
[
4+
"@babel/preset-env",
5+
{
6+
"loose": true
7+
}
8+
],
9+
"@babel/preset-react"
510
],
611
"plugins": [
712
"add-module-exports",
8-
"transform-object-rest-spread",
9-
"transform-class-properties",
10-
["transform-react-remove-prop-types", {
11-
"mode": "wrap"
12-
}]
13+
"@babel/plugin-proposal-object-rest-spread",
14+
"@babel/plugin-proposal-class-properties",
15+
"@babel/plugin-proposal-private-property-in-object",
16+
"@babel/plugin-proposal-private-methods",
17+
[
18+
"transform-react-remove-prop-types",
19+
{
20+
"mode": "wrap"
21+
}
22+
]
1323
]
14-
}
24+
}

‎.storybook/.babelrc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"presets": [
3-
"env",
4-
"react"
3+
"@babel/preset-env",
4+
"@babel/preset-react"
55
],
66
"plugins": [
77
"add-module-exports",
8-
"transform-object-rest-spread",
9-
"transform-class-properties"
8+
"@babel/plugin-proposal-object-rest-spread",
9+
"@babel/plugin-proposal-class-properties"
1010
]
11-
}
11+
}

‎.storybook/addons.js

-1
This file was deleted.

‎.storybook/config.js

-8
This file was deleted.

‎.storybook/main.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
"stories": [
3+
"../stories/**/*js"
4+
],
5+
"addons": [
6+
"@storybook/addon-controls",
7+
// "@storybook/addon-actions"
8+
]
9+
}

‎.storybook/preview.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export const parameters = {
2+
actions: { argTypesRegex: "^on[A-Z].*" },
3+
// controls: {
4+
// matchers: {
5+
// color: /(background|color)$/i,
6+
// },
7+
// },
8+
}

‎package.json

+23-22
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"module": "dist/react-live.es.js",
99
"license": "MIT",
1010
"scripts": {
11-
"storybook": "start-storybook -p 9001 -c .storybook",
12-
"storybook:build": "build-storybook -c .storybook -o .out",
11+
"storybook": "start-storybook -p 9001",
12+
"storybook:build": "build-storybook -o .out",
1313
"prebuild:lib": "rm -rf lib/*",
1414
"build": "rollup -c",
1515
"prepublishOnly": "npm run build",
@@ -29,19 +29,24 @@
2929
"unescape": "^1.0.1"
3030
},
3131
"devDependencies": {
32-
"@storybook/addon-knobs": "^3.3.12",
33-
"@storybook/react": "^3.3.12",
32+
"@babel/core": "^7.15.0",
33+
"@babel/eslint-parser": "^7.15.0",
34+
"@babel/plugin-proposal-class-properties": "^7.14.5",
35+
"@babel/plugin-proposal-object-rest-spread": "^7.14.7",
36+
"@babel/plugin-transform-runtime": "^7.15.0",
37+
"@babel/preset-env": "^7.15.0",
38+
"@babel/preset-react": "^7.14.5",
39+
"@rollup/plugin-babel": "^5.3.0",
40+
"@rollup/plugin-commonjs": "^20.0.0",
41+
"@rollup/plugin-node-resolve": "^13.0.4",
42+
"@rollup/plugin-replace": "^3.0.0",
43+
"@storybook/addon-controls": "^6.3.6",
44+
"@storybook/react": "^6.3.6",
3445
"@types/react": "^16.0.36",
35-
"babel-core": "^6.26.0",
36-
"babel-eslint": "^10.0.1",
37-
"babel-jest": "^22.2.0",
38-
"babel-plugin-add-module-exports": "^0.2.1",
39-
"babel-plugin-external-helpers": "^6.22.0",
40-
"babel-plugin-transform-class-properties": "^6.23.0",
41-
"babel-plugin-transform-object-rest-spread": "^6.23.0",
42-
"babel-plugin-transform-react-remove-prop-types": "^0.4.13",
43-
"babel-preset-env": "^1.3.2",
44-
"babel-preset-react": "^6.23.0",
46+
"babel-jest": "^27.0.6",
47+
"babel-loader": "^8.2.2",
48+
"babel-plugin-add-module-exports": "^1.0.4",
49+
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
4550
"enzyme": "^3.3.0",
4651
"enzyme-adapter-react-16": "^1.1.1",
4752
"eslint": "^5.16.0",
@@ -50,17 +55,13 @@
5055
"eslint-plugin-filenames": "^1.2.0",
5156
"eslint-plugin-import": "^2.9.0",
5257
"eslint-plugin-react": "^7.7.0",
53-
"jest": "^22.2.1",
58+
"jest": "^27.0.6",
5459
"prettier": "^1.17.0",
5560
"react": "^16.8.0",
5661
"react-dom": "^16.8.0",
57-
"rollup": "^0.55.3",
58-
"rollup-plugin-babel": "^3.0.3",
59-
"rollup-plugin-commonjs": "^8.3.0",
60-
"rollup-plugin-filesize": "^1.5.0",
61-
"rollup-plugin-node-resolve": "^3.0.2",
62-
"rollup-plugin-replace": "^2.0.0",
63-
"rollup-plugin-uglify-es": "^0.0.1",
62+
"rollup": "^2.55.1",
63+
"rollup-plugin-filesize": "^9.1.1",
64+
"rollup-plugin-terser": "^7.0.2",
6465
"styled-components": "^4.0.0-beta.8",
6566
"typescript": "^2.9.2",
6667
"typings-tester": "^0.3.1"

‎rollup.config.js

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import nodeResolve from 'rollup-plugin-node-resolve';
2-
import replace from 'rollup-plugin-replace';
3-
import commonjs from 'rollup-plugin-commonjs';
4-
import babel from 'rollup-plugin-babel';
5-
import uglify from 'rollup-plugin-uglify-es';
1+
import { nodeResolve } from '@rollup/plugin-node-resolve';
2+
import replace from '@rollup/plugin-replace';
3+
import commonjs from '@rollup/plugin-commonjs';
4+
import { babel } from '@rollup/plugin-babel';
5+
import { terser } from 'rollup-plugin-terser';
66
import filesize from 'rollup-plugin-filesize';
77

88
const plugins = [
@@ -12,35 +12,38 @@ const plugins = [
1212
}),
1313
commonjs({
1414
include: 'node_modules/**',
15-
namedExports: {
16-
'buble/dist/buble.deps': ['transform'],
17-
buble: ['transform'],
18-
'prismjs/components/prism-core': ['highlight', 'languages']
19-
}
2015
}),
2116
babel({
17+
babelHelpers: 'runtime',
2218
babelrc: false,
23-
presets: [['env', { modules: false, loose: true }], 'react'],
19+
presets: [
20+
['@babel/preset-env', { modules: false, loose: true }],
21+
'@babel/preset-react',
22+
],
2423
plugins: [
25-
'external-helpers',
26-
'transform-object-rest-spread',
27-
'transform-class-properties',
28-
'transform-react-remove-prop-types'
24+
'@babel/plugin-transform-runtime',
25+
'@babel/plugin-proposal-object-rest-spread',
26+
'@babel/plugin-proposal-class-properties',
27+
'@babel/plugin-proposal-private-property-in-object',
28+
'@babel/plugin-proposal-private-methods',
29+
'transform-react-remove-prop-types',
2930
].filter(Boolean)
3031
})
3132
];
3233

3334
const devPlugins = plugins.concat([
3435
replace({
35-
'process.env.NODE_ENV': JSON.stringify('development')
36+
'process.env.NODE_ENV': JSON.stringify('development'),
37+
preventAssignment: true,
3638
})
3739
]);
3840

3941
const prodPlugins = plugins.concat([
4042
replace({
41-
'process.env.NODE_ENV': JSON.stringify('production')
43+
'process.env.NODE_ENV': JSON.stringify('production'),
44+
preventAssignment: true,
4245
}),
43-
uglify(),
46+
terser(),
4447
filesize()
4548
]);
4649

‎stories/Editor.js

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import React from 'react';
2-
import { storiesOf } from '@storybook/react';
3-
import { withKnobs } from '@storybook/addon-knobs/react';
42

53
import { Editor } from '../src/index';
64

7-
storiesOf('Editor', module)
8-
.addDecorator(withKnobs)
9-
.add('default', () => (
10-
<Editor language="js" code="const x = 'Hello World!';" />
11-
));
5+
export default {
6+
title: 'Editor',
7+
component: Editor,
8+
}
9+
10+
const Template = (args) => <Editor {...args} />;
11+
12+
export const Default = Template.bind({});
13+
Default.args = {
14+
language: "js",
15+
code: "const x = 'Hello World!';"
16+
};

0 commit comments

Comments
 (0)