@modern-js/runtime 1.20.1 → 1.21.1

package/dist/js/node/state/cli/index.js

@@ -46,11 +46,6 @@ var _default = () => ({
         const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
         stateConfigMap.set(entryName, stateConfig);
 
-        const getEnabledPlugins = () => {
-          const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
-          return internalPlugins.filter(name => stateConfig[name] !== false);
-        };
-
         if (stateConfig) {
           imports.push({
             value: '@modern-js/runtime/plugins',
@@ -58,23 +53,6 @@ var _default = () => ({
               imported: PLUGIN_IDENTIFIER
             }]
           });
-          imports.push({
-            value: '@modern-js/runtime/model',
-            specifiers: getEnabledPlugins().map(imported => ({
-              imported
-            })),
-            initialize: `
-                const createStatePlugins = (config) => {
-                  const plugins = [];
-
-                  ${getEnabledPlugins().map(name => `
-                      plugins.push(${name}(config['${name}']));
-                      `).join('\n')}
-
-                  return plugins;
-                }
-              `
-          });
         }
 
         return {
@@ -90,12 +68,9 @@ var _default = () => ({
         const stateOptions = stateConfigMap.get(entrypoint.entryName);
 
         if (stateOptions) {
-          const isBoolean = typeof stateOptions === 'boolean';
-          let options = isBoolean ? '{}' : JSON.stringify(stateOptions);
-          options = `${options.substr(0, options.length - 1)}${isBoolean ? '' : ','}plugins: createStatePlugins(${JSON.stringify(stateConfigMap.get(entrypoint.entryName))})}`;
           plugins.push({
             name: PLUGIN_IDENTIFIER,
-            options
+            options: `${JSON.stringify(stateConfigMap.get(entrypoint.entryName))}`
           });
         }
 
@@ -110,7 +85,7 @@ var _default = () => ({
       },
 
       addRuntimeExports() {
-        pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/runtime-state'`);
+        pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
       }
 
     };

package/dist/js/node/state/index.js

@@ -3,13 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {};
+var _exportNames = {
+  state: true
+};
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
     return _runtime.default;
   }
 });
+Object.defineProperty(exports, "state", {
+  enumerable: true,
+  get: function () {
+    return _runtime.default;
+  }
+});
 
 var _runtime = _interopRequireWildcard(require("./runtime"));
 

package/dist/js/node/state/runtime/plugin.js

@@ -14,12 +14,6 @@ var _react2 = require("@modern-js-reduck/react");
 
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
 
-var _core = require("../../core");
-
-var _common = require("../../common");
-
-var _jsxRuntime = require("react/jsx-runtime");
-
 var _plugins = require("../plugins");
 
 Object.keys(_plugins).forEach(function (key) {
@@ -34,6 +28,12 @@ Object.keys(_plugins).forEach(function (key) {
   });
 });
 
+var _core = require("../../core");
+
+var _common = require("../../common");
+
+var _jsxRuntime = require("react/jsx-runtime");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -42,6 +42,22 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+const StatePluginHandleMap = {
+  immer: _plugins.immer,
+  effects: _plugins.effects,
+  autoActions: _plugins.autoActions,
+  devtools: _plugins.devtools
+};
+
+const getStoreConfig = config => {
+  const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
+  const plugins = [];
+  internalPlugins.filter(plugin => config[plugin] !== false).forEach(plugin => plugins.push(StatePluginHandleMap[plugin](config[plugin])));
+  return {
+    plugins
+  };
+};
+
 const state = config => ({
   name: '@modern-js/plugin-state',
   setup: () => {
@@ -54,7 +70,7 @@ const state = config => ({
           const context = (0, _react.useContext)(_core.RuntimeReactContext);
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Provider, {
             store: context.store,
-            config: config,
+            config: getStoreConfig(config),
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread({}, props))
           });
         };
@@ -67,7 +83,7 @@ const state = config => ({
       init({
         context
       }, next) {
-        const storeConfig = config || {};
+        const storeConfig = getStoreConfig(config || {});
 
         if ((0, _common.isBrowser)()) {
           var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;

package/dist/js/treeshaking/router/cli/index.js

@@ -90,7 +90,7 @@ export default (function () {
           };
         },
         addRuntimeExports: function addRuntimeExports() {
-          pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/runtime-router'");
+          pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/router'");
         }
       };
     }

package/dist/js/treeshaking/router/index.js

@@ -1,2 +1,3 @@
+export { default as router } from "./runtime";
 export { default } from "./runtime";
 export * from "./runtime";

package/dist/js/treeshaking/ssr/cli/index.js

@@ -52,7 +52,7 @@ export default (function () {
               packageName = _api$useAppContext.packageName,
               entrypoints = _api$useAppContext.entrypoints;
 
-          pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/runtime-ssr'"); // if use ssg then set ssr config to true
+          pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'"); // if use ssg then set ssr config to true
 
           var ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
           var ssgConfig = userConfig.output.ssg;

package/dist/js/treeshaking/ssr/index.js

@@ -8,8 +8,7 @@ import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 var IS_REACT18 = process.env.IS_REACT18 === 'true';
-
-var ssr = function ssr(_) {
+export var ssr = function ssr(_) {
   return {
     name: '@modern-js/plugin-ssr',
     setup: function setup() {
@@ -136,6 +135,5 @@ var ssr = function ssr(_) {
     }
   };
 };
-
 export default ssr;
 export * from "./react";

package/dist/js/treeshaking/ssr/index.node.js

@@ -6,8 +6,7 @@ import { render } from "./serverRender";
 import prefetch from "./prefetch";
 import { formatServer } from "./utils";
 var registeredApps = new WeakSet();
-
-var plugin = function plugin() {
+export var ssr = function ssr() {
   var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
     name: '@modern-js/plugin-ssr',
@@ -82,6 +81,5 @@ var plugin = function plugin() {
     }
   };
 };
-
-export default plugin;
+export default ssr;
 export * from "./react";

package/dist/js/treeshaking/ssr/prefetch.js

@@ -1,10 +1,7 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import path from 'path';
-import fs from 'fs';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { run } from '@modern-js/utils/ssr';
-import { LOADABLE_STATS_FILE } from '@modern-js/utils/constants';
 import { ChunkExtractor } from '@loadable/server';
 import { jsx as _jsx } from "react/jsx-runtime";
 
@@ -18,17 +15,18 @@ var prefetch = /*#__PURE__*/function () {
             return _context2.abrupt("return", run(context.ssrContext.request.headers, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               var _context$store;
 
-              var ssrContext, loadablefile, extractor, loadersData;
+              var ssrContext, _ref3, loadableStats, extractor, loadersData;
+
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) {
                   switch (_context.prev = _context.next) {
                     case 0:
                       ssrContext = context.ssrContext;
-                      loadablefile = path.resolve(ssrContext.distDir, LOADABLE_STATS_FILE);
+                      _ref3 = ssrContext, loadableStats = _ref3.loadableStats;
 
-                      if (fs.existsSync(loadablefile)) {
+                      if (loadableStats) {
                         extractor = new ChunkExtractor({
-                          statsFile: path.resolve(ssrContext.distDir, LOADABLE_STATS_FILE),
+                          stats: loadableStats,
                           entrypoints: [ssrContext.entryName].filter(Boolean)
                         });
                         renderToStaticMarkup(extractor.collectChunks( /*#__PURE__*/_jsx(App, {

package/dist/js/treeshaking/ssr/serverRender/entry.js

@@ -4,8 +4,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import path from 'path';
-import { LOADABLE_STATS_FILE } from '@modern-js/utils/constants';
 import React from 'react';
 import ReactDomServer from 'react-dom/server';
 import serialize from 'serialize-javascript';
@@ -60,9 +58,9 @@ var Entry = /*#__PURE__*/function () {
     var ctx = options.ctx,
         config = options.config;
     var entryName = ctx.entryName,
-        templateHTML = ctx.template,
+        template = ctx.template,
         host = ctx.request.host;
-    this.fragments = toFragments(templateHTML);
+    this.fragments = toFragments(template, entryName);
     this.entryName = entryName;
     this.host = host;
     this.App = options.App;
@@ -237,10 +235,9 @@ var Entry = /*#__PURE__*/function () {
           context: Object.assign(context, {
             ssr: true
           })
-        }); // Todo render Hook
-
+        });
         var renderContext = {
-          loadableManifest: path.resolve(ssrContext.distDir, LOADABLE_STATS_FILE),
+          stats: ssrContext.loadableStats,
           host: this.host,
           result: this.result,
           entryName: this.entryName,

package/dist/js/treeshaking/ssr/serverRender/loadable.js

@@ -1,8 +1,11 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import path from 'path';
 import { ChunkExtractor } from '@loadable/server';
 import { isCrossOrigin } from "../utils";
 
+var extname = function extname(uri) {
+  return uri.match(/\.[^.]+$/) || '';
+};
+
 function getLoadableScripts(extractor) {
   var check = function check(scripts) {
     return (scripts || '').includes('__LOADABLE_REQUIRED_CHUNKS___ext');
@@ -21,18 +24,18 @@ function getLoadableScripts(extractor) {
 }
 
 export var toHtml = function toHtml(jsx, renderer, next) {
-  var loadableManifest = renderer.loadableManifest,
+  var stats = renderer.stats,
       chunksMap = renderer.result.chunksMap,
       host = renderer.host,
       _renderer$config = renderer.config,
       config = _renderer$config === void 0 ? {} : _renderer$config;
 
-  if (!loadableManifest || chunksMap.js) {
+  if (!stats || chunksMap.js) {
     return next(jsx);
   }
 
   var extractor = new ChunkExtractor({
-    statsFile: loadableManifest,
+    stats: stats,
     entrypoints: [renderer.entryName]
   });
   var html = next(extractor.collectChunks(jsx));
@@ -45,7 +48,7 @@ export var toHtml = function toHtml(jsx, renderer, next) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var v = _step.value;
-      var fileType = path.extname(v.url).slice(1);
+      var fileType = extname(v.url).slice(1);
 
       if (fileType === 'js') {
         var props = [];

package/dist/js/treeshaking/ssr/serverRender/template.js

@@ -2,16 +2,6 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import fs from 'fs';
-
-var readFile = function readFile(filepath) {
-  if (fs.existsSync(filepath)) {
-    return fs.readFileSync(filepath, 'utf-8');
-  } else {
-    return null;
-  }
-};
-
 var VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;
 var VARIABLE_SPLITTER = /(<!--<\?.*?\?>-->)/;
 var ENCODE_HTML_RULES = {
@@ -89,16 +79,9 @@ _defineProperty(Fragment, "filterMap", {
 });
 
 var fragmentListMap = {};
-export function toFragments(filename) {
-  if (fragmentListMap[filename]) {
-    return fragmentListMap[filename];
-  } // 未开启现代构建的项目无 -es6.html
-
-
-  var template = readFile(filename);
-
-  if (!template) {
-    throw new Error("Could not find template file: ".concat(filename));
+export function toFragments(template, entryName) {
+  if (fragmentListMap[entryName]) {
+    return fragmentListMap[entryName];
   }
 
   var fragmentList = template.split(VARIABLE_SPLITTER).filter(function (v) {
@@ -106,6 +89,6 @@ export function toFragments(filename) {
   }).map(function (v) {
     return new Fragment(v);
   });
-  fragmentListMap[filename] = fragmentList;
+  fragmentListMap[entryName] = fragmentList;
   return fragmentList;
 }

package/dist/js/treeshaking/state/cli/index.js

@@ -34,13 +34,6 @@ export default (function () {
           var stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
           stateConfigMap.set(entryName, stateConfig);
 
-          var getEnabledPlugins = function getEnabledPlugins() {
-            var internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
-            return internalPlugins.filter(function (name) {
-              return stateConfig[name] !== false;
-            });
-          };
-
           if (stateConfig) {
             imports.push({
               value: '@modern-js/runtime/plugins',
@@ -48,17 +41,6 @@ export default (function () {
                 imported: PLUGIN_IDENTIFIER
               }]
             });
-            imports.push({
-              value: '@modern-js/runtime/model',
-              specifiers: getEnabledPlugins().map(function (imported) {
-                return {
-                  imported: imported
-                };
-              }),
-              initialize: "\n                const createStatePlugins = (config) => {\n                  const plugins = [];\n\n                  ".concat(getEnabledPlugins().map(function (name) {
-                return "\n                      plugins.push(".concat(name, "(config['").concat(name, "']));\n                      ");
-              }).join('\n'), "\n\n                  return plugins;\n                }\n              ")
-            });
           }
 
           return {
@@ -72,12 +54,9 @@ export default (function () {
           var stateOptions = stateConfigMap.get(entrypoint.entryName);
 
           if (stateOptions) {
-            var isBoolean = typeof stateOptions === 'boolean';
-            var options = isBoolean ? '{}' : JSON.stringify(stateOptions);
-            options = "".concat(options.substr(0, options.length - 1)).concat(isBoolean ? '' : ',', "plugins: createStatePlugins(").concat(JSON.stringify(stateConfigMap.get(entrypoint.entryName)), ")}");
             plugins.push({
               name: PLUGIN_IDENTIFIER,
-              options: options
+              options: "".concat(JSON.stringify(stateConfigMap.get(entrypoint.entryName)))
             });
           }
 
@@ -90,7 +69,7 @@ export default (function () {
           return PLUGIN_SCHEMAS['@modern-js/plugin-state'];
         },
         addRuntimeExports: function addRuntimeExports() {
-          pluginsExportsUtils.addExport("export { default as state } from '@modern-js/runtime/runtime-state'");
+          pluginsExportsUtils.addExport("export { default as state } from '@modern-js/runtime/model'");
         }
       };
     }

package/dist/js/treeshaking/state/index.js

@@ -1,2 +1,3 @@
+export { default as state } from "./runtime";
 export { default } from "./runtime";
 export * from "./runtime";

package/dist/js/treeshaking/state/runtime/plugin.js

@@ -3,9 +3,29 @@ import { useContext } from 'react';
 import { createStore } from '@modern-js-reduck/store';
 import { Provider } from '@modern-js-reduck/react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
+import { immer, effects, autoActions, devtools } from "../plugins";
 import { RuntimeReactContext } from "../../core";
 import { isBrowser } from "../../common";
 import { jsx as _jsx } from "react/jsx-runtime";
+var StatePluginHandleMap = {
+  immer: immer,
+  effects: effects,
+  autoActions: autoActions,
+  devtools: devtools
+};
+
+var getStoreConfig = function getStoreConfig(config) {
+  var internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
+  var plugins = [];
+  internalPlugins.filter(function (plugin) {
+    return config[plugin] !== false;
+  }).forEach(function (plugin) {
+    return plugins.push(StatePluginHandleMap[plugin](config[plugin]));
+  });
+  return {
+    plugins: plugins
+  };
+};
 
 var state = function state(config) {
   return {
@@ -20,7 +40,7 @@ var state = function state(config) {
             var context = useContext(RuntimeReactContext);
             return /*#__PURE__*/_jsx(Provider, {
               store: context.store,
-              config: config,
+              config: getStoreConfig(config),
               children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
             });
           };
@@ -31,7 +51,7 @@ var state = function state(config) {
         },
         init: function init(_ref2, next) {
           var context = _ref2.context;
-          var storeConfig = config || {};
+          var storeConfig = getStoreConfig(config || {});
 
           if (isBrowser()) {
             var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;

package/dist/types/router/index.d.ts

@@ -1,2 +1,3 @@
+export { default as router } from './runtime';
 export { default } from './runtime';
 export * from './runtime';

package/dist/types/ssr/index.d.ts

@@ -6,6 +6,6 @@ declare module '../core' {
     context?: SSRServerContext;
   }
 }
-declare const ssr: (_: SSRPluginConfig) => Plugin;
+export declare const ssr: (_: SSRPluginConfig) => Plugin;
 export default ssr;
 export * from './react';

package/dist/types/ssr/index.node.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from '../core';
 import type { SSRPluginConfig } from './serverRender/type';
-declare const plugin: (config?: SSRPluginConfig) => Plugin;
-export default plugin;
+export declare const ssr: (config?: SSRPluginConfig) => Plugin;
+export default ssr;
 export * from './react';

package/dist/types/ssr/serverRender/template.d.ts

@@ -10,5 +10,5 @@ export declare class Fragment {
   constructor(template: string);
   getValue(data: any): any;
 }
-export declare function toFragments(filename: string): Fragment[];
+export declare function toFragments(template: string, entryName: string): Fragment[];
 export {};

package/dist/types/ssr/serverRender/type.d.ts

@@ -20,7 +20,7 @@ export interface RenderEntry {
   entryName: string;
   host: string;
   result: RenderResult;
-  loadableManifest: string | undefined;
+  stats: Record<string, any>;
   config: SSRPluginConfig;
 }
 export declare type RenderHandler = (jsx: React.ReactElement, renderer: RenderEntry, next: (jsx: React.ReactElement) => string) => string;

package/dist/types/state/index.d.ts

@@ -1,2 +1,3 @@
+export { default as state } from './runtime';
 export { default } from './runtime';
 export * from './runtime';

package/dist/types/state/runtime/plugin.d.ts

@@ -1,6 +1,6 @@
-import { createStore } from '@modern-js-reduck/store';
 import type { Plugin } from '../../core';
-export declare type StateConfig = Parameters<typeof createStore>[0];
+export declare type StatePluginType = 'immer' | 'effects' | 'autoActions' | 'devtools';
+export declare type StateConfig = Record<Partial<StatePluginType>, boolean>;
 declare const state: (config: StateConfig) => Plugin;
 export default state;
 export * from '../plugins';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.20.1",
+  "version": "1.21.1",
   "jsnext:source": "./src/index.ts",
   "types": "./type.d.ts",
   "main": "./dist/js/node/index.js",
@@ -50,38 +50,23 @@
       "default": "./dist/js/treeshaking/exports/server.js"
     },
     "./router": {
-      "jsnext:source": "./src/exports/router.ts",
-      "node": "./dist/js/node/exports/router.js",
-      "default": "./dist/js/treeshaking/exports/router.js"
-    },
-    "./ssr": {
-      "jsnext:source": "./src/exports/ssr.ts",
-      "node": "./dist/js/node/exports/ssr.js",
-      "default": "./dist/js/treeshaking/exports/ssr.js"
-    },
-    "./model": {
-      "jsnext:source": "./src/exports/model.ts",
-      "node": "./dist/js/node/exports/model.js",
-      "default": "./dist/js/treeshaking/exports/model.js"
-    },
-    "./cli": {
-      "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
-    },
-    "./runtime-router": {
       "jsnext:source": "./src/router/index.ts",
       "node": "./dist/js/node/router/index",
       "default": "./dist/js/treeshaking/router/index.js"
     },
-    "./runtime-state": {
+    "./ssr": {
+      "jsnext:source": "./src/ssr/index.ts",
+      "node": "./dist/js/node/ssr/index",
+      "default": "./dist/js/treeshaking/ssr/index.js"
+    },
+    "./model": {
       "jsnext:source": "./src/state/index.ts",
       "node": "./dist/js/node/state/index",
       "default": "./dist/js/treeshaking/state/index.js"
     },
-    "./runtime-ssr": {
-      "jsnext:source": "./src/ssr/index.ts",
-      "node": "./dist/js/node/ssr/index",
-      "default": "./dist/js/treeshaking/ssr/index.js"
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
     }
   },
   "typesVersions": {
@@ -105,22 +90,13 @@
         "./dist/types/exports/server.d.ts"
       ],
       "ssr": [
-        "./dist/types/exports/ssr.d.ts"
+        "./dist/types/ssr/index.d.ts"
       ],
       "router": [
-        "./dist/types/exports/router.d.ts"
+        "./dist/types/router/index.d.ts"
       ],
       "model": [
         "./types/model.d.ts"
-      ],
-      "runtime-router": [
-        "./dist/types/router/index.d.ts"
-      ],
-      "runtime-state": [
-        "./dist/types/state/index.d.ts"
-      ],
-      "runtime-ssr": [
-        "./dist/types/ssr/index.d.ts"
       ]
     }
   },
@@ -140,9 +116,9 @@
     "@loadable/babel-plugin": "^5.13.2",
     "@loadable/server": "^5.15.1",
     "@loadable/component": "^5.15.0",
-    "@modern-js/plugin": "1.20.1",
-    "@modern-js/webpack": "1.20.1",
-    "@modern-js/utils": "1.20.1",
+    "@modern-js/plugin": "1.21.1",
+    "@modern-js/webpack": "1.21.1",
+    "@modern-js/utils": "1.21.1",
     "@modern-js-reduck/plugin-auto-actions": "^1.0.2",
     "@modern-js-reduck/plugin-devtools": "^1.0.3",
     "@modern-js-reduck/plugin-effects": "^1.0.2",
@@ -166,16 +142,16 @@
     "ts-jest": "^27.0.4",
     "typescript": "^4",
     "jest": "^27",
-    "@modern-js/core": "1.20.1",
-    "@modern-js/types": "1.20.1",
-    "@modern-js/utils": "1.20.1",
+    "@modern-js/core": "1.21.1",
+    "@modern-js/types": "1.21.1",
+    "@modern-js/utils": "1.21.1",
     "@types/jest": "^27",
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
     "@types/loadable__webpack-plugin": "^5.7.3",
     "@types/serialize-javascript": "^5.0.1",
-    "@scripts/build": "1.20.1",
-    "@scripts/jest-config": "1.20.1",
+    "@scripts/build": "1.21.1",
+    "@scripts/jest-config": "1.21.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",
     "@types/hoist-non-react-statics": "^3.3.1",

package/types/model.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="@modern-js-reduck/plugin-effects" />
 /// <reference types="@modern-js-reduck/plugin-immutable" />
 
-export * from '../dist/types/exports/model';
+export * from '../dist/types/state';

package/dist/js/modern/exports/model.js

@@ -1,2 +0,0 @@
-export { default as state } from "../state";
-export * from "../state";