@modern-js/runtime 2.26.0 → 2.28.0

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

@@ -21,148 +21,148 @@ export const getDocumenByEntryName = function(entrypoints, entryName, fallbackDi
   ]);
   return docFile || void 0;
 };
-export const documentPlugin = () => {
-  return {
-    name: "@modern-js/plugin-document",
-    pre: [
-      "@modern-js/plugin-analyze"
-    ],
-    setup: async (api) => {
-      function getDocParams(params) {
-        const { config, templateParameters, entryName } = params;
-        return {
-          processEnv: process.env,
-          config: {
-            output: config.output
-          },
-          entryName,
-          templateParams: templateParameters
-        };
+export const documentPlugin = () => ({
+  name: "@modern-js/plugin-document",
+  pre: [
+    "@modern-js/plugin-analyze"
+  ],
+  setup: async (api) => {
+    function getDocParams(params) {
+      const { config, templateParameters, entryName } = params;
+      return {
+        processEnv: process.env,
+        config: {
+          output: config.output
+        },
+        entryName,
+        templateParams: templateParameters
+      };
+    }
+    const documentEntry = (entryName, templateParameters) => {
+      const { entrypoints, internalDirectory, appDirectory } = api.useAppContext();
+      const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
+      if (!documentFilePath) {
+        return null;
       }
-      const documentEntry = (entryName, templateParameters) => {
-        const { entrypoints, internalDirectory, appDirectory } = api.useAppContext();
-        const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
-        if (!documentFilePath) {
-          return null;
+      return async ({ htmlWebpackPlugin }) => {
+        var _tsConfig;
+        const config = api.useResolvedConfigContext();
+        const documentParams = getDocParams({
+          config,
+          entryName,
+          templateParameters
+        });
+        const tempTsConfigFile = path.join(internalDirectory, `./document/_tempTsconfig.json`);
+        const userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
+        let tsConfig;
+        try {
+          tsConfig = await require(userTsConfigFilePath);
+        } catch (err) {
+          tsConfig = {};
         }
-        return async ({ htmlWebpackPlugin }) => {
-          const config = api.useResolvedConfigContext();
-          const documentParams = getDocParams({
-            config,
-            entryName,
-            templateParameters
-          });
-          const tempTsConfigFile = path.join(internalDirectory, `./document/_tempTsconfig.json`);
-          const userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
-          let tsConfig;
-          try {
-            tsConfig = await require(userTsConfigFilePath);
-          } catch (err) {
-            tsConfig = {};
-          }
-          if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) {
-            tsConfig.compilerOptions.jsx = "react-jsx";
-          } else {
-            tsConfig.compilerOptions = {
-              jsx: "react-jsx"
-            };
-          }
-          fs.outputFileSync(tempTsConfigFile, JSON.stringify(tsConfig));
-          const htmlOutputFile = path.join(internalDirectory, `./document/_${entryName}.html.js`);
-          await build({
-            entryPoints: [
-              documentFilePath
-            ],
-            outfile: htmlOutputFile,
-            platform: "node",
-            // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
-            tsconfig: tempTsConfigFile,
-            target: "es6",
-            loader: {
-              ".ts": "ts",
-              ".tsx": "tsx"
-            },
-            bundle: true,
-            plugins: [
-              {
-                name: "make-all-packages-external",
-                setup(build2) {
-                  build2.onResolve({
-                    filter: /^[^./]|^\.[^./]|^\.\.[^/]/
-                  }, (args) => {
-                    let external = true;
-                    if (args.kind === "entry-point") {
-                      external = false;
-                    }
-                    return {
-                      path: args.path,
-                      external
-                    };
-                  });
-                }
-              }
-            ]
-          });
-          delete require.cache[require.resolve(htmlOutputFile)];
-          const Document = (await require(htmlOutputFile)).default;
-          const HTMLElement = React.createElement(DocumentContext.Provider, {
-            value: documentParams
-          }, React.createElement(Document, null));
-          let html = ReactDomServer.renderToStaticMarkup(HTMLElement);
-          debug("entry %s's document jsx rendered html: %o", entryName, html);
-          const scripts = [
-            htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
-            htmlWebpackPlugin.tags.bodyTags.toString()
-          ].join("");
-          const links = [
-            htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
-          ].join("");
-          const metas = [
-            templateParameters.meta,
-            htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script" && item.tagName !== "link").join("")
-          ].join("");
-          if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
-            const { nonce } = config.security;
-            const nonceAttr = nonce ? `nonce=${nonce}` : "";
-            html = html.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script ${nonceAttr}>${decodeURIComponent($1)}</script>`);
-          }
-          if (html.includes(DOCUMENT_STYLE_PLACEHOLDER_START) && html.includes(DOCUMENT_STYLE_PLACEHOLDER_END)) {
-            html = html.replace(new RegExp(`${DOCUMENT_STYLE_PLACEHOLDER_START}(.*?)${DOCUMENT_STYLE_PLACEHOLDER_END}`, "g"), (_styleStr, $1) => `<style>${decodeURIComponent($1)}</style>`);
-          }
-          if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
-            html = html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
-          }
-          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(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
-          return finalHtml;
-        };
-      };
-      return {
-        config: () => {
-          return {
-            tools: {
-              htmlPlugin: (options, entry) => {
-                const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
-                  ...options === null || options === void 0 ? void 0 : options.templateParameters
-                };
-                const templateContent = documentEntry(
-                  entry.entryName,
-                  // options,
-                  hackParameters
-                );
-                const documentHtmlOptions = templateContent ? {
-                  templateContent,
-                  inject: false
-                } : {};
-                return {
-                  ...options,
-                  ...documentHtmlOptions
-                };
+        if ((_tsConfig = tsConfig) === null || _tsConfig === void 0 ? void 0 : _tsConfig.compilerOptions) {
+          tsConfig.compilerOptions.jsx = "react-jsx";
+        } else {
+          tsConfig.compilerOptions = {
+            jsx: "react-jsx"
+          };
+        }
+        fs.outputFileSync(tempTsConfigFile, JSON.stringify(tsConfig));
+        const htmlOutputFile = path.join(internalDirectory, `./document/_${entryName}.html.js`);
+        await build({
+          entryPoints: [
+            documentFilePath
+          ],
+          outfile: htmlOutputFile,
+          platform: "node",
+          // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
+          tsconfig: tempTsConfigFile,
+          target: "es6",
+          loader: {
+            ".ts": "ts",
+            ".tsx": "tsx"
+          },
+          bundle: true,
+          plugins: [
+            {
+              name: "make-all-packages-external",
+              setup(build2) {
+                build2.onResolve({
+                  filter: /^[^./]|^\.[^./]|^\.\.[^/]/
+                }, (args) => {
+                  let external = true;
+                  if (args.kind === "entry-point") {
+                    external = false;
+                  }
+                  return {
+                    path: args.path,
+                    external
+                  };
+                });
               }
             }
-          };
+          ]
+        });
+        delete require.cache[require.resolve(htmlOutputFile)];
+        const Document = (await require(htmlOutputFile)).default;
+        const HTMLElement = React.createElement(DocumentContext.Provider, {
+          value: documentParams
+        }, React.createElement(Document, null));
+        let html = ReactDomServer.renderToStaticMarkup(HTMLElement);
+        debug("entry %s's document jsx rendered html: %o", entryName, html);
+        const scripts = [
+          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
+          htmlWebpackPlugin.tags.bodyTags.toString()
+        ].join("");
+        const links = [
+          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
+        ].join("");
+        const metas = [
+          templateParameters.meta,
+          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script" && item.tagName !== "link").join("")
+        ].join("");
+        if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
+          const { nonce } = config.security;
+          const nonceAttr = nonce ? `nonce=${nonce}` : "";
+          html = html.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script ${nonceAttr}>${decodeURIComponent($1)}</script>`);
+        }
+        if (html.includes(DOCUMENT_STYLE_PLACEHOLDER_START) && html.includes(DOCUMENT_STYLE_PLACEHOLDER_END)) {
+          html = html.replace(new RegExp(`${DOCUMENT_STYLE_PLACEHOLDER_START}(.*?)${DOCUMENT_STYLE_PLACEHOLDER_END}`, "g"), (_styleStr, $1) => `<style>${decodeURIComponent($1)}</style>`);
+        }
+        if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
+          html = html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
         }
+        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(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
+        return finalHtml;
       };
-    }
-  };
-};
+    };
+    return {
+      config: () => {
+        return {
+          tools: {
+            htmlPlugin: (options, entry) => {
+              var _options, _options1, _options2;
+              const hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : {
+                ...(_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters
+              };
+              const templateContent = documentEntry(
+                entry.entryName,
+                // options,
+                hackParameters
+              );
+              const documentHtmlOptions = templateContent ? {
+                templateContent,
+                inject: false
+              } : {};
+              return {
+                ...options,
+                ...documentHtmlOptions
+              };
+            }
+          }
+        };
+      }
+    };
+  }
+});
 export default documentPlugin;

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

@@ -1,102 +1,101 @@
 import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-export const routerPlugin = () => {
-  return {
-    name: "@modern-js/plugin-router",
-    required: [
-      "@modern-js/runtime"
-    ],
-    setup: (api) => {
-      const runtimeConfigMap = /* @__PURE__ */ new Map();
-      let pluginsExportsUtils;
-      return {
-        config() {
-          const appContext = api.useAppContext();
-          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
-          return {
-            source: {
-              include: [
-                // react-router v6 is no longer support ie 11
-                // so we need to compile these packages to ensure the compatibility
-                // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
-                /node_modules\/react-router/,
-                /node_modules\/react-router-dom/,
-                /node_modules\/@remix-run\/router/
-              ],
-              alias: {
-                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-              }
+export const routerPlugin = () => ({
+  name: "@modern-js/plugin-router",
+  required: [
+    "@modern-js/runtime"
+  ],
+  setup: (api) => {
+    const runtimeConfigMap = /* @__PURE__ */ new Map();
+    let pluginsExportsUtils;
+    return {
+      config() {
+        const appContext = api.useAppContext();
+        pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+        return {
+          source: {
+            include: [
+              // react-router v6 is no longer support ie 11
+              // so we need to compile these packages to ensure the compatibility
+              // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
+              /node_modules\/react-router/,
+              /node_modules\/react-router-dom/,
+              /node_modules\/@remix-run\/router/
+            ],
+            alias: {
+              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }
-          };
-        },
-        validateSchema() {
-          return [
-            {
-              target: "runtime.router",
-              schema: {
-                type: [
-                  "boolean",
-                  "object"
-                ]
-              }
-            }
-          ];
-        },
-        modifyEntryImports({ entrypoint, imports }) {
-          const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
-          const userConfig = api.useResolvedConfigContext();
-          const { packageName } = api.useAppContext();
-          const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-          runtimeConfigMap.set(entryName, runtimeConfig);
-          if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
-            if (!isV5(userConfig)) {
-              imports.push({
-                value: "@modern-js/runtime/plugins",
-                specifiers: [
-                  {
-                    imported: PLUGIN_IDENTIFIER
-                  }
-                ]
-              });
-            }
-          } else if (fileSystemRoutes) {
-            throw new Error(`should enable runtime.router for entry ${entryName}`);
           }
-          return {
-            entrypoint,
-            imports
-          };
-        },
-        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-          const { entryName, fileSystemRoutes } = entrypoint;
-          const { serverRoutes } = api.useAppContext();
-          const userConfig = api.useResolvedConfigContext();
-          const runtimeConfig = runtimeConfigMap.get(entryName);
-          if (runtimeConfig.router && !isV5(userConfig)) {
-            const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
-            plugins.push({
-              name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify({
-                serverBase,
-                ...runtimeConfig.router,
-                routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
-              }).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
-            });
+        };
+      },
+      validateSchema() {
+        return [
+          {
+            target: "runtime.router",
+            schema: {
+              type: [
+                "boolean",
+                "object"
+              ]
+            }
           }
-          return {
-            entrypoint,
-            plugins
-          };
-        },
-        addRuntimeExports() {
-          const userConfig = api.useResolvedConfigContext();
+        ];
+      },
+      modifyEntryImports({ entrypoint, imports }) {
+        var _runtimeConfig;
+        const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
+        const userConfig = api.useResolvedConfigContext();
+        const { packageName } = api.useAppContext();
+        const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+        runtimeConfigMap.set(entryName, runtimeConfig);
+        if ((_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) {
           if (!isV5(userConfig)) {
-            pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+            imports.push({
+              value: "@modern-js/runtime/plugins",
+              specifiers: [
+                {
+                  imported: PLUGIN_IDENTIFIER
+                }
+              ]
+            });
           }
+        } else if (fileSystemRoutes) {
+          throw new Error(`should enable runtime.router for entry ${entryName}`);
+        }
+        return {
+          entrypoint,
+          imports
+        };
+      },
+      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+        const { entryName, fileSystemRoutes } = entrypoint;
+        const { serverRoutes } = api.useAppContext();
+        const userConfig = api.useResolvedConfigContext();
+        const runtimeConfig = runtimeConfigMap.get(entryName);
+        if (runtimeConfig.router && !isV5(userConfig)) {
+          const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
+          plugins.push({
+            name: PLUGIN_IDENTIFIER,
+            options: JSON.stringify({
+              serverBase,
+              ...runtimeConfig.router,
+              routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
+            }).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+          });
+        }
+        return {
+          entrypoint,
+          plugins
+        };
+      },
+      addRuntimeExports() {
+        const userConfig = api.useResolvedConfigContext();
+        if (!isV5(userConfig)) {
+          pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
         }
-      };
-    }
-  };
-};
+      }
+    };
+  }
+});
 export default routerPlugin;

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

@@ -8,6 +8,7 @@ const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DA
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
 const DeferredDataScripts = (props) => {
+  var _props;
   const context = useContext(DataRouterContext);
   const { staticContext } = context || {};
   const hydratedRef = useRef(false);
@@ -35,8 +36,9 @@ const DeferredDataScripts = (props) => {
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseStr = deferredKeys.map((key) => {
         if (pendingKeys.has(key)) {
+          var _props2;
           deferredDataScripts.push(/* @__PURE__ */ _jsx(DeferredDataScript, {
-            nonce: props === null || props === void 0 ? void 0 : props.nonce,
+            nonce: (_props2 = props) === null || _props2 === void 0 ? void 0 : _props2.nonce,
             data: deferredData.data[key],
             dataKey: key,
             routeId
@@ -72,7 +74,7 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ _jsx("script", {
         async: true,
-        nonce: props === null || props === void 0 ? void 0 : props.nonce,
+        nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
           __html: deferredScripts[0]

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

@@ -4,7 +4,8 @@ import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches,
 import { RuntimeReactContext } from "../../core";
 export function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
-    theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
+    var _theirHandler;
+    (_theirHandler = theirHandler) === null || _theirHandler === void 0 ? void 0 : _theirHandler(event);
     if (!event.defaultPrevented) {
       ourHandler(event);
     }
@@ -70,7 +71,8 @@ async function loadRouteModule(route, routeAssets) {
   }
   try {
     await Promise.all(chunkIds.map((chunkId) => {
-      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
+      var __webpack_chunk_load__1;
+      return (__webpack_chunk_load__1 = __webpack_chunk_load__) === null || __webpack_chunk_load__1 === void 0 ? void 0 : __webpack_chunk_load__1(String(chunkId));
     }));
   } catch (error) {
     console.error(error);
@@ -104,7 +106,8 @@ const PrefetchPageLinks = ({ pathname }) => {
   const { routeAssets } = routeManifest || {};
   const matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
+    var _matches;
+    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match) => loadRouteModule(match.route, routeAssets));
   }
   if (!window._SSR_DATA) {
     return null;
@@ -119,7 +122,8 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = useMemo(() => {
-    return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
+    var _matches;
+    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter((match, index) => {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }

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

@@ -46,6 +46,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           });
         },
         hoc: ({ App }, next) => {
+          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App
@@ -53,7 +54,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           }
           const getRouteApp = () => {
             return (props) => {
-              var _window__SERVER_DATA;
+              var _window__SERVER_DATA, _hydrationData;
               beforeCreateRouter = false;
               routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                 routesConfig: finalRouteConfig,
@@ -64,7 +65,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
               const baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
-              if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
+              if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
                 hydrationData = {
                   ...hydrationData,
                   errors: deserializeErrors(hydrationData.errors)
@@ -109,7 +110,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
+          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

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

@@ -52,13 +52,15 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const { request, mode: ssrMode, nonce } = context.ssrContext;
           const baseUrl = request.baseUrl;
           const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-          const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+          let routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
             routesConfig,
             ssrMode,
             props: {
               nonce
             }
           }));
+          const runner = api.useHookRunners();
+          routes = runner.modifyRoutes(routes);
           const { query } = createStaticHandler(routes, {
             basename: _basename
           });
@@ -72,13 +74,12 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           context.routerContext = routerContext;
           context.routes = routes;
           context.routeManifest = context.ssrContext.routeManifest;
-          const runner = api.useHookRunners();
-          runner.modifyRoutes(routes);
           return next({
             context
           });
         },
         hoc: ({ App }, next) => {
+          var _routesConfig;
           if (!routesConfig) {
             return next({
               App
@@ -98,7 +99,7 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
+          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -109,6 +110,12 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
         },
         pickContext: ({ context, pickedContext }, next) => {
           const { remixRouter } = context;
+          if (!remixRouter) {
+            return next({
+              context,
+              pickedContext
+            });
+          }
           const router = {
             navigate: remixRouter.navigate,
             get location() {

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

@@ -57,9 +57,9 @@ export function renderRoutes({ routesConfig, props, ssrMode }) {
   return routeElements;
 }
 export function getLocation(serverContext) {
-  var _url_replace;
-  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
-  const cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+  var _serverContext, _url_replace, _url;
+  const { pathname, url } = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {};
+  const cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;