dva - npm Package Compare versions

Comparing version 2.1.0 to 2.2.0-beta.1

lib/dynamic.js

@@ -1,50 +0,35 @@
-'use strict';
+"use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = dynamic;
 
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
+var _promise = _interopRequireDefault(require("@babel/runtime/core-js/promise"));
 
-var _promise = require('babel-runtime/core-js/promise');
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _promise2 = _interopRequireDefault(_promise);
+var _getPrototypeOf = _interopRequireDefault(require("@babel/runtime/core-js/object/get-prototype-of"));
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-var _extends3 = _interopRequireDefault(_extends2);
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
-var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+var _react = _interopRequireWildcard(require("react"));
 
-var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+var cached = {};
 
-var _createClass2 = require('babel-runtime/helpers/createClass');
-
-var _createClass3 = _interopRequireDefault(_createClass2);
-
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
-
-var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
-
-var _inherits2 = require('babel-runtime/helpers/inherits');
-
-var _inherits3 = _interopRequireDefault(_inherits2);
-
-exports.default = dynamic;
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var cached = {};
 function registerModel(app, model) {
   model = model.default || model;
+
   if (!cached[model.namespace]) {
@@ -62,58 +47,68 @@ app.model(model);
   var resolve = config.resolve;
+  return (
+    /*#__PURE__*/
+    function (_Component) {
+      (0, _inherits2.default)(DynamicComponent, _Component);
 
+      function DynamicComponent() {
+        var _ref;
 
-  return function (_Component) {
-    (0, _inherits3.default)(DynamicComponent, _Component);
+        var _this;
 
-    function DynamicComponent() {
-      var _ref;
+        (0, _classCallCheck2.default)(this, DynamicComponent);
 
-      (0, _classCallCheck3.default)(this, DynamicComponent);
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
 
-      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+        _this = (0, _possibleConstructorReturn2.default)(this, (_ref = DynamicComponent.__proto__ || (0, _getPrototypeOf.default)(DynamicComponent)).call.apply(_ref, [this].concat(args)));
+        _this.LoadingComponent = config.LoadingComponent || defaultLoadingComponent;
+        _this.state = {
+          AsyncComponent: null
+        };
 
-      var _this = (0, _possibleConstructorReturn3.default)(this, (_ref = DynamicComponent.__proto__ || (0, _getPrototypeOf2.default)(DynamicComponent)).call.apply(_ref, [this].concat(args)));
+        _this.load();
 
-      _this.LoadingComponent = config.LoadingComponent || defaultLoadingComponent;
-      _this.state = {
-        AsyncComponent: null
-      };
-      _this.load();
-      return _this;
-    }
-
-    (0, _createClass3.default)(DynamicComponent, [{
-      key: 'componentDidMount',
-      value: function componentDidMount() {
-        this.mounted = true;
+        return _this;
       }
-    }, {
-      key: 'load',
-      value: function load() {
-        var _this2 = this;
 
-        resolve().then(function (m) {
-          var AsyncComponent = m.default || m;
-          if (_this2.mounted) {
-            _this2.setState({ AsyncComponent: AsyncComponent });
-          } else {
-            _this2.state.AsyncComponent = AsyncComponent; // eslint-disable-line
-          }
-        });
-      }
-    }, {
-      key: 'render',
-      value: function render() {
-        var AsyncComponent = this.state.AsyncComponent;
-        var LoadingComponent = this.LoadingComponent;
+      (0, _createClass2.default)(DynamicComponent, [{
+        key: "componentDidMount",
+        value: function componentDidMount() {
+          this.mounted = true;
+        }
+      }, {
+        key: "componentWillUnmount",
+        value: function componentWillUnmount() {
+          this.mounted = false;
+        }
+      }, {
+        key: "load",
+        value: function load() {
+          var _this2 = this;
 
-        if (AsyncComponent) return _react2.default.createElement(AsyncComponent, this.props);
+          resolve().then(function (m) {
+            var AsyncComponent = m.default || m;
 
-        return _react2.default.createElement(LoadingComponent, this.props);
-      }
-    }]);
-    return DynamicComponent;
-  }(_react.Component);
+            if (_this2.mounted) {
+              _this2.setState({
+                AsyncComponent: AsyncComponent
+              });
+            } else {
+              _this2.state.AsyncComponent = AsyncComponent; // eslint-disable-line
+            }
+          });
+        }
+      }, {
+        key: "render",
+        value: function render() {
+          var AsyncComponent = this.state.AsyncComponent;
+          var LoadingComponent = this.LoadingComponent;
+          if (AsyncComponent) return _react.default.createElement(AsyncComponent, this.props);
+          return _react.default.createElement(LoadingComponent, this.props);
+        }
+      }]);
+      return DynamicComponent;
+    }(_react.Component)
+  );
 }
@@ -125,9 +120,8 @@
       resolveComponent = config.component;
-
-  return asyncComponent((0, _extends3.default)({
+  return asyncComponent((0, _extends2.default)({
     resolve: config.resolve || function () {
       var models = typeof resolveModels === 'function' ? resolveModels() : [];
       var component = resolveComponent();
-      return new _promise2.default(function (resolve) {
-        _promise2.default.all([].concat((0, _toConsumableArray3.default)(models), [component])).then(function (ret) {
+      return new _promise.default(function (resolve) {
+        _promise.default.all([].concat((0, _toConsumableArray2.default)(models), [component])).then(function (ret) {
           if (!models || !models.length) {
@@ -138,3 +132,9 @@ return resolve(ret[0]);
             ret.slice(0, len).forEach(function (m) {
-              registerModel(app, m);
+              if (!Array.isArray(m)) {
+                m = [m];
+              }
+
+              m.map(function (_) {
+                return registerModel(app, _);
+              });
             });
@@ -152,2 +152,3 @@ resolve(ret[len]);
 };
-module.exports = exports['default'];
+
+module.exports = exports["default"];

lib/index.js

@@ -1,23 +0,35 @@
-'use strict';
+"use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _extends3 = _interopRequireDefault(_extends2);
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _typeof2 = require('babel-runtime/helpers/typeof');
+var _react = _interopRequireDefault(require("react"));
 
-var _typeof3 = _interopRequireDefault(_typeof2);
+var _invariant = _interopRequireDefault(require("invariant"));
 
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+var _createHashHistory = _interopRequireDefault(require("history/createHashHistory"));
 
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
+var _reactRouterRedux = require("react-router-redux");
 
-exports.default = function () {
+var _document = _interopRequireDefault(require("global/document"));
+
+var _reactRedux = require("react-redux");
+
+var core = _interopRequireWildcard(require("dva-core"));
+
+var _utils = require("dva-core/lib/utils");
+
+function _default() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-  var history = opts.history || (0, _createHashHistory2.default)();
+  var history = opts.history || (0, _createHashHistory.default)();
   var createOpts = {
@@ -28,3 +40,3 @@ initialReducer: {
     setupMiddlewares: function setupMiddlewares(middlewares) {
-      return [(0, _reactRouterRedux.routerMiddleware)(history)].concat((0, _toConsumableArray3.default)(middlewares));
+      return [(0, _reactRouterRedux.routerMiddleware)(history)].concat((0, _toConsumableArray2.default)(middlewares));
     },
@@ -35,3 +47,2 @@ setupApp: function setupApp(app) {
   };
-
   var app = core.create(opts, createOpts);
@@ -44,3 +55,3 @@ var oldAppStart = app.start;
   function router(router) {
-    (0, _invariant2.default)((0, _utils.isFunction)(router), '[app.router] router should be function, but got ' + (typeof router === 'undefined' ? 'undefined' : (0, _typeof3.default)(router)));
+    (0, _invariant.default)((0, _utils.isFunction)(router), "[app.router] router should be function, but got ".concat(typeof router));
     app._router = router;
@@ -52,22 +63,19 @@ }
     if (isString(container)) {
-      container = _document2.default.querySelector(container);
-      (0, _invariant2.default)(container, '[app.start] container ' + container + ' not found');
-    }
+      container = _document.default.querySelector(container);
+      (0, _invariant.default)(container, "[app.start] container ".concat(container, " not found"));
+    } // 并且是 HTMLElement
 
-    // 并且是 HTMLElement
-    (0, _invariant2.default)(!container || isHTMLElement(container), '[app.start] container should be HTMLElement');
 
-    // 路由必须提前注册
-    (0, _invariant2.default)(app._router, '[app.start] router must be registered before app.start()');
+    (0, _invariant.default)(!container || isHTMLElement(container), "[app.start] container should be HTMLElement"); // 路由必须提前注册
 
+    (0, _invariant.default)(app._router, "[app.start] router must be registered before app.start()");
     oldAppStart.call(app);
-    var store = app._store;
-
-    // export _getProvider for HMR
+    var store = app._store; // export _getProvider for HMR
     // ref: https://github.com/dvajs/dva/issues/469
-    app._getProvider = getProvider.bind(null, store, app);
 
-    // If has container, render; else, return react component
+    app._getProvider = getProvider.bind(null, store, app); // If has container, render; else, return react component
+
     if (container) {
       render(container, store, app, app._router);
+
       app._plugin.apply('onHmr')(render.bind(null, container, store, app));
@@ -78,36 +86,6 @@ } else {
   }
-};
+}
 
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _invariant = require('invariant');
-
-var _invariant2 = _interopRequireDefault(_invariant);
-
-var _createHashHistory = require('history/createHashHistory');
-
-var _createHashHistory2 = _interopRequireDefault(_createHashHistory);
-
-var _reactRouterRedux = require('react-router-redux');
-
-var _document = require('global/document');
-
-var _document2 = _interopRequireDefault(_document);
-
-var _reactRedux = require('react-redux');
-
-var _dvaCore = require('dva-core');
-
-var core = _interopRequireWildcard(_dvaCore);
-
-var _utils = require('dva-core/lib/utils');
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function isHTMLElement(node) {
-  return (typeof node === 'undefined' ? 'undefined' : (0, _typeof3.default)(node)) === 'object' && node !== null && node.nodeType && node.nodeName;
+  return typeof node === 'object' && node !== null && node.nodeType && node.nodeName;
 }
@@ -121,7 +99,8 @@
   return function (extraProps) {
-    return _react2.default.createElement(
-      _reactRedux.Provider,
-      { store: store },
-      router((0, _extends3.default)({ app: app, history: app._history }, extraProps))
-    );
+    return _react.default.createElement(_reactRedux.Provider, {
+      store: store
+    }, router((0, _extends2.default)({
+      app: app,
+      history: app._history
+    }, extraProps)));
   };
@@ -132,3 +111,5 @@ }
   var ReactDOM = require('react-dom'); // eslint-disable-line
-  ReactDOM.render(_react2.default.createElement(getProvider(store, app, router)), container);
+
+
+  ReactDOM.render(_react.default.createElement(getProvider(store, app, router)), container);
 }
@@ -138,2 +119,3 @@
   var oldListen = history.listen;
+
   history.listen = function (callback) {
@@ -143,4 +125,6 @@ callback(history.location);
   };
+
   return history;
 }
-module.exports = exports['default'];
+
+module.exports = exports["default"];

package.json

 {
   "name": "dva",
-  "version": "2.1.0",
+  "version": "2.2.0-beta.1",
   "description": "React and redux based, lightweight and elm-style framework.",
@@ -35,2 +35,5 @@ "repository": {
   "dependencies": {
+    "@types/isomorphic-fetch": "^0.0.34",
+    "@types/react-router": "2.x",
+    "@types/react-router-redux": "^4.0.40",
     "babel-runtime": "^6.26.0",
@@ -45,3 +48,3 @@ "dva-core": "^1.1.0",
     "react-router-dom": "^4.1.2",
-    "react-router-redux": "5.0.0-alpha.6",
+    "react-router-redux": "5.0.0-alpha.8",
     "redux": "^3.7.2"
@@ -48,0 +51,0 @@ },

src/dynamic.js

@@ -32,2 +32,6 @@ import React, { Component } from 'react';
 
+    componentWillUnmount() {
+      this.mounted = false;
+    }
+
     load() {
@@ -67,3 +71,6 @@ resolve().then((m) => {
             ret.slice(0, len).forEach((m) => {
-              registerModel(app, m);
+              if (!Array.isArray(m)) {
+                m = [m];
+              }
+              m.map(_ => registerModel(app, _));
             });
@@ -70,0 +77,0 @@ resolve(ret[len]);

New alerts

Major refactor

Supply chain risk

Package 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

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

Uses eval

Supply chain risk

Package uses eval() which is a dangerous function. This prevents the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 2 instances in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 2 instances in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Improved metrics

Number of low quality alerts

1

decreased by-66.67%

Number of low supply chain risk alerts

0

decreased by-100%

Number of medium supply chain risk alerts

1

decreased by-96.15%

Worsened metrics

Total package byte prevSize

16020

decreased by-99.08%

Dependency count

16

increased by23.08%

Number of package files

11

decreased by-47.62%

Lines of code

391

decreased by-98.44%

Dependency changes

• + Added@types/isomorphic-fetch@^0.0.34

• + Added@types/react-router@2.x

• + Added@types/react-router-redux@^4.0.40

• + Added@types/history@2.0.513.2.5(transitive)

• + Added@types/isomorphic-fetch@0.0.34(transitive)

• + Added@types/prop-types@15.7.12(transitive)

• + Added@types/react@18.3.3(transitive)

• + Added@types/react-router@2.0.61(transitive)

• + Added@types/react-router-redux@4.0.58(transitive)

• + Addedcsstype@3.1.3(transitive)

• + Addedreact-router-redux@5.0.0-alpha.8(transitive)

• - Removedasap@2.0.6(transitive)

• - Removedcore-js@1.2.7(transitive)

• - Removedcreate-react-class@15.7.0(transitive)

• - Removedfbjs@0.8.18(transitive)

• - Removedpromise@7.3.1(transitive)

• - Removedreact@15.7.0(transitive)

• - Removedreact-router-redux@5.0.0-alpha.6(transitive)

• - Removedsetimmediate@1.0.5(transitive)

• - Removedua-parser-js@0.7.38(transitive)

• Updatedreact-router-redux@5.0.0-alpha.8