Skip to content

Commit 761c7d3

Browse files
committed
Rollup (+ others) upgrade to fix UMD builds.
1 parent de90d52 commit 761c7d3

19 files changed

+22357
-5696
lines changed

packages/react-router-config/package-lock.json

+2,568-1,083
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-router-config/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,30 @@
3131
},
3232
"devDependencies": {
3333
"babel-cli": "^6.26.0",
34-
"babel-eslint": "^8.2.1",
35-
"babel-jest": "^22.1.0",
34+
"babel-eslint": "^8.2.3",
35+
"babel-jest": "^22.4.3",
3636
"babel-plugin-dev-expression": "^0.2.1",
3737
"babel-plugin-external-helpers": "^6.22.0",
38-
"babel-plugin-transform-react-remove-prop-types": "^0.4.12",
38+
"babel-plugin-transform-react-remove-prop-types": "^0.4.13",
3939
"babel-preset-es2015": "^6.14.0",
4040
"babel-preset-react": "^6.5.0",
4141
"babel-preset-stage-1": "^6.5.0",
42-
"eslint": "^4.16.0",
43-
"eslint-plugin-import": "^2.8.0",
44-
"eslint-plugin-react": "^7.6.0",
42+
"eslint": "^4.19.1",
43+
"eslint-plugin-import": "^2.11.0",
44+
"eslint-plugin-react": "^7.7.0",
4545
"gzip-size": "^4.1.0",
4646
"history": "^4.7.2",
47-
"jest": "^22.1.4",
47+
"jest": "^22.4.3",
4848
"pretty-bytes": "^4.0.2",
4949
"raf": "^3.4.0",
50-
"react": "^16.2.0",
50+
"react": "^16.3.2",
5151
"react-addons-test-utils": "^15.6.2",
52-
"react-dom": "^16.2.0",
52+
"react-dom": "^16.3.2",
5353
"react-router": "^4.2.0",
54-
"rollup": "^0.50.1",
55-
"rollup-plugin-babel": "^3.0.3",
56-
"rollup-plugin-commonjs": "^8.2.6",
57-
"rollup-plugin-node-resolve": "^3.0.2",
54+
"rollup": "^0.58.2",
55+
"rollup-plugin-babel": "^3.0.4",
56+
"rollup-plugin-commonjs": "^9.1.0",
57+
"rollup-plugin-node-resolve": "^3.3.0",
5858
"rollup-plugin-replace": "^2.0.0",
5959
"rollup-plugin-uglify": "^3.0.0"
6060
},

packages/react-router-config/rollup.config.js

+11-8
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import resolve from "rollup-plugin-node-resolve";
66

77
const config = {
88
input: "modules/index.js",
9-
name: "ReactRouterConfig",
10-
globals: {
11-
react: "React",
12-
"react-router/Switch": "ReactRouter.Switch",
13-
"react-router/Router": "ReactRouter.Router",
14-
"react-router/Route": "ReactRouter.Route",
15-
"react-router/matchPath": "ReactRouter.matchPath"
9+
output: {
10+
name: "ReactRouterConfig",
11+
globals: {
12+
react: "React",
13+
"react-router/Switch": "ReactRouter.Switch",
14+
"react-router/Router": "ReactRouter.Router",
15+
"react-router/Route": "ReactRouter.Route",
16+
"react-router/matchPath": "ReactRouter.matchPath"
17+
}
1618
},
1719
external: [
1820
"react",
@@ -23,7 +25,8 @@ const config = {
2325
],
2426
plugins: [
2527
babel({
26-
exclude: "node_modules/**"
28+
exclude: "node_modules/**",
29+
plugins: ["external-helpers"]
2730
}),
2831
resolve(),
2932
commonjs({
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
const BABEL_ENV = process.env.BABEL_ENV
2-
const building = BABEL_ENV != undefined && BABEL_ENV !== 'cjs'
1+
const BABEL_ENV = process.env.BABEL_ENV;
2+
const building = BABEL_ENV != undefined && BABEL_ENV !== "cjs";
33

4-
const plugins = []
4+
const plugins = [];
55

6-
if (BABEL_ENV === 'umd') {
7-
plugins.push('external-helpers')
8-
}
9-
10-
if (process.env.NODE_ENV === 'production') {
11-
plugins.push(
12-
'dev-expression',
13-
'transform-react-remove-prop-types'
14-
)
6+
if (process.env.NODE_ENV === "production") {
7+
plugins.push("dev-expression", "transform-react-remove-prop-types");
158
}
169

1710
module.exports = {
1811
presets: [
19-
[ 'es2015', {
20-
loose: true,
21-
modules: building ? false : 'commonjs'
22-
} ],
23-
'stage-1',
24-
'react'
12+
[
13+
"es2015",
14+
{
15+
loose: true,
16+
modules: building ? false : "commonjs"
17+
}
18+
],
19+
"stage-1",
20+
"react"
2521
],
2622
plugins: plugins
27-
}
23+
};

0 commit comments

Comments
 (0)