@modern-js/runtime 1.20.1 → 1.21.1

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @modern-js/runtime
 
+## 1.21.1
+
+### Patch Changes
+
+- @modern-js/webpack@1.21.1
+- @modern-js/plugin@1.21.1
+- @modern-js/utils@1.21.1
+
+## 1.21.0
+
+### Patch Changes
+
+- f51c59a: feat: remove node internal package like fs or path which import by ssr runtime
+  feat: 删除在 ssr runtime 中引用的 node 内部包
+- 4c1f3a4: fix: runtime export field
+
+  fix: 修复 runtime 包导出字段
+
+- 4c1f3a4: fix: state runtime plugin params
+
+  fix: state 插件参数格式
+
+- c40fc4b: fix: add missing ssr exports from runtime ssr plugin
+  fix: 补充 runtime ssr 插件中丢失的 ssr 导出
+- Updated dependencies [17d1672]
+- Updated dependencies [28f0a4f]
+- Updated dependencies [b0597e3]
+  - @modern-js/webpack@1.21.0
+  - @modern-js/plugin@1.21.0
+  - @modern-js/utils@1.21.0
+
 ## 1.20.1
 
 ### Patch Changes

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

@@ -96,7 +96,7 @@ export default (() => ({
       },
 
       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/modern/router/index.js

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

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

@@ -55,7 +55,7 @@ export default (() => ({
           packageName,
           entrypoints
         } = api.useAppContext();
-        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
 
         const ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
         const ssgConfig = userConfig.output.ssg;

package/dist/js/modern/ssr/index.js

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

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

@@ -9,8 +9,7 @@ import { render } from "./serverRender";
 import prefetch from "./prefetch";
 import { formatServer } from "./utils";
 const registeredApps = new WeakSet();
-
-const plugin = (config = {}) => ({
+export const ssr = (config = {}) => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
     return {
@@ -63,6 +62,5 @@ const plugin = (config = {}) => ({
     };
   }
 });
-
-export default plugin;
+export default ssr;
 export * from "./react";

package/dist/js/modern/ssr/prefetch.js

@@ -1,8 +1,5 @@
-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";
 
@@ -13,11 +10,13 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
   const {
     ssrContext
   } = context;
-  const loadablefile = path.resolve(ssrContext.distDir, LOADABLE_STATS_FILE);
+  const {
+    loadableStats
+  } = ssrContext;
 
-  if (fs.existsSync(loadablefile)) {
+  if (loadableStats) {
     const 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/modern/ssr/serverRender/entry.js

@@ -1,7 +1,5 @@
 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; }
 
-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';
@@ -59,12 +57,12 @@ export default class Entry {
     } = options;
     const {
       entryName,
-      template: templateHTML,
+      template,
       request: {
         host
       }
     } = ctx;
-    this.fragments = toFragments(templateHTML);
+    this.fragments = toFragments(template, entryName);
     this.entryName = entryName;
     this.host = host;
     this.App = options.App;
@@ -156,10 +154,9 @@ export default class Entry {
         context: Object.assign(context, {
           ssr: true
         })
-      }); // Todo render Hook
-
+      });
       const renderContext = {
-        loadableManifest: path.resolve(ssrContext.distDir, LOADABLE_STATS_FILE),
+        stats: ssrContext.loadableStats,
         host: this.host,
         result: this.result,
         entryName: this.entryName,

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

@@ -1,7 +1,10 @@
-import path from 'path';
 import { ChunkExtractor } from '@loadable/server';
 import { isCrossOrigin } from "../utils";
 
+const extname = uri => {
+  return uri.match(/\.[^.]+$/) || '';
+};
+
 function getLoadableScripts(extractor) {
   const check = scripts => (scripts || '').includes('__LOADABLE_REQUIRED_CHUNKS___ext');
 
@@ -17,7 +20,7 @@ function getLoadableScripts(extractor) {
 
 export const toHtml = (jsx, renderer, next) => {
   const {
-    loadableManifest,
+    stats,
     result: {
       chunksMap
     },
@@ -25,12 +28,12 @@ export const toHtml = (jsx, renderer, next) => {
     config = {}
   } = renderer;
 
-  if (!loadableManifest || chunksMap.js) {
+  if (!stats || chunksMap.js) {
     return next(jsx);
   }
 
   const extractor = new ChunkExtractor({
-    statsFile: loadableManifest,
+    stats,
     entrypoints: [renderer.entryName]
   });
   const html = next(extractor.collectChunks(jsx));
@@ -38,7 +41,7 @@ export const toHtml = (jsx, renderer, next) => {
   chunksMap.js = (chunksMap.js || '') + getLoadableScripts(extractor);
 
   for (const v of chunks) {
-    const fileType = path.extname(v.url).slice(1);
+    const fileType = extname(v.url).slice(1);
 
     if (fileType === 'js') {
       const props = [];

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

@@ -1,15 +1,5 @@
 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; }
 
-import fs from 'fs';
-
-const readFile = filepath => {
-  if (fs.existsSync(filepath)) {
-    return fs.readFileSync(filepath, 'utf-8');
-  } else {
-    return null;
-  }
-};
-
 const VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;
 const VARIABLE_SPLITTER = /(<!--<\?.*?\?>-->)/;
 const ENCODE_HTML_RULES = {
@@ -72,19 +62,12 @@ _defineProperty(Fragment, "filterMap", {
 });
 
 const fragmentListMap = {};
-export function toFragments(filename) {
-  if (fragmentListMap[filename]) {
-    return fragmentListMap[filename];
-  } // 未开启现代构建的项目无 -es6.html
-
-
-  const template = readFile(filename);
-
-  if (!template) {
-    throw new Error(`Could not find template file: ${filename}`);
+export function toFragments(template, entryName) {
+  if (fragmentListMap[entryName]) {
+    return fragmentListMap[entryName];
   }
 
   const fragmentList = template.split(VARIABLE_SPLITTER).filter(v => Boolean(v)).map(v => new Fragment(v));
-  fragmentListMap[filename] = fragmentList;
+  fragmentListMap[entryName] = fragmentList;
   return fragmentList;
 }

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

@@ -36,11 +36,6 @@ export default (() => ({
         const stateConfig = (_getEntryOptions = 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',
@@ -48,23 +43,6 @@ export 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 {
@@ -80,12 +58,9 @@ export 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))}`
           });
         }
 
@@ -100,7 +75,7 @@ export 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/modern/state/index.js

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

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

@@ -8,9 +8,25 @@ 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";
+const StatePluginHandleMap = {
+  immer,
+  effects,
+  autoActions,
+  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',
@@ -24,7 +40,7 @@ const state = config => ({
           const context = useContext(RuntimeReactContext);
           return /*#__PURE__*/_jsx(Provider, {
             store: context.store,
-            config: config,
+            config: getStoreConfig(config),
             children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
           });
         };
@@ -37,7 +53,7 @@ const state = config => ({
       init({
         context
       }, next) {
-        const storeConfig = config || {};
+        const storeConfig = getStoreConfig(config || {});
 
         if (isBrowser()) {
           var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;

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

@@ -105,7 +105,7 @@ var _default = () => ({
       },
 
       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/node/router/index.js

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

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

@@ -64,7 +64,7 @@ var _default = () => ({
           packageName,
           entrypoints
         } = api.useAppContext();
-        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
 
         const ssrConfig = (0, _utils.getEntryOptions)(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
         const ssgConfig = userConfig.output.ssg;

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

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {};
-exports.default = void 0;
+var _exportNames = {
+  ssr: true
+};
+exports.ssr = exports.default = void 0;
 
 var _component = require("@loadable/component");
 
@@ -156,5 +158,6 @@ const ssr = _ => ({
   }
 });
 
+exports.ssr = ssr;
 var _default = ssr;
 exports.default = _default;

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

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {};
-exports.default = void 0;
+var _exportNames = {
+  ssr: true
+};
+exports.ssr = exports.default = void 0;
 
 var _core = require("../core");
 
@@ -38,7 +40,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const registeredApps = new WeakSet();
 
-const plugin = (config = {}) => ({
+const ssr = (config = {}) => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
     return {
@@ -92,5 +94,6 @@ const plugin = (config = {}) => ({
   }
 });
 
-var _default = plugin;
+exports.ssr = ssr;
+var _default = ssr;
 exports.default = _default;

package/dist/js/node/ssr/prefetch.js

@@ -5,22 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
 var _server = require("react-dom/server");
 
 var _ssr = require("@modern-js/utils/ssr");
 
-var _constants = require("@modern-js/utils/constants");
-
 var _server2 = require("@loadable/server");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // todo: SSRContext
 const prefetch = async (App, context) => (0, _ssr.run)(context.ssrContext.request.headers, async () => {
   var _context$store;
@@ -28,12 +20,13 @@ const prefetch = async (App, context) => (0, _ssr.run)(context.ssrContext.reques
   const {
     ssrContext
   } = context;
+  const {
+    loadableStats
+  } = ssrContext;
 
-  const loadablefile = _path.default.resolve(ssrContext.distDir, _constants.LOADABLE_STATS_FILE);
-
-  if (_fs.default.existsSync(loadablefile)) {
+  if (loadableStats) {
     const extractor = new _server2.ChunkExtractor({
-      statsFile: _path.default.resolve(ssrContext.distDir, _constants.LOADABLE_STATS_FILE),
+      stats: loadableStats,
       entrypoints: [ssrContext.entryName].filter(Boolean)
     });
     (0, _server.renderToStaticMarkup)(extractor.collectChunks( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {

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

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
-var _constants = require("@modern-js/utils/constants");
-
 var _react = _interopRequireDefault(require("react"));
 
 var _server = _interopRequireDefault(require("react-dom/server"));
@@ -84,12 +80,12 @@ class Entry {
     } = options;
     const {
       entryName,
-      template: templateHTML,
+      template,
       request: {
         host
       }
     } = ctx;
-    this.fragments = (0, _template.toFragments)(templateHTML);
+    this.fragments = (0, _template.toFragments)(template, entryName);
     this.entryName = entryName;
     this.host = host;
     this.App = options.App;
@@ -182,11 +178,10 @@ class Entry {
         context: Object.assign(context, {
           ssr: true
         })
-      }); // Todo render Hook
-
+      });
 
       const renderContext = {
-        loadableManifest: _path.default.resolve(ssrContext.distDir, _constants.LOADABLE_STATS_FILE),
+        stats: ssrContext.loadableStats,
         host: this.host,
         result: this.result,
         entryName: this.entryName,

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

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toHtml = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _server = require("@loadable/server");
 
 var _utils = require("../utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const extname = uri => {
+  return uri.match(/\.[^.]+$/) || '';
+};
 
 function getLoadableScripts(extractor) {
   const check = scripts => (scripts || '').includes('__LOADABLE_REQUIRED_CHUNKS___ext');
@@ -28,7 +28,7 @@ function getLoadableScripts(extractor) {
 
 const toHtml = (jsx, renderer, next) => {
   const {
-    loadableManifest,
+    stats,
     result: {
       chunksMap
     },
@@ -36,12 +36,12 @@ const toHtml = (jsx, renderer, next) => {
     config = {}
   } = renderer;
 
-  if (!loadableManifest || chunksMap.js) {
+  if (!stats || chunksMap.js) {
     return next(jsx);
   }
 
   const extractor = new _server.ChunkExtractor({
-    statsFile: loadableManifest,
+    stats,
     entrypoints: [renderer.entryName]
   });
   const html = next(extractor.collectChunks(jsx));
@@ -49,7 +49,7 @@ const toHtml = (jsx, renderer, next) => {
   chunksMap.js = (chunksMap.js || '') + getLoadableScripts(extractor);
 
   for (const v of chunks) {
-    const fileType = _path.default.extname(v.url).slice(1);
+    const fileType = extname(v.url).slice(1);
 
     if (fileType === 'js') {
       const props = [];

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

@@ -6,20 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.Fragment = void 0;
 exports.toFragments = toFragments;
 
-var _fs = _interopRequireDefault(require("fs"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 readFile = filepath => {
-  if (_fs.default.existsSync(filepath)) {
-    return _fs.default.readFileSync(filepath, 'utf-8');
-  } else {
-    return null;
-  }
-};
-
 const VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;
 const VARIABLE_SPLITTER = /(<!--<\?.*?\?>-->)/;
 const ENCODE_HTML_RULES = {
@@ -85,19 +73,12 @@ _defineProperty(Fragment, "filterMap", {
 
 const fragmentListMap = {};
 
-function toFragments(filename) {
-  if (fragmentListMap[filename]) {
-    return fragmentListMap[filename];
-  } // 未开启现代构建的项目无 -es6.html
-
-
-  const template = readFile(filename);
-
-  if (!template) {
-    throw new Error(`Could not find template file: ${filename}`);
+function toFragments(template, entryName) {
+  if (fragmentListMap[entryName]) {
+    return fragmentListMap[entryName];
   }
 
   const fragmentList = template.split(VARIABLE_SPLITTER).filter(v => Boolean(v)).map(v => new Fragment(v));
-  fragmentListMap[filename] = fragmentList;
+  fragmentListMap[entryName] = fragmentList;
   return fragmentList;
 }