@modern-js/runtime 2.3.1-alpha.0 → 2.4.1-alpha.0

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

@@ -0,0 +1,13 @@
+const getLatency = (hrtime) => {
+  const [s, ns] = process.hrtime(hrtime);
+  return s * 1e3 + ns / 1e6;
+};
+const time = () => {
+  const hrtime = process.hrtime();
+  return () => {
+    return getLatency(hrtime);
+  };
+};
+export {
+  time
+};

package/dist/js/modern/ssr/serverRender/time.worker.js

@@ -0,0 +1,28 @@
+function processHrtime(previousTimestamp) {
+  const now = new Date().getTime();
+  const clocktime = now * 1e-3;
+  let seconds = Math.floor(clocktime);
+  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
+  if (previousTimestamp) {
+    seconds -= previousTimestamp[0];
+    nanoseconds -= previousTimestamp[1];
+    if (nanoseconds < 0) {
+      seconds--;
+      nanoseconds += 1e9;
+    }
+  }
+  return [seconds, nanoseconds];
+}
+const getLatency = (hrtime) => {
+  const [s, ns] = processHrtime(hrtime);
+  return s * 1e3 + ns / 1e6;
+};
+const time = () => {
+  const hrtime = processHrtime();
+  return () => {
+    return getLatency(hrtime);
+  };
+};
+export {
+  time
+};

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

@@ -6,17 +6,6 @@ function getLoadableScripts(extractor) {
   }
   return scripts.split("<\/script>").slice(0, 2).map((i) => `${i}<\/script>`).join("");
 }
-const getLatency = (hrtime) => {
-  const [s, ns] = process.hrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-const time = () => {
-  const hrtime = process.hrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};
 export {
-  getLoadableScripts,
-  time
+  getLoadableScripts
 };

package/dist/js/node/core/compatible.js

@@ -274,6 +274,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
         if (ssrContext) {
           ssrContext.res.statusCode = status;
           ssrContext.res.setHeader("Location", redirectUrl);
+          ssrContext.redirection = ssrContext.redirection || {};
           ssrContext.redirection.status = status;
           ssrContext.redirection.url = redirectUrl;
         }

package/dist/js/node/document/Body.js

@@ -23,10 +23,10 @@ module.exports = __toCommonJS(Body_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_constants = require("./constants");
-var import_DocumentStructrueContext = require("./DocumentStructrueContext");
+var import_DocumentStructureContext = require("./DocumentStructureContext");
 var import_Root = require("./Root");
 function Body(props) {
-  const { hasSetRoot } = (0, import_react.useContext)(import_DocumentStructrueContext.DocumentStructrueContext);
+  const { hasSetRoot } = (0, import_react.useContext)(import_DocumentStructureContext.DocumentStructureContext);
   const { children } = props;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("body", {
     children: [

package/dist/js/node/document/{DocumentStructrueContext.js → DocumentStructureContext.js}

@@ -21,13 +21,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var DocumentStructrueContext_exports = {};
-__export(DocumentStructrueContext_exports, {
-  DocumentStructrueContext: () => DocumentStructrueContext
+var DocumentStructureContext_exports = {};
+__export(DocumentStructureContext_exports, {
+  DocumentStructureContext: () => DocumentStructureContext
 });
-module.exports = __toCommonJS(DocumentStructrueContext_exports);
+module.exports = __toCommonJS(DocumentStructureContext_exports);
 var import_react = __toESM(require("react"));
-const DocumentStructrueContext = import_react.default.createContext({
+const DocumentStructureContext = import_react.default.createContext({
   hasSetHead: false,
   hasSetScripts: false,
   hasSetBody: false,
@@ -36,5 +36,5 @@ const DocumentStructrueContext = import_react.default.createContext({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DocumentStructrueContext
+  DocumentStructureContext
 });

package/dist/js/node/document/Head.js

@@ -23,12 +23,12 @@ __export(Head_exports, {
 module.exports = __toCommonJS(Head_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
-var import_DocumentStructrueContext = require("./DocumentStructrueContext");
+var import_DocumentStructureContext = require("./DocumentStructureContext");
 var import_Scripts = require("./Scripts");
 var import_Links = require("./Links");
 var import_constants = require("./constants");
 function Head(props) {
-  const { hasSetScripts, hasSetLinks } = (0, import_react.useContext)(import_DocumentStructrueContext.DocumentStructrueContext);
+  const { hasSetScripts, hasSetLinks } = (0, import_react.useContext)(import_DocumentStructureContext.DocumentStructureContext);
   const { children } = props;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("head", {
     children: [

package/dist/js/node/document/Html.js

@@ -22,7 +22,7 @@ __export(Html_exports, {
 module.exports = __toCommonJS(Html_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_Body = require("./Body");
-var import_DocumentStructrueContext = require("./DocumentStructrueContext");
+var import_DocumentStructureContext = require("./DocumentStructureContext");
 var import_Head = require("./Head");
 function findTargetChild(tag, children) {
   return children.find((item) => getEleType(item) === tag);
@@ -78,7 +78,7 @@ function Html(props) {
     });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("html", {
-    children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_DocumentStructrueContext.DocumentStructrueContext.Provider, {
+    children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_DocumentStructureContext.DocumentStructureContext.Provider, {
       value: {
         hasSetHead,
         hasSetScripts,

package/dist/js/node/document/index.js

@@ -16,7 +16,7 @@ var document_exports = {};
 module.exports = __toCommonJS(document_exports);
 __reExport(document_exports, require("./Html"), module.exports);
 __reExport(document_exports, require("./DocumentContext"), module.exports);
-__reExport(document_exports, require("./DocumentStructrueContext"), module.exports);
+__reExport(document_exports, require("./DocumentStructureContext"), module.exports);
 __reExport(document_exports, require("./Head"), module.exports);
 __reExport(document_exports, require("./Body"), module.exports);
 __reExport(document_exports, require("./Root"), module.exports);

package/dist/js/node/router/runtime/fetch.js

@@ -0,0 +1,28 @@
+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 fetch_exports = {};
+__export(fetch_exports, {
+  installGlobals: () => installGlobals
+});
+module.exports = __toCommonJS(fetch_exports);
+function installGlobals() {
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  installGlobals
+});

package/dist/js/node/router/runtime/fetch.node.js

@@ -0,0 +1,27 @@
+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 fetch_node_exports = {};
+__export(fetch_node_exports, {
+  installGlobals: () => import_node.installGlobals
+});
+module.exports = __toCommonJS(fetch_node_exports);
+var import_node = require("@remix-run/node");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  installGlobals
+});

package/dist/js/node/router/runtime/fetch.worker.js

@@ -0,0 +1,28 @@
+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 fetch_worker_exports = {};
+__export(fetch_worker_exports, {
+  installGlobals: () => installGlobals
+});
+module.exports = __toCommonJS(fetch_worker_exports);
+function installGlobals() {
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  installGlobals
+});

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

@@ -67,15 +67,15 @@ __export(plugin_node_exports, {
 module.exports = __toCommonJS(plugin_node_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
+var import_serialize_javascript = __toESM(require("serialize-javascript"));
 var import_router = require("@remix-run/router");
 var import_server = require("react-router-dom/server");
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-var import_node = require("@remix-run/node");
 var import_react_router_dom = require("react-router-dom");
-var import_serialize_javascript = __toESM(require("serialize-javascript"));
 var import_core = require("../../core");
 var import_utils = require("./utils");
-(0, import_node.installGlobals)();
+var import_fetch = require("./fetch");
+(0, import_fetch.installGlobals)();
 function createFetchRequest(req) {
   const origin = `${req.protocol}://${req.host}`;
   const url = new URL(req.originalUrl || req.url, origin);
@@ -89,7 +89,7 @@ function createFetchRequest(req) {
 }
 function createFetchHeaders(requestHeaders) {
   const headers = new Headers();
-  for (const [key, values] of Object.entries(requestHeaders)) {
+  for (const [key, values] of Object.entries(requestHeaders || {})) {
     if (values) {
       if (Array.isArray(values)) {
         for (const value of values) {
@@ -102,6 +102,26 @@ function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
+function serializeErrors(errors) {
+  if (!errors) {
+    return null;
+  }
+  const entries = Object.entries(errors);
+  const serialized = {};
+  for (const [key, val] of entries) {
+    if ((0, import_router.isRouteErrorResponse)(val)) {
+      serialized[key] = __spreadProps(__spreadValues({}, val), { __type: "RouteErrorResponse" });
+    } else if (val instanceof Error) {
+      serialized[key] = {
+        message: val.message,
+        __type: "Error"
+      };
+    } else {
+      serialized[key] = val;
+    }
+  }
+  return serialized;
+}
 const routerPlugin = ({
   basename = "",
   routesConfig,
@@ -128,17 +148,6 @@ const routerPlugin = ({
             if (routerContext instanceof Response) {
               return routerContext;
             }
-            if (routerContext.loaderData) {
-              routerContext.loaderData = JSON.parse(
-                JSON.stringify(routerContext.loaderData),
-                (k, v) => {
-                  if (typeof v === "string") {
-                    return (0, import_serialize_javascript.default)(v);
-                  }
-                  return v;
-                }
-              );
-            }
             const router = (0, import_server.createStaticRouter)(routes, routerContext);
             context.router = router;
             context.routerContext = routerContext;
@@ -154,12 +163,28 @@ const routerPlugin = ({
           const getRouteApp = () => {
             return (props) => {
               const { router, routerContext } = (0, import_react.useContext)(import_core.RuntimeReactContext);
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.StaticRouterProvider, {
-                  router,
-                  context: routerContext,
-                  nonce: "the-nonce"
-                })
+              const data = {
+                loaderData: routerContext.loaderData,
+                actionData: routerContext.actionData,
+                errors: serializeErrors(routerContext.errors)
+              };
+              const hydrateScript = `window.__staticRouterHydrationData = ${(0, import_serialize_javascript.default)(
+                data,
+                { isJSON: true }
+              )};`;
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(App, __spreadProps(__spreadValues({}, props), {
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.StaticRouterProvider, {
+                    router,
+                    context: routerContext,
+                    hydrate: false
+                  }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+                    suppressHydrationWarning: true,
+                    id: "the-nonce",
+                    dangerouslySetInnerHTML: { __html: hydrateScript }
+                  })
+                ]
               }));
             };
           };

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

@@ -78,7 +78,7 @@ var cli_default = () => ({
             }
           },
           tools: {
-            webpackChain: (chain, { name, isServer, CHAIN_ID }) => {
+            webpackChain: (chain, { name, isServer, isServiceWorker, CHAIN_ID }) => {
               const userConfig = api.useResolvedConfigContext();
               if ((0, import_utils.isUseSSRBundle)(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
                 const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
@@ -88,7 +88,7 @@ var cli_default = () => ({
               }
               const modernVars = {
                 [`process.env.MODERN_TARGET`]: JSON.stringify(
-                  isServer ? "node" : "browser"
+                  isServer || isServiceWorker ? "node" : "browser"
                 )
               };
               chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap((args) => {

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

@@ -0,0 +1,87 @@
+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 __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
+});
+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* () {
+  var _a;
+  const { ssrContext } = context;
+  const { loadableStats } = ssrContext;
+  if (loadableStats) {
+    const extractor = new import_server2.ChunkExtractor({
+      stats: loadableStats,
+      entrypoints: [ssrContext.entryName].filter(Boolean)
+    });
+    (0, import_server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+      context
+    })));
+  } else {
+    (0, import_server.renderToStaticMarkup)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+      context
+    }));
+  }
+  if (!context.loaderManager.hasPendingLoaders()) {
+    return {
+      initialData: context.initialData,
+      i18nData: context.__i18nData__
+    };
+  }
+  const loadersData = yield context.loaderManager.awaitPendingLoaders();
+  Object.keys(loadersData).forEach((id) => {
+    const data = loadersData[id];
+    if (data._error) {
+      ssrContext.logger.error("App Prefetch Loader", data._error);
+      ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+      delete data._error;
+    }
+  });
+  return {
+    loadersData,
+    initialData: context.initialData,
+    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/ssr/react/nossr/index.js

@@ -34,8 +34,12 @@ const NoSSR = (props) => {
     csr = true;
     setMounted(true);
   });
-  const { children } = props;
-  return import_react.default.createElement(import_react.default.Fragment, null, isMounted ? children : null);
+  const { children, fallback = null } = props;
+  return import_react.default.createElement(
+    import_react.default.Fragment,
+    null,
+    isMounted ? children : fallback
+  );
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -49,7 +49,7 @@ module.exports = __toCommonJS(renderToStream_exports);
 var import_react = require("react");
 var import_ssr = require("@modern-js/utils/ssr");
 var import_prerender = require("../../react/prerender");
-var import_utils = require("../utils");
+var import_time = require("../time");
 var import_renderToPipe = __toESM(require("./renderToPipe"));
 const render = ({ App, context }) => {
   const { ssrContext } = context;
@@ -59,7 +59,7 @@ const render = ({ App, context }) => {
     );
   }
   return (0, import_ssr.run)(ssrContext.request.headers, () => __async(void 0, null, function* () {
-    const end = (0, import_utils.time)();
+    const end = (0, import_time.time)();
     const rootElement = (0, import_react.createElement)(App, {
       context: Object.assign(context || {}, {
         ssr: true

package/dist/js/node/ssr/serverRender/renderToStream/index.worker.js

@@ -0,0 +1,64 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_worker_exports = {};
+__export(index_worker_exports, {
+  render: () => render
+});
+module.exports = __toCommonJS(index_worker_exports);
+var import_react = require("react");
+var import_prerender = require("../../react/prerender");
+var import_time = require("../time");
+var import_renderToPipe = __toESM(require("./renderToPipe"));
+const render = ({ App, context }) => {
+  const { ssrContext } = context;
+  if (!ssrContext) {
+    throw new Error(
+      'The "ssrContext" must not be undefined, but received undefined'
+    );
+  }
+  const end = (0, import_time.time)();
+  const rootElement = (0, import_react.createElement)(App, {
+    context: Object.assign(context || {}, {
+      ssr: true
+    })
+  });
+  const pipe = (0, import_renderToPipe.default)(rootElement, context, {
+    onShellReady() {
+      const cacheConfig = import_prerender.PreRender.config();
+      if (cacheConfig) {
+        ssrContext.cacheConfig = cacheConfig;
+      }
+    },
+    onAllReady() {
+      const cost = end();
+      ssrContext.logger.debug("App Render To HTML cost = %d ms", cost);
+      ssrContext.metrics.emitTimer("app.render.html.cost", cost);
+    }
+  });
+  return pipe;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  render
+});

package/dist/js/node/ssr/serverRender/renderToStream/renderToPipe.js

@@ -38,7 +38,6 @@ __export(renderToPipe_exports, {
 });
 module.exports = __toCommonJS(renderToPipe_exports);
 var import_stream = require("stream");
-var import_server = require("react-dom/server");
 var import_types = require("../types");
 var import_template = require("./template");
 function renderToPipe(rootElement, context, options) {
@@ -46,7 +45,12 @@ function renderToPipe(rootElement, context, options) {
   const { ssrContext } = context;
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
-      const { pipe } = (0, import_server.renderToPipeableStream)(rootElement, __spreadProps(__spreadValues({}, options), {
+      let renderToPipeableStream;
+      try {
+        ({ renderToPipeableStream } = require("react-dom/server"));
+      } catch (e) {
+      }
+      const { pipe } = renderToPipeableStream(rootElement, __spreadProps(__spreadValues({}, options), {
         onShellReady() {
           var _a;
           const { shellAfter, shellBefore } = (0, import_template.getTemplates)(