Comparing version 2.6.0-beta.4 to 2.6.0-beta.5
@@ -7,6 +7,6 @@ import _objectSpread from '@babel/runtime/helpers/esm/objectSpread'; | ||
import { createHashHistory } from 'history'; | ||
export { createBrowserHistory, createMemoryHistory, createHashHistory } from 'history'; | ||
export { createBrowserHistory, createHashHistory, createMemoryHistory } from 'history'; | ||
import document from 'global/document'; | ||
import { Provider } from 'react-redux'; | ||
export { connect, connectAdvanced } from 'react-redux'; | ||
export { connect, connectAdvanced, useDispatch, useSelector, useStore } from 'react-redux'; | ||
import { create, utils } from 'dva-core'; | ||
@@ -13,0 +13,0 @@ export { saga } from 'dva-core'; |
@@ -376,8 +376,56 @@ 'use strict'; | ||
exports.createBrowserHistory = history.createBrowserHistory; | ||
exports.createMemoryHistory = history.createMemoryHistory; | ||
exports.createHashHistory = history.createHashHistory; | ||
exports.connect = reactRedux.connect; | ||
exports.connectAdvanced = reactRedux.connectAdvanced; | ||
exports.saga = dvaCore.saga; | ||
Object.defineProperty(exports, 'createBrowserHistory', { | ||
enumerable: true, | ||
get: function () { | ||
return history.createBrowserHistory; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'createHashHistory', { | ||
enumerable: true, | ||
get: function () { | ||
return history.createHashHistory; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'createMemoryHistory', { | ||
enumerable: true, | ||
get: function () { | ||
return history.createMemoryHistory; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'connect', { | ||
enumerable: true, | ||
get: function () { | ||
return reactRedux.connect; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'connectAdvanced', { | ||
enumerable: true, | ||
get: function () { | ||
return reactRedux.connectAdvanced; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'useDispatch', { | ||
enumerable: true, | ||
get: function () { | ||
return reactRedux.useDispatch; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'useSelector', { | ||
enumerable: true, | ||
get: function () { | ||
return reactRedux.useSelector; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'useStore', { | ||
enumerable: true, | ||
get: function () { | ||
return reactRedux.useStore; | ||
} | ||
}); | ||
Object.defineProperty(exports, 'saga', { | ||
enumerable: true, | ||
get: function () { | ||
return dvaCore.saga; | ||
} | ||
}); | ||
exports.router = reactRouterDom; | ||
@@ -384,0 +432,0 @@ exports.routerRedux = routerRedux; |
{ | ||
"name": "dva", | ||
"version": "2.6.0-beta.4", | ||
"version": "2.6.0-beta.5", | ||
"description": "React and redux based, lightweight and elm-style framework.", | ||
@@ -37,3 +37,3 @@ "main": "dist/index.js", | ||
"connected-react-router": "^6.3.2", | ||
"dva-core": "1.6.0-beta.3", | ||
"dva-core": "1.6.0-beta.4", | ||
"global": "^4.3.2", | ||
@@ -43,3 +43,3 @@ "history": "^4.7.2", | ||
"isomorphic-fetch": "^2.2.1", | ||
"react-redux": "^7.0.1", | ||
"react-redux": "^7.1.0", | ||
"react-router-dom": "^4.3.1", | ||
@@ -46,0 +46,0 @@ "redux": "^4.0.1" |
@@ -20,4 +20,3 @@ import React, { Component } from 'react'; | ||
super(...args); | ||
this.LoadingComponent = | ||
config.LoadingComponent || defaultLoadingComponent; | ||
this.LoadingComponent = config.LoadingComponent || defaultLoadingComponent; | ||
this.state = { | ||
@@ -64,4 +63,3 @@ AsyncComponent: null, | ||
function() { | ||
const models = | ||
typeof resolveModels === 'function' ? resolveModels() : []; | ||
const models = typeof resolveModels === 'function' ? resolveModels() : []; | ||
const component = resolveComponent(); | ||
@@ -68,0 +66,0 @@ return new Promise(resolve => { |
import React from 'react'; | ||
import invariant from 'invariant'; | ||
import { createBrowserHistory, createMemoryHistory, createHashHistory } from 'history'; | ||
import document from 'global/document'; | ||
import { | ||
createBrowserHistory, | ||
createMemoryHistory, | ||
createHashHistory, | ||
} from 'history'; | ||
import document from 'global/document'; | ||
import { Provider, connect, connectAdvanced } from 'react-redux'; | ||
Provider, | ||
connect, | ||
connectAdvanced, | ||
useSelector, | ||
useDispatch, | ||
useStore, | ||
} from 'react-redux'; | ||
import { utils, create, saga } from 'dva-core'; | ||
@@ -60,6 +63,3 @@ import * as router from 'react-router-dom'; | ||
// 路由必须提前注册 | ||
invariant( | ||
app._router, | ||
`[app.start] router must be registered before app.start()`, | ||
); | ||
invariant(app._router, `[app.start] router must be registered before app.start()`); | ||
@@ -86,5 +86,3 @@ if (!app._store) { | ||
function isHTMLElement(node) { | ||
return ( | ||
typeof node === 'object' && node !== null && node.nodeType && node.nodeName | ||
); | ||
return typeof node === 'object' && node !== null && node.nodeType && node.nodeName; | ||
} | ||
@@ -98,5 +96,3 @@ | ||
const DvaRoot = extraProps => ( | ||
<Provider store={store}> | ||
{router({ app, history: app._history, ...extraProps })} | ||
</Provider> | ||
<Provider store={store}>{router({ app, history: app._history, ...extraProps })}</Provider> | ||
); | ||
@@ -108,6 +104,3 @@ return DvaRoot; | ||
const ReactDOM = require('react-dom'); // eslint-disable-line | ||
ReactDOM.render( | ||
React.createElement(getProvider(store, app, router)), | ||
container, | ||
); | ||
ReactDOM.render(React.createElement(getProvider(store, app, router)), container); | ||
} | ||
@@ -126,3 +119,3 @@ | ||
export dynamic from './dynamic'; | ||
export { connect, connectAdvanced }; | ||
export { connect, connectAdvanced, useSelector, useDispatch, useStore }; | ||
export { router }; | ||
@@ -129,0 +122,0 @@ export { saga }; |
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
43001
1231
+ Addeddva-core@1.6.0-beta.4(transitive)
- Removeddva-core@1.6.0-beta.3(transitive)
Updateddva-core@1.6.0-beta.4
Updatedreact-redux@^7.1.0