Comparing version 2.5.0-beta.2 to 2.6.0-beta.1
@@ -1,1 +0,1 @@ | ||
module.exports = require('./lib/dynamic'); | ||
module.exports = require('./dist/dynamic'); |
{ | ||
"name": "dva", | ||
"version": "2.5.0-beta.2", | ||
"version": "2.6.0-beta.1", | ||
"description": "React and redux based, lightweight and elm-style framework.", | ||
"main": "dist/index.js", | ||
"module": "dist/index.esm.js", | ||
"typings": "index.d.ts", | ||
"sideEffects": false, | ||
"repository": { | ||
@@ -30,23 +34,22 @@ "type": "git", | ||
"@babel/runtime": "^7.0.0", | ||
"@types/isomorphic-fetch": "^0.0.34", | ||
"@types/react-router-dom": "^4.2.7", | ||
"@types/react-router-redux": "^5.0.13", | ||
"dva-core": "^1.5.0-beta.2", | ||
"@types/isomorphic-fetch": "^0.0.35", | ||
"@types/react-router-dom": "^4.3.1", | ||
"@types/react-router-redux": "^5.0.18", | ||
"dva-core": "1.6.0-beta.1", | ||
"global": "^4.3.2", | ||
"history": "^4.6.3", | ||
"invariant": "^2.2.2", | ||
"history": "^4.7.2", | ||
"invariant": "^2.2.4", | ||
"isomorphic-fetch": "^2.2.1", | ||
"react-redux": "^5.0.5", | ||
"react-router-dom": "^4.1.2", | ||
"react-redux": "^7.0.1", | ||
"react-router-dom": "^4.3.1", | ||
"react-router-redux": "5.0.0-alpha.9", | ||
"redux": "^3.7.2" | ||
"redux": "^4.0.1" | ||
}, | ||
"peerDependencies": { | ||
"react": "15.x || ^16.0.0-0", | ||
"react-dom": "15.x || ^16.0.0-0" | ||
"react": "^16.18.4", | ||
"react-dom": "^16.18.4" | ||
}, | ||
"files": [ | ||
"lib", | ||
"dist", | ||
"src", | ||
"dist", | ||
"dynamic.js", | ||
@@ -53,0 +56,0 @@ "fetch.js", |
@@ -37,3 +37,3 @@ import React, { Component } from 'react'; | ||
load() { | ||
resolve().then((m) => { | ||
resolve().then(m => { | ||
const AsyncComponent = m.default || m; | ||
@@ -61,23 +61,26 @@ if (this.mounted) { | ||
return asyncComponent({ | ||
resolve: config.resolve || function () { | ||
const models = typeof resolveModels === 'function' ? resolveModels() : []; | ||
const component = resolveComponent(); | ||
return new Promise((resolve) => { | ||
Promise.all([...models, component]).then((ret) => { | ||
if (!models || !models.length) { | ||
return resolve(ret[0]); | ||
} else { | ||
const len = models.length; | ||
ret.slice(0, len).forEach((m) => { | ||
m = m.default || m; | ||
if (!Array.isArray(m)) { | ||
m = [m]; | ||
} | ||
m.map(_ => registerModel(app, _)); | ||
}); | ||
resolve(ret[len]); | ||
} | ||
resolve: | ||
config.resolve || | ||
function() { | ||
const models = | ||
typeof resolveModels === 'function' ? resolveModels() : []; | ||
const component = resolveComponent(); | ||
return new Promise(resolve => { | ||
Promise.all([...models, component]).then(ret => { | ||
if (!models || !models.length) { | ||
return resolve(ret[0]); | ||
} else { | ||
const len = models.length; | ||
ret.slice(0, len).forEach(m => { | ||
m = m.default || m; | ||
if (!Array.isArray(m)) { | ||
m = [m]; | ||
} | ||
m.map(_ => registerModel(app, _)); | ||
}); | ||
resolve(ret[len]); | ||
} | ||
}); | ||
}); | ||
}); | ||
}, | ||
}, | ||
...config, | ||
@@ -87,4 +90,4 @@ }); | ||
dynamic.setDefaultLoadingComponent = (LoadingComponent) => { | ||
dynamic.setDefaultLoadingComponent = LoadingComponent => { | ||
defaultLoadingComponent = LoadingComponent; | ||
}; |
import React from 'react'; | ||
import invariant from 'invariant'; | ||
import createHashHistory from 'history/createHashHistory'; | ||
import { | ||
routerMiddleware, | ||
routerReducer as routing, | ||
} from 'react-router-redux'; | ||
createBrowserHistory, | ||
createMemoryHistory, | ||
createHashHistory, | ||
} from 'history'; | ||
import document from 'global/document'; | ||
import { Provider } from 'react-redux'; | ||
import * as core from 'dva-core'; | ||
import { isFunction } from 'dva-core/lib/utils'; | ||
import { Provider, connect, connectAdvanced } from 'react-redux'; | ||
import { utils, create, saga } from 'dva-core'; | ||
import * as router from 'react-router-dom'; | ||
import * as routerRedux from 'react-router-redux'; | ||
export default function (opts = {}) { | ||
const { routerMiddleware, routerReducer: routing } = routerRedux; | ||
const { isFunction } = utils; | ||
export default function(opts = {}) { | ||
const history = opts.history || createHashHistory(); | ||
@@ -20,6 +24,3 @@ const createOpts = { | ||
setupMiddlewares(middlewares) { | ||
return [ | ||
routerMiddleware(history), | ||
...middlewares, | ||
]; | ||
return [routerMiddleware(history), ...middlewares]; | ||
}, | ||
@@ -31,3 +32,3 @@ setupApp(app) { | ||
const app = core.create(opts, createOpts); | ||
const app = create(opts, createOpts); | ||
const oldAppStart = app.start; | ||
@@ -50,6 +51,3 @@ app.router = router; | ||
container = document.querySelector(container); | ||
invariant( | ||
container, | ||
`[app.start] container ${container} not found`, | ||
); | ||
invariant(container, `[app.start] container ${container} not found`); | ||
} | ||
@@ -89,3 +87,5 @@ | ||
function isHTMLElement(node) { | ||
return typeof node === 'object' && node !== null && node.nodeType && node.nodeName; | ||
return ( | ||
typeof node === 'object' && node !== null && node.nodeType && node.nodeName | ||
); | ||
} | ||
@@ -100,3 +100,3 @@ | ||
<Provider store={store}> | ||
{ router({ app, history: app._history, ...extraProps }) } | ||
{router({ app, history: app._history, ...extraProps })} | ||
</Provider> | ||
@@ -108,4 +108,7 @@ ); | ||
function render(container, store, app, router) { | ||
const ReactDOM = require('react-dom'); // eslint-disable-line | ||
ReactDOM.render(React.createElement(getProvider(store, app, router)), container); | ||
const ReactDOM = require('react-dom'); // eslint-disable-line | ||
ReactDOM.render( | ||
React.createElement(getProvider(store, app, router)), | ||
container, | ||
); | ||
} | ||
@@ -115,3 +118,3 @@ | ||
const oldListen = history.listen; | ||
history.listen = (callback) => { | ||
history.listen = callback => { | ||
callback(history.location); | ||
@@ -122,1 +125,9 @@ return oldListen.call(history, callback); | ||
} | ||
export fetch from 'isomorphic-fetch'; | ||
export dynamic from './dynamic'; | ||
export { connect, connectAdvanced }; | ||
export { router }; | ||
export { saga }; | ||
export { routerRedux }; | ||
export { createBrowserHistory, createMemoryHistory, createHashHistory }; |
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
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
40472
16
1152
1
+ Added@types/hoist-non-react-statics@3.3.5(transitive)
+ Added@types/isomorphic-fetch@0.0.35(transitive)
+ Added@types/react-redux@7.1.34(transitive)
+ Addeddva-core@1.6.0-beta.1(transitive)
+ Addedreact@18.3.1(transitive)
+ Addedreact-is@17.0.2(transitive)
+ Addedreact-redux@7.2.9(transitive)
+ Addedredux@4.2.1(transitive)
- Removed@types/isomorphic-fetch@0.0.34(transitive)
- Removeddva-core@1.5.0-beta.2(transitive)
- Removedlodash@4.17.21(transitive)
- Removedlodash-es@4.17.21(transitive)
- Removedreact@16.14.0(transitive)
- Removedreact-dom@16.14.0(transitive)
- Removedreact-lifecycles-compat@3.0.4(transitive)
- Removedreact-redux@5.1.2(transitive)
- Removedredux@3.7.2(transitive)
- Removedscheduler@0.19.1(transitive)
- Removedsymbol-observable@1.2.0(transitive)
Updateddva-core@1.6.0-beta.1
Updatedhistory@^4.7.2
Updatedinvariant@^2.2.4
Updatedreact-redux@^7.0.1
Updatedreact-router-dom@^4.3.1
Updatedredux@^4.0.1