@modern-js/runtime 2.5.0 → 2.6.0

package/dist/esm/router/cli/index.js

@@ -50,13 +50,9 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-var isV5 = function(config) {
-    var _config_runtime, _config_runtime_router;
-    return (config === null || config === void 0 ? void 0 : (_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : (_config_runtime_router = _config_runtime.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
-};
 var cli_default = function() {
     return {
         name: "@modern-js/plugin-router",

package/dist/esm/ssr/prefetch.js

@@ -182,6 +182,7 @@ var prefetch = function() {
                                         loadersData: loadersData,
                                         initialData: context.initialData,
                                         i18nData: context.__i18nData__,
+                                        // todo: move to plugin state
                                         storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
                                     }
                                 ];

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

@@ -1,3 +1,31 @@
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
 import serialize from "serialize-javascript";
 import { buildTemplate } from "./buildTemplate.share";
 function buildShellAfterTemplate(afterAppTemplate, options) {
@@ -6,18 +34,19 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
         return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
         function buildSSRDataScript() {
             var ssrContext = options.ssrContext, renderLevel = options.renderLevel;
-            var request = ssrContext.request;
+            var request = ssrContext.request, enableUnsafeCtx = ssrContext.enableUnsafeCtx;
+            var unsafeContext = {
+                headers: request.headers
+            };
             var SSRData = {
                 context: {
-                    request: {
+                    request: _objectSpread({
                         params: request.params,
                         query: request.query,
                         pathname: request.pathname,
                         host: request.host,
-                        url: request.url,
-                        headers: request.headers,
-                        cookieMap: request.cookieMap
-                    }
+                        url: request.url
+                    }, enableUnsafeCtx ? unsafeContext : {})
                 },
                 renderLevel: renderLevel
             };

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

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

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

@@ -59,6 +59,21 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -167,19 +182,20 @@ import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
 var buildTemplateData = function(context, data, renderLevel) {
-    var request = context.request;
+    var request = context.request, enableUnsafeCtx = context.enableUnsafeCtx;
+    var unsafeContext = {
+        headers: request.headers
+    };
     return {
         data: data,
         context: {
-            request: {
+            request: _objectSpread({
                 params: request.params,
                 query: request.query,
                 pathname: request.pathname,
                 host: request.host,
-                url: request.url,
-                headers: request.headers,
-                cookieMap: request.cookieMap
-            }
+                url: request.url
+            }, enableUnsafeCtx ? unsafeContext : {})
         },
         renderLevel: renderLevel
     };

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

@@ -45,7 +45,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 function processHrtime(previousTimestamp) {
-    var now = new Date().getTime();
+    var now = /* @__PURE__ */ new Date().getTime();
     var clocktime = now * 1e-3;
     var seconds = Math.floor(clocktime);
     var nanoseconds = Math.floor(clocktime % 1 * 1e9);

package/dist/esm/ssr/utils.js

@@ -72,6 +72,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
+import cookieTool from "cookie";
 var isReact18 = function() {
     return process.env.IS_REACT18 === "true";
 };
@@ -79,6 +80,7 @@ var formatServer = function(request) {
     var _ref = request.headers || {}, _ref_cookie = _ref.cookie, cookie = _ref_cookie === void 0 ? "" : _ref_cookie, tmp = _ref["user-agent"], userAgent = tmp === void 0 ? "" : tmp, referer = _ref.referer;
     return _objectSpread({
         cookie: cookie,
+        cookieMap: cookieTool.parse(cookie || "") || {},
         userAgent: userAgent,
         referer: referer
     }, request);
@@ -93,15 +95,15 @@ var getQuery = function() {
     }, {});
 };
 var formatClient = function(request) {
-    var _request_headers, _request_headers1;
+    var _request_headers;
     return {
         params: request.params || {},
         host: request.host || location.host,
         pathname: request.pathname || location.pathname,
         headers: request.headers || {},
-        cookieMap: request.cookieMap || {},
-        cookie: ((_request_headers = request.headers) === null || _request_headers === void 0 ? void 0 : _request_headers.cookie) || document.cookie,
-        userAgent: ((_request_headers1 = request.headers) === null || _request_headers1 === void 0 ? void 0 : _request_headers1["user-agent"]) || navigator.userAgent,
+        cookieMap: cookieTool.parse(document.cookie || "") || {},
+        cookie: document.cookie || "",
+        userAgent: ((_request_headers = request.headers) === null || _request_headers === void 0 ? void 0 : _request_headers["user-agent"]) || navigator.userAgent,
         referer: request.referer || document.referrer,
         query: request.query || getQuery(),
         url: location.href

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

@@ -24,6 +24,11 @@ var cli_default = () => ({
           runtimeByEntries: {},
           source: {
             alias: {
+              /**
+               * twin.macro inserts styled-components into the code during the compilation process
+               * But it will not be installed under the user project.
+               * So need to add alias
+               */
               "styled-components": require.resolve("styled-components")
             },
             globalVars: {

package/dist/esm-node/core/app-config.js

@@ -1,5 +1,9 @@
 const APP_CONFIG_SYMBOL = "config";
-const getConfig = (Component) => Component[APP_CONFIG_SYMBOL];
+const getConfig = (Component) => (
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  Component[APP_CONFIG_SYMBOL]
+);
 const defineConfig = (Component, config) => {
   Component[APP_CONFIG_SYMBOL] = config;
   return Component;

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

@@ -58,12 +58,7 @@ const createApp = ({ plugins }) => {
                 }
               );
             }
-            return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, {
-              value: contextValue,
-              children: /* @__PURE__ */ jsx(App2, {
-                ...props
-              })
-            });
+            return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx(App2, { ...props }) });
           };
           return hoistNonReactStatics(WrapComponent, App2);
         }
@@ -190,12 +185,14 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         {},
         {
           skipNonStatic: id.staticGenerate,
+          // if not static generate, only non-static loader can exec on prod env
           skipStatic: process.env.NODE_ENV === "production" && !id.staticGenerate
         }
       )
     });
     const isRedirectResponse = (result) => {
-      if (typeof Response !== "undefined" && result instanceof Response && result.status >= 300 && result.status <= 399) {
+      if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
+      result instanceof Response && result.status >= 300 && result.status <= 399) {
         const { status } = result;
         const redirectUrl = result.headers.get("Location") || "/";
         const { ssrContext } = context;

package/dist/esm-node/core/loader/loaderManager.js

@@ -59,6 +59,7 @@ const createLoader = (id, initialData = {
     reloading: hasLoaded && status === 1 /* loading */,
     data,
     error: error instanceof Error ? `${error.message}` : error,
+    // redundant fields for ssr log
     _error: error
   });
   const notify = () => {
@@ -99,6 +100,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
         id,
         typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : { data: loaderOptions.initialData },
         loaderFn,
+        // Todo whether static loader is exec when CSR
         skipExec
       );
       loadersMap.set(id, loader);

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

@@ -9,14 +9,12 @@ import { DefaultRoot } from "./Root";
 function Body(props) {
   const { hasSetRoot } = useContext(DocumentStructureContext);
   const { children } = props;
-  return /* @__PURE__ */ jsxs("body", {
-    children: [
-      hasSetRoot ? null : /* @__PURE__ */ jsx(DefaultRoot, {}),
-      children,
-      `${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
-      `${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
-    ]
-  });
+  return /* @__PURE__ */ jsxs("body", { children: [
+    hasSetRoot ? null : /* @__PURE__ */ jsx(DefaultRoot, {}),
+    children,
+    `${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
+    `${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
+  ] });
 }
 export {
   Body

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

@@ -7,19 +7,15 @@ import { DOCUMENT_META_PLACEHOLDER } from "./constants";
 function Head(props) {
   const { hasSetScripts, hasSetLinks } = useContext(DocumentStructureContext);
   const { children } = props;
-  return /* @__PURE__ */ jsxs("head", {
-    children: [
-      `${DOCUMENT_META_PLACEHOLDER}`,
-      !hasSetLinks && /* @__PURE__ */ jsx(Links, {}),
-      !hasSetScripts && /* @__PURE__ */ jsx(Scripts, {}),
-      children
-    ]
-  });
+  return /* @__PURE__ */ jsxs("head", { children: [
+    `${DOCUMENT_META_PLACEHOLDER}`,
+    !hasSetLinks && /* @__PURE__ */ jsx(Links, {}),
+    !hasSetScripts && /* @__PURE__ */ jsx(Scripts, {}),
+    children
+  ] });
 }
 function DefaultHead() {
-  return /* @__PURE__ */ jsx("head", {
-    children: `${DOCUMENT_META_PLACEHOLDER}`
-  });
+  return /* @__PURE__ */ jsx("head", { children: `${DOCUMENT_META_PLACEHOLDER}` });
 }
 export {
   DefaultHead,

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

@@ -34,29 +34,31 @@ function Html(props) {
   const notMissMustChild = [
     hasSetHead,
     hasSetBody
+    // hasSetScripts,
+    // hasSetRoot,
   ].every((item) => item);
   if (!notMissMustChild) {
-    return /* @__PURE__ */ jsx("html", {
-      children: /* @__PURE__ */ jsxs("body", {
-        style: { color: "red" },
-        children: [
-          `Miss the `,
-          [
-            hasSetHead,
-            hasSetBody
-          ].map((item, index) => {
-            return item ? null : [
-              "Head",
-              "Body"
-            ][index];
-          }),
-          ` Element`
-        ]
-      })
-    });
+    return /* @__PURE__ */ jsx("html", { children: /* @__PURE__ */ jsxs("body", { style: { color: "red" }, children: [
+      `Miss the `,
+      [
+        hasSetHead,
+        hasSetBody
+        // hasSetScripts,
+        // hasSetRoot,
+      ].map((item, index) => {
+        return item ? null : [
+          "Head",
+          "Body"
+          // 'Scripts',
+          // 'Root',
+        ][index];
+      }),
+      ` Element`
+    ] }) });
   }
-  return /* @__PURE__ */ jsx("html", {
-    children: /* @__PURE__ */ jsxs(DocumentStructureContext.Provider, {
+  return /* @__PURE__ */ jsx("html", { children: /* @__PURE__ */ jsxs(
+    DocumentStructureContext.Provider,
+    {
       value: {
         hasSetHead,
         hasSetScripts,
@@ -70,8 +72,8 @@ function Html(props) {
         !hasSetBody && /* @__PURE__ */ jsx(Body, {}),
         children
       ]
-    })
-  });
+    }
+  ) });
 }
 export {
   Html

package/dist/esm-node/document/Links.js

@@ -1,9 +1,7 @@
 import { Fragment, jsx } from "react/jsx-runtime";
 import { DOCUMENT_LINKS_PLACEHOLDER } from "./constants";
 function Links() {
-  return /* @__PURE__ */ jsx(Fragment, {
-    children: DOCUMENT_LINKS_PLACEHOLDER
-  });
+  return /* @__PURE__ */ jsx(Fragment, { children: DOCUMENT_LINKS_PLACEHOLDER });
 }
 export {
   Links

package/dist/esm-node/document/Root.js

@@ -7,25 +7,19 @@ function Root(props) {
   const {
     templateParams: { mountId = "root" }
   } = useContext(DocumentContext);
-  return /* @__PURE__ */ jsxs("div", {
-    id: `${rootId || mountId}`,
-    children: [
-      `${DOCUMENT_SSR_PLACEHOLDER}`,
-      children
-    ]
-  });
+  return /* @__PURE__ */ jsxs("div", { id: `${rootId || mountId}`, children: [
+    `${DOCUMENT_SSR_PLACEHOLDER}`,
+    children
+  ] });
 }
 function DefaultRoot(props) {
   const {
     templateParams: { mountId = "root" }
   } = useContext(DocumentContext);
-  return /* @__PURE__ */ jsxs("div", {
-    id: `${mountId}`,
-    children: [
-      `${DOCUMENT_SSR_PLACEHOLDER}`,
-      props.children
-    ]
-  });
+  return /* @__PURE__ */ jsxs("div", { id: `${mountId}`, children: [
+    `${DOCUMENT_SSR_PLACEHOLDER}`,
+    props.children
+  ] });
 }
 export {
   DefaultRoot,

package/dist/esm-node/document/Script.js

@@ -7,13 +7,11 @@ function Script(props) {
   const { content } = props;
   const contentStr = content.toString();
   const contentIIFE = encodeURIComponent(`(${contentStr})()`);
-  return /* @__PURE__ */ jsxs(Fragment, {
-    children: [
-      `${DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
-      `${contentIIFE}`,
-      `${DOCUMENT_SCRIPT_PLACEHOLDER_END}`
-    ]
-  });
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    `${DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
+    `${contentIIFE}`,
+    `${DOCUMENT_SCRIPT_PLACEHOLDER_END}`
+  ] });
 }
 export {
   Script

package/dist/esm-node/document/Scripts.js

@@ -1,9 +1,7 @@
 import { Fragment, jsx } from "react/jsx-runtime";
 import { DOCUMENT_SCRIPTS_PLACEHOLDER } from "./constants";
 function Scripts() {
-  return /* @__PURE__ */ jsx(Fragment, {
-    children: `${DOCUMENT_SCRIPTS_PLACEHOLDER}`
-  });
+  return /* @__PURE__ */ jsx(Fragment, { children: `${DOCUMENT_SCRIPTS_PLACEHOLDER}` });
 }
 export {
   Scripts

package/dist/esm-node/document/cli/index.js

@@ -60,7 +60,7 @@ var cli_default = () => ({
       }
       return async ({ htmlWebpackPlugin }) => {
         const documentParams = getDocParams({
-          config: api.useConfigContext(),
+          config: api.useResolvedConfigContext(),
           entryName,
           templateParameters
         });
@@ -91,6 +91,7 @@ var cli_default = () => ({
           entryPoints: [documentFilePath],
           outfile: htmlOutputFile,
           platform: "node",
+          // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
           tsconfig: tempTsConfigFile,
           target: "es6",
           loader: {
@@ -147,7 +148,7 @@ var cli_default = () => ({
               `${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`,
               "g"
             ),
-            (_scriptStr, $1) => `<script>${decodeURIComponent($1)}<\/script>`
+            (_scriptStr, $1) => `<script>${decodeURIComponent($1)}</script>`
           );
         }
         const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(
@@ -173,6 +174,7 @@ var cli_default = () => ({
               ) : { ...options == null ? void 0 : options.templateParameters };
               const templateContent = documentEntry(
                 entry.entryName,
+                // options,
                 hackParameters
               );
               const documentHtmlOptions = templateContent ? {

package/dist/esm-node/router/cli/index.js

@@ -1,14 +1,11 @@
 import {
   getEntryOptions,
   createRuntimeExportsUtils,
-  PLUGIN_SCHEMAS
+  PLUGIN_SCHEMAS,
+  isRouterV5 as isV5
 } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-const isV5 = (config) => {
-  var _a, _b;
-  return ((_b = (_a = config == null ? void 0 : config.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.mode) === "react-router-5";
-};
 var cli_default = () => ({
   name: "@modern-js/plugin-router",
   required: ["@modern-js/runtime"],

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

@@ -1,14 +1,17 @@
 import { jsx } from "react/jsx-runtime";
-const DefaultNotFound = () => /* @__PURE__ */ jsx("div", {
-  style: {
-    margin: "150px auto",
-    textAlign: "center",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center"
-  },
-  children: "404"
-});
+const DefaultNotFound = () => /* @__PURE__ */ jsx(
+  "div",
+  {
+    style: {
+      margin: "150px auto",
+      textAlign: "center",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center"
+    },
+    children: "404"
+  }
+);
 export {
   DefaultNotFound
 };

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

@@ -56,12 +56,7 @@ const routerPlugin = ({
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               const router = supportHtml5History ? createBrowserRouter(routes, { basename: _basename }) : createHashRouter(routes, { basename: _basename });
-              return /* @__PURE__ */ jsx(App, {
-                ...props,
-                children: /* @__PURE__ */ jsx(RouterProvider, {
-                  router
-                })
-              });
+              return /* @__PURE__ */ jsx(App, { ...props, children: /* @__PURE__ */ jsx(RouterProvider, { router }) });
             };
           };
           const RouteApp = getRouteApp();

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

@@ -109,21 +109,24 @@ const routerPlugin = ({
                 data,
                 { isJSON: true }
               )};`;
-              return /* @__PURE__ */ jsxs(App, {
-                ...props,
-                children: [
-                  /* @__PURE__ */ jsx(StaticRouterProvider, {
+              return /* @__PURE__ */ jsxs(App, { ...props, children: [
+                /* @__PURE__ */ jsx(
+                  StaticRouterProvider,
+                  {
                     router,
                     context: routerContext,
                     hydrate: false
-                  }),
-                  /* @__PURE__ */ jsx("script", {
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  "script",
+                  {
                     suppressHydrationWarning: true,
                     id: "the-nonce",
                     dangerouslySetInnerHTML: { __html: hydrateScript }
-                  })
-                ]
-              });
+                  }
+                )
+              ] });
             };
           };
           const RouteApp = getRouteApp();