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

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/renderToStream/template.js

@@ -24,7 +24,7 @@ var import_buildTemplate = require("./buildTemplate.after");
 var import_bulidTemplate = require("./bulidTemplate.before");
 const HTML_SEPARATOR = "<!--<?- html ?>-->";
 const getTemplates = (context, renderLevel) => {
-  const { ssrContext } = context;
+  const { ssrContext, routerContext } = context;
   const [beforeAppTemplate = "", afterAppHtmlTemplate = ""] = ssrContext.template.split(HTML_SEPARATOR) || [];
   const builtBeforeTemplate = (0, import_bulidTemplate.buildShellBeforeTemplate)(
     beforeAppTemplate,
@@ -32,6 +32,7 @@ const getTemplates = (context, renderLevel) => {
   );
   const builtAfterTemplate = (0, import_buildTemplate.buildShellAfterTemplate)(afterAppHtmlTemplate, {
     ssrContext,
+    routerContext,
     renderLevel
   });
   return {

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
@@ -48,7 +28,7 @@ __export(entry_exports, {
 module.exports = __toCommonJS(entry_exports);
 var import_react = __toESM(require("react"));
 var import_server = __toESM(require("react-dom/server"));
-var import_serialize_javascript = __toESM(require("serialize-javascript"));
+var import_serialize = require("@modern-js/utils/serialize");
 var import_react_helmet = __toESM(require("react-helmet"));
 var import_helmet = __toESM(require("../helmet"));
 var import_types = require("../types");
@@ -58,10 +38,11 @@ var import_template = require("./template");
 var import_reduce = require("./reduce");
 var loadableRenderer = __toESM(require("./loadable"));
 var styledComponentRenderer = __toESM(require("./styledComponent"));
-const buildTemplateData = (context, data, renderLevel) => {
+const buildTemplateData = (context, data, routerData, renderLevel) => {
   const { request } = context;
   return {
     data,
+    routerData,
     context: {
       request: {
         params: request.params,
@@ -100,58 +81,59 @@ 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 "";
+    }
+    const { routerContext } = context;
+    const routerData = routerContext != null ? routerContext : {
+      loaderData: routerContext.loaderData
+    };
+    let html = "";
+    const templateData = buildTemplateData(
+      ssrContext,
+      prefetchData,
+      routerData,
+      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 = "";
@@ -186,9 +168,7 @@ class Entry {
   getSSRDataScript(templateData) {
     return {
       SSRDataScript: `
-        <script>window._SSR_DATA = ${(0, import_serialize_javascript.default)(templateData, {
-        isJSON: true
-      })}<\/script>
+        <script>window._SSR_DATA = ${(0, import_serialize.serializeJson)(templateData)}<\/script>
       `
     };
   }

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

package/dist/{js/node → cjs}/ssr/utils.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -45,11 +31,12 @@ const formatServer = (request) => {
     "user-agent": userAgent = "",
     referer
   } = request.headers || {};
-  return __spreadValues({
+  return {
     cookie,
     userAgent,
-    referer
-  }, request);
+    referer,
+    ...request
+  };
 };
 const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {
   const [key, value] = item.split("=");

package/dist/{js/node → cjs}/state/runtime/plugin.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 });
@@ -90,7 +73,9 @@ const state = (config) => ({
           return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, {
             store: context.store,
             config: storeConfig,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+              ...props
+            })
           });
         };
         return next({
@@ -108,9 +93,10 @@ const state = (config) => ({
       pickContext({ context, pickedContext }, next) {
         return next({
           context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+          pickedContext: {
+            ...pickedContext,
             store: context.store
-          })
+          }
         });
       }
     };

package/dist/cjs/state/types.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/esm/common.js

@@ -0,0 +1,6 @@
+var isBrowser = function() {
+    return typeof window !== "undefined" && window.name !== "nodejs";
+};
+var JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
+var ESCAPED_SHELL_STREAM_END_MARK = "&lt;!--&lt;?- SHELL_STREAM_END ?&gt;--&gt;";
+export { ESCAPED_SHELL_STREAM_END_MARK, JSX_SHELL_STREAM_END_MARK, isBrowser };

package/dist/{js/treeshaking → esm}/document/cli/index.js

@@ -236,7 +236,7 @@ var cli_default = function() {
                                         case 0:
                                             htmlWebpackPlugin = param.htmlWebpackPlugin;
                                             documentParams = getDocParams({
-                                                config: api.useConfigContext(),
+                                                config: api.useResolvedConfigContext(),
                                                 entryName: entryName,
                                                 templateParameters: templateParameters
                                             });
@@ -390,4 +390,4 @@ var cli_default = function() {
         }()
     };
 };
-export { cli_default as default };
+export { cli_default as default, getDocumenByEntryName };