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

package/dist/{js/node → cjs}/ssr/prefetch.worker.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 prefetch_worker_exports = {};
 __export(prefetch_worker_exports, {
   default: () => prefetch_worker_default
@@ -43,7 +23,7 @@ module.exports = __toCommonJS(prefetch_worker_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_server = require("react-dom/server");
 var import_server2 = require("@loadable/server");
-const prefetch = (App, context) => __async(void 0, null, function* () {
+const prefetch = async (App, context) => {
   var _a;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
@@ -66,7 +46,7 @@ const prefetch = (App, context) => __async(void 0, null, function* () {
       i18nData: context.__i18nData__
     };
   }
-  const loadersData = yield context.loaderManager.awaitPendingLoaders();
+  const loadersData = await context.loaderManager.awaitPendingLoaders();
   Object.keys(loadersData).forEach((id) => {
     const data = loadersData[id];
     if (data._error) {
@@ -81,7 +61,7 @@ const prefetch = (App, context) => __async(void 0, null, function* () {
     i18nData: context.__i18nData__,
     storeState: (_a = context == null ? void 0 : context.store) == null ? void 0 : _a.getState()
   };
-});
+};
 var prefetch_worker_default = prefetch;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/{js/node → cjs}/ssr/react/prerender/index.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 });
@@ -72,7 +55,7 @@ const mapStateOnServer = (reduceProps) => {
     const reduceProp = reduceProps[propKey];
     let nextProps = props;
     if ((0, import_util.exist)(reduceProp)) {
-      nextProps = __spreadProps(__spreadValues({}, props), { [propKey]: reduceProp });
+      nextProps = { ...props, [propKey]: reduceProp };
     }
     return nextProps;
   }, defaultProps);
@@ -101,12 +84,12 @@ function factory(Component) {
       return true;
     }
     render() {
-      const newProps = __spreadValues({}, this.props);
+      const newProps = { ...this.props };
       const validate = this.verify();
       if (!validate) {
         throw new Error("invalid props, check usage");
       }
-      return (0, import_react.createElement)(Component, __spreadValues({}, newProps));
+      return (0, import_react.createElement)(Component, { ...newProps });
     }
   }
   Spr.peek = Component.peek;

package/dist/{js/node → cjs}/ssr/serverRender/helmet.js

@@ -25,7 +25,7 @@ const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
 const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
-const TEST_TITLE_CONTENT = new RegExp("(?<=<title[^>]*>)([\\s\\S\\n\\r]*?)([.|\\S])([\\s\\S\\n\\r]*?)(?=<\\/title>)");
+const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/;
 function helmet(content, helmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();

package/dist/cjs/ssr/serverRender/index.js

@@ -0,0 +1,34 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serverRender_exports = {};
+__export(serverRender_exports, {
+  default: () => serverRender
+});
+module.exports = __toCommonJS(serverRender_exports);
+var import_utils = require("../utils");
+async function serverRender(options) {
+  if ((0, import_utils.isReact18)() && options.config.mode === "stream") {
+    const pipe = await require("./renderToStream").render(options);
+    return pipe;
+  } else {
+    const html = await require("./renderToString").render(options);
+    return html;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/{js/node → cjs}/ssr/serverRender/renderToStream/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 renderToStream_exports = {};
 __export(renderToStream_exports, {
   render: () => render
@@ -58,7 +38,7 @@ const render = ({ App, context }) => {
       'The "ssrContext" must not be undefined, but received undefined'
     );
   }
-  return (0, import_ssr.run)(ssrContext.request.headers, () => __async(void 0, null, function* () {
+  return (0, import_ssr.run)(ssrContext.request.headers, async () => {
     const end = (0, import_time.time)();
     const rootElement = (0, import_react.createElement)(App, {
       context: Object.assign(context || {}, {
@@ -79,7 +59,7 @@ const render = ({ App, context }) => {
       }
     });
     return pipe;
-  }));
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/ssr/serverRender/renderToStream/renderToPipe.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 });
@@ -50,7 +33,8 @@ function renderToPipe(rootElement, context, options) {
         ({ renderToPipeableStream } = require("react-dom/server"));
       } catch (e) {
       }
-      const { pipe } = renderToPipeableStream(rootElement, __spreadProps(__spreadValues({}, options), {
+      const { pipe } = renderToPipeableStream(rootElement, {
+        ...options,
         onShellReady() {
           var _a;
           const { shellAfter, shellBefore } = (0, import_template.getTemplates)(
@@ -102,7 +86,7 @@ function renderToPipe(rootElement, context, options) {
           ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
           (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, error);
         }
-      }));
+      });
     });
   };
   return forUserPipe;

package/dist/{js/node → cjs}/ssr/serverRender/renderToStream/renderToPipe.worker.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 });
@@ -32,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 renderToPipe_worker_exports = {};
 __export(renderToPipe_worker_exports, {
   default: () => renderToPipe_worker_default
@@ -62,7 +25,7 @@ var import_template = require("./template");
 function renderToPipe(rootElement, context, options) {
   let isShellStream = true;
   const { ssrContext } = context;
-  const forUserPipe = (stream) => __async(this, null, function* () {
+  const forUserPipe = async (stream) => {
     let renderToReadableStream;
     try {
       ({ renderToReadableStream } = require("react-dom/server"));
@@ -73,23 +36,27 @@ function renderToPipe(rootElement, context, options) {
       import_types.RenderLevel.SERVER_RENDER
     );
     try {
-      let _a;
-      const readableOriginal = yield renderToReadableStream(rootElement, __spreadProps(__spreadValues({}, options), {
+      const readableOriginal = await renderToReadableStream(rootElement, {
+        ...options,
         onError(error) {
-          var _a2;
+          var _a;
           ssrContext.logger.error(
             "An error occurs during streaming SSR",
             error
           );
           ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          (_a2 = options == null ? void 0 : options.onError) == null ? void 0 : _a2.call(options, error);
+          (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, error);
         }
-      }));
+      });
       const reader = readableOriginal.getReader();
       const injectableStream = new ReadableStream({
         start(controller) {
-          return __async(this, null, function* () {
-            const { value } = yield reader.read();
+          async function push() {
+            const { done, value } = await reader.read();
+            if (done) {
+              controller.close();
+              return;
+            }
             if (isShellStream) {
               controller.enqueue(encodeForWebStream(shellBefore));
               controller.enqueue(value);
@@ -98,7 +65,9 @@ function renderToPipe(rootElement, context, options) {
             } else {
               controller.enqueue(value);
             }
-          });
+            push();
+          }
+          push();
         }
       });
       return readableOriginal(injectableStream).readableOriginal(stream);
@@ -111,7 +80,7 @@ function renderToPipe(rootElement, context, options) {
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;
     }
-  });
+  };
   return forUserPipe;
 }
 let encoder;

package/dist/{js/node → cjs}/ssr/serverRender/renderToString/entry.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 entry_exports = {};
 __export(entry_exports, {
   default: () => Entry
@@ -100,58 +80,54 @@ class Entry {
       }
     };
   }
-  renderToHtml(context) {
-    return __async(this, null, function* () {
-      var _a, _b, _c;
-      const ssrContext = context.ssrContext;
-      if ((_a = ssrContext.redirection) == null ? void 0 : _a.url) {
-        return "";
-      }
-      const prefetchData = yield this.prefetch(context);
-      if ((_b = ssrContext.redirection) == null ? void 0 : _b.url) {
-        return "";
-      }
-      if (this.result.renderLevel >= import_types.RenderLevel.SERVER_PREFETCH) {
-        this.result.html = this.renderToString(context);
-      }
-      if ((_c = ssrContext.redirection) == null ? void 0 : _c.url) {
-        return "";
-      }
-      let html = "";
-      const templateData = buildTemplateData(
-        ssrContext,
-        prefetchData,
-        this.result.renderLevel
-      );
-      const SSRData = this.getSSRDataScript(templateData);
-      for (const fragment of this.fragments) {
-        if (fragment.isVariable && fragment.content === "SSRDataScript") {
-          html += fragment.getValue(SSRData);
-        } else {
-          html += fragment.getValue(this.result);
-        }
+  async renderToHtml(context) {
+    var _a, _b, _c;
+    const ssrContext = context.ssrContext;
+    if ((_a = ssrContext.redirection) == null ? void 0 : _a.url) {
+      return "";
+    }
+    const prefetchData = await this.prefetch(context);
+    if ((_b = ssrContext.redirection) == null ? void 0 : _b.url) {
+      return "";
+    }
+    if (this.result.renderLevel >= import_types.RenderLevel.SERVER_PREFETCH) {
+      this.result.html = this.renderToString(context);
+    }
+    if ((_c = ssrContext.redirection) == null ? void 0 : _c.url) {
+      return "";
+    }
+    let html = "";
+    const templateData = buildTemplateData(
+      ssrContext,
+      prefetchData,
+      this.result.renderLevel
+    );
+    const SSRData = this.getSSRDataScript(templateData);
+    for (const fragment of this.fragments) {
+      if (fragment.isVariable && fragment.content === "SSRDataScript") {
+        html += fragment.getValue(SSRData);
+      } else {
+        html += fragment.getValue(this.result);
       }
-      const helmetData = import_react_helmet.default.renderStatic();
-      return helmetData ? (0, import_helmet.default)(html, helmetData) : html;
-    });
+    }
+    const helmetData = import_react_helmet.default.renderStatic();
+    return helmetData ? (0, import_helmet.default)(html, helmetData) : html;
   }
-  prefetch(context) {
-    return __async(this, null, function* () {
-      let prefetchData;
-      const end = (0, import_time.time)();
-      try {
-        prefetchData = yield (0, import_prefetch.default)(this.App, context);
-        this.result.renderLevel = import_types.RenderLevel.SERVER_PREFETCH;
-        const prefetchCost = end();
-        this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
-        this.metrics.emitTimer("app.prefetch.cost", prefetchCost);
-      } catch (e) {
-        this.result.renderLevel = import_types.RenderLevel.CLIENT_RENDER;
-        this.logger.error("App Prefetch Render", e);
-        this.metrics.emitCounter("app.prefetch.render.error", 1);
-      }
-      return prefetchData || {};
-    });
+  async prefetch(context) {
+    let prefetchData;
+    const end = (0, import_time.time)();
+    try {
+      prefetchData = await (0, import_prefetch.default)(this.App, context);
+      this.result.renderLevel = import_types.RenderLevel.SERVER_PREFETCH;
+      const prefetchCost = end();
+      this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
+      this.metrics.emitTimer("app.prefetch.cost", prefetchCost);
+    } catch (e) {
+      this.result.renderLevel = import_types.RenderLevel.CLIENT_RENDER;
+      this.logger.error("App Prefetch Render", e);
+      this.metrics.emitCounter("app.prefetch.render.error", 1);
+    }
+    return prefetchData || {};
   }
   renderToString(context) {
     let html = "";

package/dist/{js/node → cjs}/ssr/serverRender/renderToString/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 renderToString_exports = {};
 __export(renderToString_exports, {
   render: () => render
@@ -56,7 +36,7 @@ const render = ({
   config
 }) => {
   const ssrContext = context.ssrContext;
-  return (0, import_ssr.run)(ssrContext.request.headers, () => __async(void 0, null, function* () {
+  return (0, import_ssr.run)(ssrContext.request.headers, async () => {
     const entry = new import_entry.default({
       ctx: ssrContext,
       App,
@@ -64,7 +44,7 @@ const render = ({
     });
     entry.metrics.emitCounter("app.visit.count", 1);
     const end = (0, import_time.time)();
-    const html = yield entry.renderToHtml(context);
+    const html = await entry.renderToHtml(context);
     const cost = end();
     entry.logger.info("App Render Total cost = %d ms", cost);
     entry.metrics.emitTimer("app.render.cost", cost);
@@ -73,7 +53,7 @@ const render = ({
       context.ssrContext.cacheConfig = cacheConfig;
     }
     return html;
-  }));
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/ssr/serverRender/renderToString/index.worker.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 index_worker_exports = {};
 __export(index_worker_exports, {
   render: () => render
@@ -49,11 +29,11 @@ module.exports = __toCommonJS(index_worker_exports);
 var import_prerender = require("../../react/prerender");
 var import_time = require("../time");
 var import_entry = __toESM(require("./entry"));
-const render = (_0) => __async(void 0, [_0], function* ({
+const render = async ({
   App,
   context,
   config
-}) {
+}) => {
   const ssrContext = context.ssrContext;
   const entry = new import_entry.default({
     ctx: ssrContext,
@@ -62,7 +42,7 @@ const render = (_0) => __async(void 0, [_0], function* ({
   });
   entry.metrics.emitCounter("app.visit.count", 1);
   const end = (0, import_time.time)();
-  const html = yield entry.renderToHtml(context);
+  const html = await entry.renderToHtml(context);
   const cost = end();
   entry.logger.info("App Render Total cost = %d ms", cost);
   entry.metrics.emitTimer("app.render.cost", cost);
@@ -71,7 +51,7 @@ const render = (_0) => __async(void 0, [_0], function* ({
     context.ssrContext.cacheConfig = cacheConfig;
   }
   return html;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   render