Comparing version 2.6.0-beta.1 to 2.6.0-beta.2
@@ -15,4 +15,4 @@ import _objectSpread from '@babel/runtime/helpers/esm/objectSpread'; | ||
export { reactRouterDom as router }; | ||
import { routerMiddleware as routerMiddleware$1, routerReducer } from 'react-router-redux'; | ||
import * as routerRedux from 'react-router-redux'; | ||
import { connectRouter as connectRouter$1, routerMiddleware as routerMiddleware$1 } from 'connected-react-router'; | ||
import * as routerRedux from 'connected-react-router'; | ||
export { routerRedux }; | ||
@@ -149,4 +149,4 @@ export { default as fetch } from 'isomorphic-fetch'; | ||
var routerMiddleware = routerMiddleware$1, | ||
routing = routerReducer; | ||
var connectRouter = connectRouter$1, | ||
routerMiddleware = routerMiddleware$1; | ||
var isFunction = utils.isFunction; | ||
@@ -158,3 +158,3 @@ function index () { | ||
initialReducer: { | ||
routing: routing | ||
router: connectRouter(history) | ||
}, | ||
@@ -165,3 +165,3 @@ setupMiddlewares: function setupMiddlewares(middlewares) { | ||
setupApp: function setupApp(app) { | ||
app._history = patchHistory(history); | ||
app._history = patchHistory(history); // app._history = patchHistory(history); | ||
} | ||
@@ -243,3 +243,3 @@ }; | ||
history.listen = function (callback) { | ||
callback(history.location); | ||
callback(history.location, history.action); | ||
return oldListen.call(history, callback); | ||
@@ -246,0 +246,0 @@ }; |
@@ -15,3 +15,3 @@ 'use strict'; | ||
var reactRouterDom = require('react-router-dom'); | ||
var routerRedux = require('react-router-redux'); | ||
var routerRedux = require('connected-react-router'); | ||
var isomorphicFetch = _interopDefault(require('isomorphic-fetch')); | ||
@@ -279,4 +279,4 @@ | ||
var routerMiddleware = routerRedux.routerMiddleware, | ||
routing = routerRedux.routerReducer; | ||
var connectRouter = routerRedux.connectRouter, | ||
routerMiddleware = routerRedux.routerMiddleware; | ||
var isFunction = dvaCore.utils.isFunction; | ||
@@ -288,3 +288,3 @@ function index () { | ||
initialReducer: { | ||
routing: routing | ||
router: connectRouter(history$1) | ||
}, | ||
@@ -295,3 +295,3 @@ setupMiddlewares: function setupMiddlewares(middlewares) { | ||
setupApp: function setupApp(app) { | ||
app._history = patchHistory(history$1); | ||
app._history = patchHistory(history$1); // app._history = patchHistory(history); | ||
} | ||
@@ -373,3 +373,3 @@ }; | ||
history.listen = function (callback) { | ||
callback(history.location); | ||
callback(history.location, history.action); | ||
return oldListen.call(history, callback); | ||
@@ -376,0 +376,0 @@ }; |
@@ -0,1 +1,2 @@ | ||
require('./warnAboutDeprecatedCJSRequire.js')('dynamic'); | ||
module.exports = require('./dist/dynamic'); |
@@ -1,2 +0,2 @@ | ||
require('./warnAboutDeprecatedCJSRequire.js')('fetch'); | ||
module.exports = require('isomorphic-fetch'); |
@@ -132,1 +132,10 @@ import { | ||
): Function; | ||
import * as routerRedux from 'connected-react-router'; | ||
export { routerRedux }; | ||
import * as fetch from 'isomorphic-fetch'; | ||
export { fetch }; | ||
import * as router from 'react-router-dom'; | ||
export { router }; |
{ | ||
"name": "dva", | ||
"version": "2.6.0-beta.1", | ||
"version": "2.6.0-beta.2", | ||
"description": "React and redux based, lightweight and elm-style framework.", | ||
@@ -36,4 +36,4 @@ "main": "dist/index.js", | ||
"@types/react-router-dom": "^4.3.1", | ||
"@types/react-router-redux": "^5.0.18", | ||
"dva-core": "1.6.0-beta.1", | ||
"connected-react-router": "^6.3.2", | ||
"dva-core": "1.6.0-beta.2", | ||
"global": "^4.3.2", | ||
@@ -45,3 +45,2 @@ "history": "^4.7.2", | ||
"react-router-dom": "^4.3.1", | ||
"react-router-redux": "5.0.0-alpha.9", | ||
"redux": "^4.0.1" | ||
@@ -48,0 +47,0 @@ }, |
@@ -1,4 +0,4 @@ | ||
import * as routerRedux from 'react-router-redux'; | ||
import * as routerRedux from 'connected-react-router'; | ||
export * from 'react-router-dom'; | ||
export { routerRedux }; |
@@ -0,2 +1,3 @@ | ||
require('./warnAboutDeprecatedCJSRequire.js')('router'); | ||
module.exports = require('react-router-dom'); | ||
module.exports.routerRedux = require('react-router-redux'); | ||
module.exports.routerRedux = require('connected-react-router'); |
@@ -1,2 +0,2 @@ | ||
require('./warnAboutDeprecatedCJSRequire.js')('saga'); | ||
module.exports = require('dva-core/saga'); |
@@ -12,5 +12,5 @@ import React from 'react'; | ||
import * as router from 'react-router-dom'; | ||
import * as routerRedux from 'react-router-redux'; | ||
import * as routerRedux from 'connected-react-router'; | ||
const { routerMiddleware, routerReducer: routing } = routerRedux; | ||
const { connectRouter, routerMiddleware } = routerRedux; | ||
const { isFunction } = utils; | ||
@@ -22,3 +22,3 @@ | ||
initialReducer: { | ||
routing, | ||
router: connectRouter(history), | ||
}, | ||
@@ -30,2 +30,3 @@ setupMiddlewares(middlewares) { | ||
app._history = patchHistory(history); | ||
// app._history = patchHistory(history); | ||
}, | ||
@@ -116,3 +117,3 @@ }; | ||
history.listen = callback => { | ||
callback(history.location); | ||
callback(history.location, history.action); | ||
return oldListen.call(history, callback); | ||
@@ -119,0 +120,0 @@ }; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
41133
14
1163
0
+ Addedconnected-react-router@6.9.3(transitive)
+ Addeddva-core@1.6.0-beta.2(transitive)
+ Addedimmutable@4.3.7(transitive)
+ Addedlodash.isequalwith@4.4.0(transitive)
+ Addedreact@17.0.2(transitive)
+ Addedreact-router@5.3.4(transitive)
+ Addedseamless-immutable@7.1.4(transitive)
- Removed@types/react-router-redux@^5.0.18
- Removedreact-router-redux@5.0.0-alpha.9
- Removed@types/react-router-redux@5.0.27(transitive)
- Removeddva-core@1.6.0-beta.1(transitive)
- Removedreact-router-redux@5.0.0-alpha.9(transitive)
Updateddva-core@1.6.0-beta.2