Skip to content

Commit

Permalink
chore(build): replace babel-preset-es2015 by @babel/preset-env
Browse files Browse the repository at this point in the history
This also unlock the upgrade to jest v24 and rollup v1
  • Loading branch information
armandabric committed Jan 27, 2019
1 parent 2f076e7 commit 7b441ed
Show file tree
Hide file tree
Showing 5 changed files with 1,635 additions and 1,246 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["es2015", "stage-2", "react", "flow"]
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-flow"]
}
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@
"license": "MIT",
"repository": "algolia/react-element-to-jsx-string",
"devDependencies": {
"@babel/cli": "7.0.0",
"@babel/core": "7.0.0",
"@babel/preset-env": "7.0.0",
"@babel/preset-flow": "7.0.0",
"@babel/preset-react": "7.0.0",
"@commitlint/cli": "7.3.2",
"@commitlint/config-angular": "7.3.1",
"babel-cli": "6.26.0",
"babel-eslint": "10.0.1",
"babel-jest": "23.6.0",
"babel-preset-es2015": "6.24.1",
"babel-preset-flow": "6.23.0",
"babel-preset-react": "6.24.1",
"babel-preset-stage-2": "6.24.1",
"babel-register": "6.26.0",
"babel-jest": "24.0.0",
"conventional-changelog-cli": "2.0.11",
"doctoc": "1.4.0",
"enzyme": "3.8.0",
Expand All @@ -54,24 +53,24 @@
"eslint-plugin-prettier": "3.0.1",
"eslint-plugin-react": "7.12.4",
"esm": "3.1.3",
"expect": "23.6.0",
"expect": "24.0.0",
"flow-bin": "0.91.0",
"flow-copy-source": "2.0.2",
"husky": "1.3.1",
"jest": "23.6.0",
"jest": "24.0.0",
"json": "9.0.6",
"lint-staged": "8.1.0",
"mversion": "1.12.0",
"prettier": "1.16.1",
"react": "16.7.0",
"react-dom": "16.7.0",
"react-test-renderer": "16.7.0",
"rollup": "0.68.2",
"rollup-plugin-babel": "3.0.7",
"rollup": "1.1.2",
"rollup-plugin-babel": "4.3.2",
"rollup-plugin-commonjs": "9.2.0",
"rollup-plugin-node-builtins": "2.1.2",
"rollup-plugin-node-globals": "1.4.0",
"rollup-plugin-node-resolve": "3.4.0",
"rollup-plugin-node-resolve": "4.0.0",
"rollup-plugin-sourcemaps": "0.4.2"
},
"peerDependencies": {
Expand All @@ -83,6 +82,6 @@
"stringify-object": "3.3.0"
},
"jest": {
"setupTestFrameworkScriptFile": "<rootDir>tests/setupTests.js"
"setupFilesAfterEnv": ["<rootDir>tests/setupTests.js"]
}
}
12 changes: 3 additions & 9 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,9 @@ export default {
// and minification in older versions of Uglify.
exclude: 'node_modules/!(stringify-object)/**',
presets: [
[
'es2015',
{
modules: false,
},
],
'stage-2',
'react',
'flow',
'@babel/preset-env',
'@babel/preset-react',
'@babel/preset-flow',
],
}),
resolve({
Expand Down
5 changes: 4 additions & 1 deletion src/formatter/formatComplexDataStructure.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
/* @flow */

import { isValidElement } from 'react';
import stringify from 'stringify-object';
import * as stringifyObject from 'stringify-object';
import sortObject from './sortObject';
import parseReactElement from './../parser/parseReactElement';
import formatTreeNode from './formatTreeNode';
import formatFunction from './formatFunction';
import spacer from './spacer';
import type { Options } from './../options';

// Rollup fail to correctly import `stringify-object` so we have to use a workaround
const stringify = (...args) => stringifyObject.default(...args);

export default (
value: Object | Array<any>,
inline: boolean,
Expand Down
Loading

0 comments on commit 7b441ed

Please sign in to comment.