@modern-js/runtime 2.4.1-beta.0 → 2.5.0

package/CHANGELOG.md

@@ -1,11 +1,27 @@
 # @modern-js/runtime
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 7cb8bb4: fix: use a more correctly params to cal document file
+
+  fix: 使用更准确的参数去获取 docuemnt 文件
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
 - 7a25271: feat: support NoSSR component fallback UI
   feat: 支持 NoSSR 组件 fallback UI
+- 8871bb8: fix: add types field for @modern-js/runtime
+  fix: 为 @modern0js/runtime 添加 types 字段
+- 0d75c27: chore: serialize react-router-dom ssr data, avoid the syntax conflict with HTML. Such as when json data contains `</script>` will be stringify to `\u003c/script\u003e`
+
+  chore: 序列化 react-router-dom ssr 的数据，避免 html 标签语义冲突。例如当 json 数据中包含`</script>`的时候会被转换成`\u003c/script\u003e`
+
 - 11c053b: feat: ssr support deploy worker
 
   feat: ssr 支持边缘部署
@@ -14,8 +30,14 @@
 
   fix: 修复 ssg 渲染是 new Headers() 报错问题
 
+- Updated dependencies [89ca6cc]
+- Updated dependencies [7cb8bb4]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/plugin@2.5.0
+  - @modern-js/types@2.5.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/cli/index.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default
@@ -83,14 +63,12 @@ var cli_default = () => ({
       validateSchema() {
         return import_utils.PLUGIN_SCHEMAS["@modern-js/runtime"];
       },
-      beforeRestart() {
-        return __async(this, null, function* () {
-          (0, import_utils.cleanRequireCache)([
-            require.resolve("../state/cli"),
-            require.resolve("../router/cli"),
-            require.resolve("../ssr/cli")
-          ]);
-        });
+      async beforeRestart() {
+        (0, import_utils.cleanRequireCache)([
+          require.resolve("../state/cli"),
+          require.resolve("../router/cli"),
+          require.resolve("../ssr/cli")
+        ]);
       }
     };
   }

package/dist/{js/node → cjs}/core/compatible.js

@@ -2,34 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -47,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var compatible_exports = {};
 __export(compatible_exports, {
   bootstrap: () => bootstrap,
@@ -100,12 +54,12 @@ const createApp = ({ plugins }) => {
     const WrapperComponent = (props) => {
       const element = import_react.default.createElement(
         App || import_react.default.Fragment,
-        __spreadValues({}, props),
+        { ...props },
         props.children
       );
       const context = (0, import_react.useContext)(import_runtime_context.RuntimeReactContext);
       return runner.provide(
-        { element, props: __spreadValues({}, props), context },
+        { element, props: { ...props }, context },
         {
           onLast: ({ element: element2 }) => element2
         }
@@ -118,8 +72,7 @@ const createApp = ({ plugins }) => {
       { App: WrapperComponent },
       {
         onLast: ({ App: App2 }) => {
-          const WrapComponent = (_a) => {
-            var _b = _a, { context } = _b, props = __objRest(_b, ["context"]);
+          const WrapComponent = ({ context, ...props }) => {
             let contextValue = context;
             if (!(contextValue == null ? void 0 : contextValue.runner)) {
               contextValue = getInitialContext(runner);
@@ -127,15 +80,17 @@ const createApp = ({ plugins }) => {
                 { context: contextValue },
                 {
                   onLast: ({ context: context1 }) => {
-                    var _a2;
-                    return (_a2 = App2 == null ? void 0 : App2.init) == null ? void 0 : _a2.call(App2, context1);
+                    var _a;
+                    return (_a = App2 == null ? void 0 : App2.init) == null ? void 0 : _a.call(App2, context1);
                   }
                 }
               );
             }
             return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtime_context.RuntimeReactContext.Provider, {
               value: contextValue,
-              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, __spreadValues({}, props))
+              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {
+                ...props
+              })
             });
           };
           return (0, import_hoist_non_react_statics.default)(WrapComponent, App2);
@@ -146,7 +101,7 @@ const createApp = ({ plugins }) => {
     return HOCApp;
   };
 };
-const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, function* () {
+const bootstrap = async (BootApp, id, root, ReactDOM) => {
   var _a, _b;
   let App = BootApp;
   let runner = runnerMap.get(App);
@@ -185,13 +140,14 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
         },
         {}
       );
-      Object.assign(context, __spreadValues({
+      Object.assign(context, {
         loaderManager: (0, import_loaderManager.createLoaderManager)(initialLoadersState, {
           skipStatic: true
-        })
-      }, ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}));
+        }),
+        ...ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}
+      });
       context.initialData = (_b = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _b.initialData;
-      const initialData = yield runInit(context);
+      const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;
       }
@@ -282,7 +238,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
       }
       return false;
     };
-    const initialData = yield runInit(context);
+    const initialData = await runInit(context);
     if (!isRedirectResponse(initialData)) {
       context.initialData = initialData;
       return runner.server({
@@ -291,7 +247,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
       });
     }
   }
-});
+};
 const useRuntimeContext = () => {
   const context = (0, import_react.useContext)(import_runtime_context.RuntimeReactContext);
   const memoizedContext = (0, import_react.useMemo)(

package/dist/{js/node → cjs}/core/loader/loaderManager.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var loaderManager_exports = {};
 __export(loaderManager_exports, {
   LoaderStatus: () => LoaderStatus,
@@ -79,7 +59,7 @@ const createLoader = (id, initialData = {
   let { data, error } = initialData;
   let hasLoaded = false;
   const handlers = /* @__PURE__ */ new Set();
-  const load = () => __async(void 0, null, function* () {
+  const load = async () => {
     if (skip) {
       return promise;
     }
@@ -102,7 +82,7 @@ const createLoader = (id, initialData = {
       notify();
     });
     return promise;
-  });
+  };
   const getResult = () => ({
     loading: !hasLoaded && status === 1 /* loading */,
     reloading: hasLoaded && status === 1 /* loading */,
@@ -164,7 +144,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
     }
     return false;
   };
-  const awaitPendingLoaders = () => __async(void 0, null, function* () {
+  const awaitPendingLoaders = async () => {
     const pendingLoaders = [];
     for (const [id, loader] of loadersMap) {
       const { promise } = loader;
@@ -172,7 +152,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
         pendingLoaders.push([id, loader]);
       }
     }
-    yield Promise.all(pendingLoaders.map((item) => item[1].promise));
+    await Promise.all(pendingLoaders.map((item) => item[1].promise));
     return pendingLoaders.reduce(
       (res, [id, loader]) => {
         res[id] = loader.result;
@@ -180,7 +160,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
       },
       {}
     );
-  });
+  };
   return {
     hasPendingLoaders,
     awaitPendingLoaders,

package/dist/{js/node → cjs}/core/loader/useLoader.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -74,9 +57,10 @@ const useLoader = (loaderFn, options = { params: void 0 }) => {
             return Promise.reject(e);
           }
         },
-        __spreadProps(__spreadValues({}, options), {
+        {
+          ...options,
           params
-        })
+        }
       );
       loaderRef.current = loaderManager.get(id);
       (_b = unlistenLoaderChangeRef.current) == null ? void 0 : _b.call(unlistenLoaderChangeRef);
@@ -123,9 +107,10 @@ const useLoader = (loaderFn, options = { params: void 0 }) => {
     load(p);
   }, [options.params]);
   const [result, setResult] = (0, import_react.useState)(loaderRef.current.result);
-  return __spreadProps(__spreadValues({}, result), {
+  return {
+    ...result,
     reload: load
-  });
+  };
 };
 var useLoader_default = useLoader;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/core/plugin.js

@@ -15,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var plugin_exports = {};
 __export(plugin_exports, {
   createPlugin: () => createPlugin,
@@ -62,12 +42,12 @@ const runtimeHooks = {
 const createRuntime = () => (0, import_plugin.createManager)(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
-  App.init = (context) => __async(void 0, null, function* () {
+  App.init = async (context) => {
     if (!context.loaderManager) {
       context.loaderManager = (0, import_loaderManager.createLoaderManager)({});
     }
-    yield Promise.all([originalInit == null ? void 0 : originalInit(context), _init == null ? void 0 : _init(context)]);
-  });
+    await Promise.all([originalInit == null ? void 0 : originalInit(context), _init == null ? void 0 : _init(context)]);
+  };
 };
 const runtime = createRuntime();
 const { createPlugin } = runtime;

package/dist/{js/node → cjs}/document/cli/index.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -35,29 +21,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
-  default: () => cli_default
+  default: () => cli_default,
+  getDocumenByEntryName: () => getDocumenByEntryName
 });
 module.exports = __toCommonJS(cli_exports);
 var import_path = __toESM(require("path"));
@@ -85,7 +52,7 @@ const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
 var cli_default = () => ({
   name: "@modern-js/plugin-document",
   pre: ["@modern-js/plugin-analyze"],
-  setup: (api) => __async(void 0, null, function* () {
+  setup: async (api) => {
     function getDocParams(params) {
       const { config, templateParameters, entryName } = params;
       return {
@@ -107,7 +74,7 @@ var cli_default = () => ({
       if (!documentFilePath) {
         return null;
       }
-      return (_0) => __async(void 0, [_0], function* ({ htmlWebpackPlugin }) {
+      return async ({ htmlWebpackPlugin }) => {
         const documentParams = getDocParams({
           config: api.useConfigContext(),
           entryName,
@@ -120,7 +87,7 @@ var cli_default = () => ({
         const userTsConfigFilePath = import_path.default.join(appDirectory, "tsconfig.json");
         let tsConfig;
         try {
-          tsConfig = yield require(userTsConfigFilePath);
+          tsConfig = await require(userTsConfigFilePath);
         } catch (err) {
           tsConfig = {};
         }
@@ -136,7 +103,7 @@ var cli_default = () => ({
           internalDirectory,
           `./document/_${entryName}.html.js`
         );
-        yield (0, import_esbuild.build)({
+        await (0, import_esbuild.build)({
           entryPoints: [documentFilePath],
           outfile: htmlOutputFile,
           platform: "node",
@@ -169,7 +136,7 @@ var cli_default = () => ({
           ]
         });
         delete require.cache[require.resolve(htmlOutputFile)];
-        const Document = (yield require(htmlOutputFile)).default;
+        const Document = (await require(htmlOutputFile)).default;
         const HTMLElement = import_react.default.createElement(
           import_DocumentContext.DocumentContext.Provider,
           { value: documentParams },
@@ -207,7 +174,7 @@ var cli_default = () => ({
           import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]
         );
         return finalHtml;
-      });
+      };
     };
     return {
       config: () => {
@@ -219,7 +186,7 @@ var cli_default = () => ({
                 {},
                 {},
                 {}
-              ) : __spreadValues({}, options == null ? void 0 : options.templateParameters);
+              ) : { ...options == null ? void 0 : options.templateParameters };
               const templateContent = documentEntry(
                 entry.entryName,
                 hackParameters
@@ -228,13 +195,18 @@ var cli_default = () => ({
                 templateContent,
                 inject: false
               } : {};
-              return __spreadValues(__spreadValues({}, options), documentHtmlOptions);
+              return {
+                ...options,
+                ...documentHtmlOptions
+              };
             }
           }
         };
       }
     };
-  })
+  }
 });
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  getDocumenByEntryName
+});

package/dist/{js/node → cjs}/router/cli/index.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -105,11 +88,11 @@ var cli_default = () => ({
           const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
           plugins.push({
             name: PLUGIN_IDENTIFIER,
-            options: JSON.stringify(__spreadProps(__spreadValues({
-              serverBase
-            }, runtimeConfig.router), {
+            options: JSON.stringify({
+              serverBase,
+              ...runtimeConfig.router,
               routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
-            })).replace(
+            }).replace(
               /"routesConfig"\s*:\s*"((\S|\s)+)"/g,
               '"routesConfig": $1,'
             )