Comparing version 2.6.0-beta.17 to 2.6.0-beta.18
@@ -14,4 +14,5 @@ import _objectSpread from '@babel/runtime/helpers/esm/objectSpread'; | ||
export { saga } from 'dva-core'; | ||
import * as reactRouterDom from 'react-router-dom'; | ||
export { reactRouterDom as router }; | ||
import { useHistory as useHistory$1, useLocation as useLocation$1, useParams as useParams$1, useRouteMatch as useRouteMatch$1 } from 'react-router-dom'; | ||
import * as router from 'react-router-dom'; | ||
export { router }; | ||
import { connectRouter as connectRouter$1, routerMiddleware as routerMiddleware$1 } from 'connected-react-router'; | ||
@@ -153,2 +154,6 @@ import * as routerRedux from 'connected-react-router'; | ||
var isFunction = utils.isFunction; | ||
var useHistory = useHistory$1, | ||
useLocation = useLocation$1, | ||
useParams = useParams$1, | ||
useRouteMatch = useRouteMatch$1; | ||
function index () { | ||
@@ -275,2 +280,2 @@ var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
export default index; | ||
export { dynamic }; | ||
export { dynamic, useHistory, useLocation, useParams, useRouteMatch }; |
@@ -15,3 +15,3 @@ 'use strict'; | ||
var dvaCore = require('dva-core'); | ||
var reactRouterDom = require('react-router-dom'); | ||
var router = require('react-router-dom'); | ||
var routerRedux = require('connected-react-router'); | ||
@@ -283,2 +283,6 @@ var isomorphicFetch = _interopDefault(require('isomorphic-fetch')); | ||
var isFunction = dvaCore.utils.isFunction; | ||
var useHistory = router.useHistory, | ||
useLocation = router.useLocation, | ||
useParams = router.useParams, | ||
useRouteMatch = router.useRouteMatch; | ||
function index () { | ||
@@ -470,3 +474,3 @@ var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
}); | ||
exports.router = reactRouterDom; | ||
exports.router = router; | ||
exports.routerRedux = routerRedux; | ||
@@ -476,1 +480,5 @@ exports.fetch = isomorphicFetch; | ||
exports.dynamic = dynamic; | ||
exports.useHistory = useHistory; | ||
exports.useLocation = useLocation; | ||
exports.useParams = useParams; | ||
exports.useRouteMatch = useRouteMatch; |
import { | ||
Reducer, | ||
Action, | ||
AnyAction, | ||
@@ -57,2 +58,6 @@ ReducersMapObject, | ||
export interface Dispatch<A extends Action = AnyAction> { | ||
<T extends A>(action: T): Promise<any> | T; | ||
} | ||
export interface SubscriptionAPI { | ||
@@ -141,1 +146,2 @@ history: History, | ||
export { router }; | ||
export { useHistory, useLocation, useParams, useRouteMatch } from 'react-router-dom'; |
{ | ||
"name": "dva", | ||
"version": "2.6.0-beta.17", | ||
"version": "2.6.0-beta.18", | ||
"description": "React and redux based, lightweight and elm-style framework.", | ||
@@ -36,3 +36,3 @@ "main": "dist/index.js", | ||
"@types/react-redux": "^7.1.0", | ||
"@types/react-router-dom": "^4.3.1", | ||
"@types/react-router-dom": "^5.1.2", | ||
"connected-react-router": "6.5.2", | ||
@@ -45,3 +45,3 @@ "dva-core": "2.0.1", | ||
"react-redux": "^7.1.0", | ||
"react-router-dom": "^4.3.1", | ||
"react-router-dom": "^5.1.2", | ||
"redux": "^4.0.1" | ||
@@ -48,0 +48,0 @@ }, |
@@ -21,2 +21,3 @@ import React from 'react'; | ||
const { isFunction } = utils; | ||
const { useHistory, useLocation, useParams, useRouteMatch } = router; | ||
@@ -148,1 +149,2 @@ export default function(opts = {}) { | ||
export { createBrowserHistory, createMemoryHistory, createHashHistory }; | ||
export { useHistory, useLocation, useParams, useRouteMatch }; |
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
47678
1338
+ Added@types/react-router-dom@5.3.3(transitive)
+ Addedreact-router-dom@5.3.4(transitive)
- Removed@types/history@5.0.0(transitive)
- Removed@types/react-router-dom@4.3.5(transitive)
- Removedhoist-non-react-statics@2.5.5(transitive)
- Removedreact-router@4.3.1(transitive)
- Removedreact-router-dom@4.3.1(transitive)
- Removedwarning@4.0.3(transitive)
Updatedreact-router-dom@^5.1.2