Skip to content

Commit 7450ce0

Browse files
committed
Update deps and fix for various problems.
Temp fixes for error boundaries until facebook/react#11098 is resolved.
1 parent 06d5661 commit 7450ce0

File tree

13 files changed

+11401
-4137
lines changed

13 files changed

+11401
-4137
lines changed

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

Lines changed: 2550 additions & 864 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-router-config/package.json

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,43 @@
3030
},
3131
"devDependencies": {
3232
"babel-cli": "^6.26.0",
33-
"babel-eslint": "^7.0.4",
33+
"babel-eslint": "^8.0.1",
34+
"babel-jest": "^21.2.0",
3435
"babel-plugin-dev-expression": "^0.2.1",
3536
"babel-plugin-external-helpers": "^6.22.0",
36-
"babel-plugin-transform-react-remove-prop-types": "^0.4.8",
37+
"babel-plugin-transform-react-remove-prop-types": "^0.4.10",
3738
"babel-preset-es2015": "^6.14.0",
3839
"babel-preset-react": "^6.5.0",
3940
"babel-preset-stage-1": "^6.5.0",
40-
"eslint": "^4.5.0",
41+
"eslint": "^4.9.0",
4142
"eslint-plugin-import": "^2.2.0",
42-
"eslint-plugin-react": "^7.3.0",
43-
"gzip-size": "^3.0.0",
43+
"eslint-plugin-react": "^7.4.0",
44+
"gzip-size": "^4.0.0",
4445
"history": "^4.6.3",
45-
"jest": "^20.0.4",
46+
"jest": "^21.2.1",
4647
"pretty-bytes": "^4.0.2",
47-
"react": "^15.4.2",
48-
"react-addons-test-utils": "^15.4.2",
49-
"react-dom": "^15.3.0",
48+
"raf": "^3.4.0",
49+
"react": "^16.0.0",
50+
"react-addons-test-utils": "^15.6.2",
51+
"react-dom": "^16.0.0",
5052
"react-router": "^4.2.0",
51-
"rollup": "^0.48.2",
53+
"rollup": "^0.50.0",
5254
"rollup-plugin-babel": "^3.0.2",
53-
"rollup-plugin-commonjs": "^8.2.0",
55+
"rollup-plugin-commonjs": "^8.2.3",
5456
"rollup-plugin-node-resolve": "^3.0.0",
55-
"rollup-plugin-replace": "^1.1.1",
57+
"rollup-plugin-replace": "^2.0.0",
5658
"rollup-plugin-uglify": "^2.0.1"
5759
},
5860
"browserify": {
5961
"transform": [
6062
"loose-envify"
6163
]
6264
},
65+
"jest": {
66+
"setupFiles": [
67+
"raf/polyfill"
68+
]
69+
},
6370
"keywords": [
6471
"react",
6572
"router",

packages/react-router-dom/modules/NavLink.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const NavLink = ({
4444
)
4545
}}
4646
/>
47-
);
47+
)
4848
}
4949

5050
NavLink.propTypes = {

packages/react-router-dom/modules/__tests__/Link-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('A <Link>', () => {
5151
), node)
5252
}).toThrow(/You should not use <Link> outside a <Router>/)
5353

54-
expect(console.error.calls.count()).toBe(1)
54+
expect(console.error.calls.count()).toBe(2)
5555
expect(console.error.calls.argsFor(0)[0]).toContain(
5656
'The context `router` is marked as required in `Link`'
5757
)

0 commit comments

Comments
 (0)