@modern-js/runtime 2.5.0 → 2.6.0

package/dist/esm-node/router/runtime/utils.js

@@ -27,22 +27,14 @@ const renderNestedRoute = (nestedRoute, parent) => {
     if (parent == null ? void 0 : parent.loading) {
       const Loading = parent.loading;
       if (isLoadableComponent(Component)) {
-        element = /* @__PURE__ */ jsx(Component, {
-          fallback: /* @__PURE__ */ jsx(Loading, {})
-        });
+        element = /* @__PURE__ */ jsx(Component, { fallback: /* @__PURE__ */ jsx(Loading, {}) });
       } else {
-        element = /* @__PURE__ */ jsx(Suspense, {
-          fallback: /* @__PURE__ */ jsx(Loading, {}),
-          children: /* @__PURE__ */ jsx(Component, {})
-        });
+        element = /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loading, {}), children: /* @__PURE__ */ jsx(Component, {}) });
       }
     } else if (isLoadableComponent(Component) || isRoot) {
       element = /* @__PURE__ */ jsx(Component, {});
     } else {
-      element = /* @__PURE__ */ jsx(Suspense, {
-        fallback: null,
-        children: /* @__PURE__ */ jsx(Component, {})
-      });
+      element = /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(Component, {}) });
     }
   } else {
     nestedRoute.loading = parent == null ? void 0 : parent.loading;
@@ -53,28 +45,16 @@ const renderNestedRoute = (nestedRoute, parent) => {
   const childElements = children == null ? void 0 : children.map((childRoute) => {
     return renderNestedRoute(childRoute, nestedRoute);
   });
-  const routeElement = index ? /* @__PURE__ */ jsx(Route, {
-    ...routeProps,
-    index: true
-  }, id) : /* @__PURE__ */ jsx(Route, {
-    ...routeProps,
-    index: false,
-    children: childElements
-  }, id);
+  const routeElement = index ? /* @__PURE__ */ jsx(Route, { ...routeProps, index: true }, id) : /* @__PURE__ */ jsx(Route, { ...routeProps, index: false, children: childElements }, id);
   return routeElement;
 };
 function getRouteComponents(routes, globalApp) {
   const Layout = ({ Component, ...props }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ jsx(Component, {
-        ...props
-      });
+      return /* @__PURE__ */ jsx(Component, { ...props });
     }
-    return /* @__PURE__ */ jsx(GlobalLayout, {
-      Component,
-      ...props
-    });
+    return /* @__PURE__ */ jsx(GlobalLayout, { Component, ...props });
   };
   const routeElements = [];
   for (const route of routes) {
@@ -82,19 +62,18 @@ function getRouteComponents(routes, globalApp) {
       const routeElement = renderNestedRoute(route);
       routeElements.push(routeElement);
     } else {
-      const routeElement = /* @__PURE__ */ jsx(Route, {
-        path: route.path,
-        element: /* @__PURE__ */ jsx(Layout, {
-          Component: route.component
-        })
-      }, route.path);
+      const routeElement = /* @__PURE__ */ jsx(
+        Route,
+        {
+          path: route.path,
+          element: /* @__PURE__ */ jsx(Layout, { Component: route.component })
+        },
+        route.path
+      );
       routeElements.push(routeElement);
     }
   }
-  routeElements.push(/* @__PURE__ */ jsx(Route, {
-    path: "*",
-    element: /* @__PURE__ */ jsx(DefaultNotFound, {})
-  }, "*"));
+  routeElements.push(/* @__PURE__ */ jsx(Route, { path: "*", element: /* @__PURE__ */ jsx(DefaultNotFound, {}) }, "*"));
   return routeElements;
 }
 function renderRoutes(routesConfig) {

package/dist/esm-node/router/runtime/withRouter.js

@@ -5,12 +5,15 @@ const withRouter = (Component) => {
     const location = useLocation();
     const params = useParams();
     const navigate = useNavigate();
-    return /* @__PURE__ */ jsx(Component, {
-      ...props,
-      location,
-      params,
-      navigate
-    });
+    return /* @__PURE__ */ jsx(
+      Component,
+      {
+        ...props,
+        location,
+        params,
+        navigate
+      }
+    );
   };
 };
 export {

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

@@ -27,51 +27,33 @@ const ssr = (config) => ({
         return stringSSRHydrate();
         function stringSSRHydrate() {
           if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
-            ModernRender(/* @__PURE__ */ jsx(App, {
-              context
-            }));
+            ModernRender(/* @__PURE__ */ jsx(App, { context }));
           } else if (renderLevel === RenderLevel.SERVER_RENDER) {
             if (isReact18()) {
               loadableReady(() => {
-                let SSRApp = () => /* @__PURE__ */ jsx(WithCallback, {
-                  callback,
-                  children: /* @__PURE__ */ jsx(App, {
-                    context: hydrateContext
-                  })
-                });
+                let SSRApp = () => /* @__PURE__ */ jsx(WithCallback, { callback, children: /* @__PURE__ */ jsx(App, { context: hydrateContext }) });
                 SSRApp = hoistNonReactStatics(SSRApp, App);
                 ModernHydrate(/* @__PURE__ */ jsx(SSRApp, {}));
               });
             } else {
               loadableReady(() => {
-                ModernHydrate(/* @__PURE__ */ jsx(App, {
-                  context: hydrateContext
-                }), callback);
+                ModernHydrate(/* @__PURE__ */ jsx(App, { context: hydrateContext }), callback);
               });
             }
           } else {
             console.warn(
               `unknow render level: ${renderLevel}, execute render()`
             );
-            ModernRender(/* @__PURE__ */ jsx(App, {
-              context
-            }));
+            ModernRender(/* @__PURE__ */ jsx(App, { context }));
           }
         }
         function streamSSRHydrate() {
           if (renderLevel === RenderLevel.SERVER_RENDER) {
-            let SSRApp = () => /* @__PURE__ */ jsx(WithCallback, {
-              callback,
-              children: /* @__PURE__ */ jsx(App, {
-                context: hydrateContext
-              })
-            });
+            let SSRApp = () => /* @__PURE__ */ jsx(WithCallback, { callback, children: /* @__PURE__ */ jsx(App, { context: hydrateContext }) });
             SSRApp = hoistNonReactStatics(SSRApp, App);
             ModernHydrate(/* @__PURE__ */ jsx(SSRApp, {}));
           } else {
-            ModernRender(/* @__PURE__ */ jsx(App, {
-              context
-            }));
+            ModernRender(/* @__PURE__ */ jsx(App, { context }));
           }
         }
       },

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

@@ -11,13 +11,9 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
       stats: loadableStats,
       entrypoints: [ssrContext.entryName].filter(Boolean)
     });
-    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ jsx(App, {
-      context
-    })));
+    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ jsx(App, { context })));
   } else {
-    renderToStaticMarkup(/* @__PURE__ */ jsx(App, {
-      context
-    }));
+    renderToStaticMarkup(/* @__PURE__ */ jsx(App, { context }));
   }
   if (!context.loaderManager.hasPendingLoaders()) {
     return {
@@ -38,6 +34,7 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
     loadersData,
     initialData: context.initialData,
     i18nData: context.__i18nData__,
+    // todo: move to plugin state
     storeState: (_a = context == null ? void 0 : context.store) == null ? void 0 : _a.getState()
   };
 });

package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -8,7 +8,10 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       const { ssrContext, renderLevel } = options;
-      const { request } = ssrContext;
+      const { request, enableUnsafeCtx } = ssrContext;
+      const unsafeContext = {
+        headers: request.headers
+      };
       const SSRData = {
         context: {
           request: {
@@ -17,8 +20,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
             pathname: request.pathname,
             host: request.host,
             url: request.url,
-            headers: request.headers,
-            cookieMap: request.cookieMap
+            ...enableUnsafeCtx ? unsafeContext : {}
           }
         },
         renderLevel
@@ -26,7 +28,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       return `
       <script>window._SSR_DATA = ${serialize(SSRData, {
         isJSON: true
-      })}<\/script>
+      })}</script>
       `;
     }
   }

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -12,6 +12,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const helmetData = ReactHelmet.renderStatic();
       return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
     },
+    // @TODO: prefetch scripts of lazy component
     injectCss
   ];
   const [headTemplate = ""] = beforeEntryTemplate.match(HEAD_REG_EXP) || [];

package/dist/esm-node/ssr/serverRender/renderToString/entry.js

@@ -13,7 +13,10 @@ import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
 const buildTemplateData = (context, data, renderLevel) => {
-  const { request } = context;
+  const { request, enableUnsafeCtx } = context;
+  const unsafeContext = {
+    headers: request.headers
+  };
   return {
     data,
     context: {
@@ -23,8 +26,7 @@ const buildTemplateData = (context, data, renderLevel) => {
         pathname: request.pathname,
         host: request.host,
         url: request.url,
-        headers: request.headers,
-        cookieMap: request.cookieMap
+        ...enableUnsafeCtx ? unsafeContext : {}
       }
     },
     renderLevel
@@ -138,7 +140,7 @@ class Entry {
       SSRDataScript: `
         <script>window._SSR_DATA = ${serialize(templateData, {
         isJSON: true
-      })}<\/script>
+      })}</script>
       `
     };
   }

package/dist/esm-node/ssr/serverRender/renderToString/loadable.js

@@ -36,7 +36,7 @@ const toHtml = (jsx, renderer, next) => {
       }
       chunksMap[fileType] += `<script src="${v.url}" ${props.join(
         " "
-      )}><\/script>`;
+      )}></script>`;
     } else if (fileType === "css") {
       chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
     }

package/dist/esm-node/ssr/serverRender/time.worker.js

@@ -1,5 +1,5 @@
 function processHrtime(previousTimestamp) {
-  const now = new Date().getTime();
+  const now = (/* @__PURE__ */ new Date()).getTime();
   const clocktime = now * 1e-3;
   let seconds = Math.floor(clocktime);
   let nanoseconds = Math.floor(clocktime % 1 * 1e9);

package/dist/esm-node/ssr/serverRender/utils.js

@@ -4,7 +4,7 @@ function getLoadableScripts(extractor) {
   if (!check(scripts)) {
     return "";
   }
-  return scripts.split("<\/script>").slice(0, 2).map((i) => `${i}<\/script>`).join("");
+  return scripts.split("</script>").slice(0, 2).map((i) => `${i}</script>`).join("");
 }
 export {
   getLoadableScripts

package/dist/esm-node/ssr/utils.js

@@ -1,3 +1,4 @@
+import cookieTool from "cookie";
 const isReact18 = () => process.env.IS_REACT18 === "true";
 const formatServer = (request) => {
   const {
@@ -7,6 +8,7 @@ const formatServer = (request) => {
   } = request.headers || {};
   return {
     cookie,
+    cookieMap: cookieTool.parse(cookie || "") || {},
     userAgent,
     referer,
     ...request
@@ -20,15 +22,15 @@ const getQuery = () => window.location.search.substring(1).split("&").reduce((re
   return res;
 }, {});
 const formatClient = (request) => {
-  var _a, _b;
+  var _a;
   return {
     params: request.params || {},
     host: request.host || location.host,
     pathname: request.pathname || location.pathname,
     headers: request.headers || {},
-    cookieMap: request.cookieMap || {},
-    cookie: ((_a = request.headers) == null ? void 0 : _a.cookie) || document.cookie,
-    userAgent: ((_b = request.headers) == null ? void 0 : _b["user-agent"]) || navigator.userAgent,
+    cookieMap: cookieTool.parse(document.cookie || "") || {},
+    cookie: document.cookie || "",
+    userAgent: ((_a = request.headers) == null ? void 0 : _a["user-agent"]) || navigator.userAgent,
     referer: request.referer || document.referrer,
     query: request.query || getQuery(),
     url: location.href

package/dist/esm-node/state/runtime/plugin.js

@@ -42,13 +42,7 @@ const state = (config) => ({
       hoc({ App }, next) {
         const getStateApp = (props) => {
           const context = useContext(RuntimeReactContext);
-          return /* @__PURE__ */ jsx(Provider, {
-            store: context.store,
-            config: storeConfig,
-            children: /* @__PURE__ */ jsx(App, {
-              ...props
-            })
-          });
+          return /* @__PURE__ */ jsx(Provider, { store: context.store, config: storeConfig, children: /* @__PURE__ */ jsx(App, { ...props }) });
         };
         return next({
           App: hoistNonReactStatics(getStateApp, App)

package/dist/types/ssr/serverRender/renderToString/type.d.ts

@@ -10,6 +10,7 @@ export type SSRServerContext = BaseSSRServerContext & {
   request: BaseSSRServerContext['request'] & {
     userAgent: string;
     cookie: string;
+    cookieMap: Record<string, string>;
   };
 };
 export interface RenderEntry {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.0",
+  "version": "2.6.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -133,6 +133,7 @@
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
     "@babel/types": "^7.18.0",
+    "cookie": "0.5.0",
     "@loadable/babel-plugin": "^5.13.2",
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.1",
@@ -159,15 +160,16 @@
     "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
     "esbuild": "0.15.7",
-    "@modern-js/plugin": "2.5.0",
-    "@modern-js/types": "2.5.0",
-    "@modern-js/utils": "2.5.0"
+    "@modern-js/plugin": "2.6.0",
+    "@modern-js/types": "2.6.0",
+    "@modern-js/utils": "2.6.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
+    "@types/cookie": "0.5.1",
     "@remix-run/web-fetch": "^4.1.3",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
@@ -182,11 +184,11 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.5.0",
-    "@modern-js/core": "2.5.0",
-    "@modern-js/server-core": "2.5.0",
-    "@scripts/jest-config": "2.5.0",
-    "@scripts/build": "2.5.0"
+    "@modern-js/app-tools": "2.6.0",
+    "@modern-js/core": "2.6.0",
+    "@modern-js/server-core": "2.6.0",
+    "@scripts/build": "2.6.0",
+    "@scripts/jest-config": "2.6.0"
   },
   "sideEffects": false,
   "modernConfig": {},

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

@@ -1,67 +0,0 @@
-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 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 = async (App, context) => {
-  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 = await 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/cjs/ssr/serverRender/renderToStream/index.worker.js

@@ -1,64 +0,0 @@
-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/cjs/ssr/serverRender/renderToString/index.worker.js

@@ -1,58 +0,0 @@
-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_prerender = require("../../react/prerender");
-var import_time = require("../time");
-var import_entry = __toESM(require("./entry"));
-const render = async ({
-  App,
-  context,
-  config
-}) => {
-  const ssrContext = context.ssrContext;
-  const entry = new import_entry.default({
-    ctx: ssrContext,
-    App,
-    config
-  });
-  entry.metrics.emitCounter("app.visit.count", 1);
-  const end = (0, import_time.time)();
-  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);
-  const cacheConfig = import_prerender.PreRender.config();
-  if (cacheConfig) {
-    context.ssrContext.cacheConfig = cacheConfig;
-  }
-  return html;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  render
-});