Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7b441ed

Browse files
chore(build): replace babel-preset-es2015 by @babel/preset-env
This also unlock the upgrade to jest v24 and rollup v1
1 parent 2f076e7 commit 7b441ed

File tree

5 files changed

+1635
-1246
lines changed

5 files changed

+1635
-1246
lines changed

‎.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["es2015", "stage-2", "react", "flow"]
2+
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-flow"]
33
}

‎package.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@
3232
"license": "MIT",
3333
"repository": "algolia/react-element-to-jsx-string",
3434
"devDependencies": {
35+
"@babel/cli": "7.0.0",
36+
"@babel/core": "7.0.0",
37+
"@babel/preset-env": "7.0.0",
38+
"@babel/preset-flow": "7.0.0",
39+
"@babel/preset-react": "7.0.0",
3540
"@commitlint/cli": "7.3.2",
3641
"@commitlint/config-angular": "7.3.1",
37-
"babel-cli": "6.26.0",
3842
"babel-eslint": "10.0.1",
39-
"babel-jest": "23.6.0",
40-
"babel-preset-es2015": "6.24.1",
41-
"babel-preset-flow": "6.23.0",
42-
"babel-preset-react": "6.24.1",
43-
"babel-preset-stage-2": "6.24.1",
44-
"babel-register": "6.26.0",
43+
"babel-jest": "24.0.0",
4544
"conventional-changelog-cli": "2.0.11",
4645
"doctoc": "1.4.0",
4746
"enzyme": "3.8.0",
@@ -54,24 +53,24 @@
5453
"eslint-plugin-prettier": "3.0.1",
5554
"eslint-plugin-react": "7.12.4",
5655
"esm": "3.1.3",
57-
"expect": "23.6.0",
56+
"expect": "24.0.0",
5857
"flow-bin": "0.91.0",
5958
"flow-copy-source": "2.0.2",
6059
"husky": "1.3.1",
61-
"jest": "23.6.0",
60+
"jest": "24.0.0",
6261
"json": "9.0.6",
6362
"lint-staged": "8.1.0",
6463
"mversion": "1.12.0",
6564
"prettier": "1.16.1",
6665
"react": "16.7.0",
6766
"react-dom": "16.7.0",
6867
"react-test-renderer": "16.7.0",
69-
"rollup": "0.68.2",
70-
"rollup-plugin-babel": "3.0.7",
68+
"rollup": "1.1.2",
69+
"rollup-plugin-babel": "4.3.2",
7170
"rollup-plugin-commonjs": "9.2.0",
7271
"rollup-plugin-node-builtins": "2.1.2",
7372
"rollup-plugin-node-globals": "1.4.0",
74-
"rollup-plugin-node-resolve": "3.4.0",
73+
"rollup-plugin-node-resolve": "4.0.0",
7574
"rollup-plugin-sourcemaps": "0.4.2"
7675
},
7776
"peerDependencies": {
@@ -83,6 +82,6 @@
8382
"stringify-object": "3.3.0"
8483
},
8584
"jest": {
86-
"setupTestFrameworkScriptFile": "<rootDir>tests/setupTests.js"
85+
"setupFilesAfterEnv": ["<rootDir>tests/setupTests.js"]
8786
}
8887
}

‎rollup.config.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,9 @@ export default {
3030
// and minification in older versions of Uglify.
3131
exclude: 'node_modules/!(stringify-object)/**',
3232
presets: [
33-
[
34-
'es2015',
35-
{
36-
modules: false,
37-
},
38-
],
39-
'stage-2',
40-
'react',
41-
'flow',
33+
'@babel/preset-env',
34+
'@babel/preset-react',
35+
'@babel/preset-flow',
4236
],
4337
}),
4438
resolve({

‎src/formatter/formatComplexDataStructure.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
/* @flow */
22

33
import { isValidElement } from 'react';
4-
import stringify from 'stringify-object';
4+
import *asstringifyObject from 'stringify-object';
55
import sortObject from './sortObject';
66
import parseReactElement from './../parser/parseReactElement';
77
import formatTreeNode from './formatTreeNode';
88
import formatFunction from './formatFunction';
99
import spacer from './spacer';
1010
import type { Options } from './../options';
1111

12+
// Rollup fail to correctly import `stringify-object` so we have to use a workaround
13+
const stringify = (...args) => stringifyObject.default(...args);
14+
1215
export default (
1316
value: Object | Array<any>,
1417
inline: boolean,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /