#242: update react-router and history

This commit is contained in:
SleepWalker 2016-12-04 14:54:08 +02:00
parent 3dc8c98c89
commit 70db8d05e5
2 changed files with 14 additions and 21 deletions

31
npm-shrinkwrap.json generated
View File

@ -2906,9 +2906,9 @@
"dev": true
},
"history": {
"version": "2.1.2",
"from": "history@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/history/-/history-2.1.2.tgz"
"version": "3.2.1",
"from": "history@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/history/-/history-3.2.1.tgz"
},
"hoek": {
"version": "2.16.3",
@ -5069,9 +5069,9 @@
"dev": true
},
"query-string": {
"version": "3.0.3",
"from": "query-string@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-3.0.3.tgz"
"version": "4.2.3",
"from": "query-string@>=4.2.2 <5.0.0",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.2.3.tgz"
},
"querystring": {
"version": "0.2.0",
@ -5211,16 +5211,9 @@
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.4.6.tgz"
},
"react-router": {
"version": "2.8.1",
"from": "react-router@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-2.8.1.tgz",
"dependencies": {
"warning": {
"version": "3.0.0",
"from": "warning@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz"
}
}
"version": "3.0.0",
"from": "react-router@3.0.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-3.0.0.tgz"
},
"react-router-redux": {
"version": "3.0.0",
@ -6720,9 +6713,9 @@
"dev": true
},
"warning": {
"version": "2.1.0",
"from": "warning@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/warning/-/warning-2.1.0.tgz"
"version": "3.0.0",
"from": "warning@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz"
},
"watchpack": {
"version": "0.2.9",

View File

@ -19,7 +19,7 @@
"dependencies": {
"babel-polyfill": "^6.3.14",
"classnames": "^2.1.3",
"history": "^2.0.0",
"history": "^3.2.1",
"intl": "^1.2.2",
"intl-format-cache": "^2.0.4",
"intl-messageformat": "^1.1.0",
@ -31,7 +31,7 @@
"react-intl": "^2.0.0",
"react-motion": "^0.4.0",
"react-redux": "^4.0.0",
"react-router": "^2.0.0",
"react-router": "^3.0.0",
"react-router-redux": "^3.0.0",
"redux": "^3.0.4",
"redux-localstorage": "^0.4.1",