@modern-js/runtime 2.26.0 → 2.28.0

package/dist/cjs/state/cli/index.js

@@ -19,80 +19,78 @@ _export(exports, {
 });
 const _utils = require("@modern-js/utils");
 const PLUGIN_IDENTIFIER = "state";
-const statePlugin = () => {
-  return {
-    name: "@modern-js/plugin-state",
-    required: [
-      "@modern-js/runtime"
-    ],
-    setup: (api) => {
-      const stateConfigMap = /* @__PURE__ */ new Map();
-      let pluginsExportsUtils;
-      return {
-        config() {
-          const appContext = api.useAppContext();
-          pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, "plugins");
-          return {
-            source: {
-              alias: {
-                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-              }
+const statePlugin = () => ({
+  name: "@modern-js/plugin-state",
+  required: [
+    "@modern-js/runtime"
+  ],
+  setup: (api) => {
+    const stateConfigMap = /* @__PURE__ */ new Map();
+    let pluginsExportsUtils;
+    return {
+      config() {
+        const appContext = api.useAppContext();
+        pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, "plugins");
+        return {
+          source: {
+            alias: {
+              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }
-          };
-        },
-        modifyEntryImports({ entrypoint, imports }) {
-          var _getEntryOptions;
-          const { entryName, isMainEntry } = entrypoint;
-          const userConfig = api.useResolvedConfigContext();
-          const { packageName } = api.useAppContext();
-          const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
-          stateConfigMap.set(entryName, stateConfig);
-          if (stateConfig) {
-            imports.push({
-              value: "@modern-js/runtime/plugins",
-              specifiers: [
-                {
-                  imported: PLUGIN_IDENTIFIER
-                }
-              ]
-            });
-          }
-          return {
-            entrypoint,
-            imports
-          };
-        },
-        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-          const stateOptions = stateConfigMap.get(entrypoint.entryName);
-          if (stateOptions) {
-            plugins.push({
-              name: PLUGIN_IDENTIFIER,
-              options: `${JSON.stringify(stateConfigMap.get(entrypoint.entryName))}`
-            });
           }
-          return {
-            entrypoint,
-            plugins
-          };
-        },
-        validateSchema() {
-          return [
-            {
-              target: "runtime.state",
-              schema: {
-                type: [
-                  "boolean",
-                  "object"
-                ]
+        };
+      },
+      modifyEntryImports({ entrypoint, imports }) {
+        var _getEntryOptions;
+        const { entryName, isMainEntry } = entrypoint;
+        const userConfig = api.useResolvedConfigContext();
+        const { packageName } = api.useAppContext();
+        const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+        stateConfigMap.set(entryName, stateConfig);
+        if (stateConfig) {
+          imports.push({
+            value: "@modern-js/runtime/plugins",
+            specifiers: [
+              {
+                imported: PLUGIN_IDENTIFIER
               }
-            }
-          ];
-        },
-        addRuntimeExports() {
-          pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
+            ]
+          });
+        }
+        return {
+          entrypoint,
+          imports
+        };
+      },
+      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+        const stateOptions = stateConfigMap.get(entrypoint.entryName);
+        if (stateOptions) {
+          plugins.push({
+            name: PLUGIN_IDENTIFIER,
+            options: `${JSON.stringify(stateConfigMap.get(entrypoint.entryName))}`
+          });
         }
-      };
-    }
-  };
-};
+        return {
+          entrypoint,
+          plugins
+        };
+      },
+      validateSchema() {
+        return [
+          {
+            target: "runtime.state",
+            schema: {
+              type: [
+                "boolean",
+                "object"
+              ]
+            }
+          }
+        ];
+      },
+      addRuntimeExports() {
+        pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
+      }
+    };
+  }
+});
 const _default = statePlugin;

package/dist/cjs/state/runtime/plugin.js

@@ -42,48 +42,46 @@ const getStoreConfig = (config) => {
   storeConfig.plugins = plugins;
   return storeConfig;
 };
-const state = (config) => {
-  return {
-    name: "@modern-js/plugin-state",
-    setup: () => {
-      const storeConfig = getStoreConfig(config);
-      return {
-        hoc({ App }, next) {
-          const getStateApp = (props) => {
-            const context = (0, _react.useContext)(_core.RuntimeReactContext);
-            return /* @__PURE__ */ (0, _jsxruntime.jsx)(_react1.Provider, {
-              store: context.store,
-              config: storeConfig,
-              children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-                ...props
-              })
-            });
-          };
-          return next({
-            App: (0, _hoistnonreactstatics.default)(getStateApp, App)
-          });
-        },
-        init({ context }, next) {
-          if ((0, _common.isBrowser)()) {
-            var _window__SSR_DATA, _window__SSR_DATA_data;
-            storeConfig.initialState = storeConfig.initialState || (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
-          }
-          context.store = (0, _store.createStore)(storeConfig);
-          return next({
-            context
-          });
-        },
-        pickContext({ context, pickedContext }, next) {
-          return next({
-            context,
-            pickedContext: {
-              ...pickedContext,
-              store: context.store
-            }
+const state = (config) => ({
+  name: "@modern-js/plugin-state",
+  setup: () => {
+    const storeConfig = getStoreConfig(config);
+    return {
+      hoc({ App }, next) {
+        const getStateApp = (props) => {
+          const context = (0, _react.useContext)(_core.RuntimeReactContext);
+          return /* @__PURE__ */ (0, _jsxruntime.jsx)(_react1.Provider, {
+            store: context.store,
+            config: storeConfig,
+            children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+              ...props
+            })
           });
+        };
+        return next({
+          App: (0, _hoistnonreactstatics.default)(getStateApp, App)
+        });
+      },
+      init({ context }, next) {
+        if ((0, _common.isBrowser)()) {
+          var _window__SSR_DATA_data, _window__SSR_DATA, _window;
+          storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
         }
-      };
-    }
-  };
-};
+        context.store = (0, _store.createStore)(storeConfig);
+        return next({
+          context
+        });
+      },
+      pickContext({ context, pickedContext }, next) {
+        return next({
+          context,
+          pickedContext: {
+            ...pickedContext,
+            store: context.store
+          }
+        });
+      }
+    };
+  }
+});
 const _default = state;

package/dist/esm/core/compatible.js

@@ -58,16 +58,17 @@ export var createApp = function(param) {
           var context = _param.context, props = _object_without_properties(_param, [
             "context"
           ]);
+          var _contextValue;
           var contextValue = context;
-          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
+          if (!((_contextValue = contextValue) === null || _contextValue === void 0 ? void 0 : _contextValue.runner)) {
             contextValue = getInitialContext(runner);
             runner.init({
               context: contextValue
             }, {
               onLast: function(param3) {
                 var context1 = param3.context;
-                var _App_init;
-                return _$App === null || _$App === void 0 ? void 0 : (_App_init = _$App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_$App, context1);
+                var _App_init, _App;
+                return (_App = _$App) === null || _App === void 0 ? void 0 : (_App_init = _App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_App, context1);
               }
             });
           }
@@ -86,7 +87,7 @@ export var createApp = function(param) {
 };
 export var bootstrap = function() {
   var _ref = _async_to_generator(function(BootApp, id, root, ReactDOM) {
-    var App, runner, context, runInit, isBrowser, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, initialData1;
+    var App, runner, context, runInit, isBrowser, _ssrData_data, _ssrData, _ssrData1, _ssrData_data1, _ssrData2, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, initialData1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -105,8 +106,8 @@ export var bootstrap = function() {
             }, {
               onLast: function(param) {
                 var context1 = param.context;
-                var _App_init;
-                return App === null || App === void 0 ? void 0 : (_App_init = App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App, context1);
+                var _App_init, _App;
+                return (_App = App) === null || _App === void 0 ? void 0 : (_App_init = _App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_App, context1);
               }
             });
           };
@@ -130,7 +131,7 @@ export var bootstrap = function() {
               2
             ];
           ssrData = window._SSR_DATA;
-          loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
+          loadersData = ((_ssrData = ssrData) === null || _ssrData === void 0 ? void 0 : (_ssrData_data = _ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
           initialLoadersState = Object.keys(loadersData).reduce(function(res, key) {
             var loaderData = loadersData[key];
             if (loaderData.loading !== false) {
@@ -144,9 +145,9 @@ export var bootstrap = function() {
               skipStatic: true
             })
           }, ssrData ? {
-            ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
+            ssrContext: (_ssrData1 = ssrData) === null || _ssrData1 === void 0 ? void 0 : _ssrData1.context
           } : {}));
-          context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
+          context.initialData = (_ssrData2 = ssrData) === null || _ssrData2 === void 0 ? void 0 : (_ssrData_data1 = _ssrData2.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
           return [
             4,
             runInit(context)

package/dist/esm/core/loader/useLoader.js

@@ -19,7 +19,7 @@ var useLoader = function(loaderFn) {
     delete options._cache;
   }
   var load = useCallback(function(params) {
-    var _unlistenLoaderChangeRef_current, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA, _window__SSR_DATA_data, _loaderRef_current;
+    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA_data, _window__SSR_DATA, _window, _loaderRef_current;
     if (typeof params === "undefined") {
       var _loaderRef_current1;
       return (_loaderRef_current1 = loaderRef.current) === null || _loaderRef_current1 === void 0 ? void 0 : _loaderRef_current1.load();
@@ -38,26 +38,26 @@ var useLoader = function(loaderFn) {
       params: params
     }));
     loaderRef.current = loaderManager.get(id);
-    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
+    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
     if (isSSRRender) {
       return void 0;
     }
     if (options.skip) {
       return void 0;
     }
-    if (context._hydration && ((_window__SSR_DATA_data_loadersData_id = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.loadersData[id]) === null || _window__SSR_DATA_data_loadersData_id === void 0 ? void 0 : _window__SSR_DATA_data_loadersData_id.error) === null) {
+    if (context._hydration && ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : (_window__SSR_DATA_data_loadersData_id = _window__SSR_DATA_data.loadersData[id]) === null || _window__SSR_DATA_data_loadersData_id === void 0 ? void 0 : _window__SSR_DATA_data_loadersData_id.error) === null) {
       return void 0;
     }
     var res = loaderRef.current.load();
     unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange(function(_status, _result) {
       setResult(_result);
       if (_status === LoaderStatus.fulfilled) {
-        var _options_onSuccess;
-        options === null || options === void 0 ? void 0 : (_options_onSuccess = options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(options, _result.data);
+        var _options_onSuccess, _options;
+        (_options = options) === null || _options === void 0 ? void 0 : (_options_onSuccess = _options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(_options, _result.data);
       }
       if (_status === LoaderStatus.rejected) {
-        var _options_onError;
-        options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, _result.error);
+        var _options_onError, _options1;
+        (_options1 = options) === null || _options1 === void 0 ? void 0 : (_options_onError = _options1.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options1, _result.error);
       }
     });
     return res;
@@ -66,8 +66,8 @@ var useLoader = function(loaderFn) {
   ]);
   useEffect(function() {
     return function() {
-      var _unlistenLoaderChangeRef_current;
-      (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
+      var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef;
+      (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
     };
   }, []);
   useMemo(function() {

package/dist/esm/core/plugin.js

@@ -23,6 +23,7 @@ var registerInit = function(App, _init) {
   var originalInit = App.init;
   App.init = function() {
     var _ref = _async_to_generator(function(context) {
+      var _originalInit, _$_init;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -32,8 +33,8 @@ var registerInit = function(App, _init) {
             return [
               4,
               Promise.all([
-                originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
-                _init === null || _init === void 0 ? void 0 : _init(context)
+                (_originalInit = originalInit) === null || _originalInit === void 0 ? void 0 : _originalInit(context),
+                (_$_init = _init) === null || _$_init === void 0 ? void 0 : _$_init(context)
               ])
             ];
           case 1:

package/dist/esm/document/Html.js

@@ -11,7 +11,8 @@ function findTargetChild(tag, children) {
   });
 }
 function getEleType(ele) {
-  return typeof (ele === null || ele === void 0 ? void 0 : ele.type) === "function" ? ele.type.name : ele === null || ele === void 0 ? void 0 : ele.type;
+  var _ele, _ele1;
+  return typeof ((_ele = ele) === null || _ele === void 0 ? void 0 : _ele.type) === "function" ? ele.type.name : (_ele1 = ele) === null || _ele1 === void 0 ? void 0 : _ele1.type;
 }
 function findTargetElement(tag, children) {
   if (children.length === 0) {
@@ -22,11 +23,11 @@ function findTargetElement(tag, children) {
   try {
     for (var _iterator = children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var item = _step.value;
-      var _item_props;
+      var _item_props, _item;
       if (tag === getEleType(item)) {
         return item;
       }
-      if (item === null || item === void 0 ? void 0 : (_item_props = item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
+      if ((_item = item) === null || _item === void 0 ? void 0 : (_item_props = _item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
         nextChildren = nextChildren.concat(item.props.children);
       }
     }

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

@@ -57,7 +57,7 @@ export var documentPlugin = function() {
             }
             return function() {
               var _ref2 = _async_to_generator(function(param) {
-                var htmlWebpackPlugin, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, links, metas, nonce, nonceAttr, finalHtml;
+                var htmlWebpackPlugin, _tsConfig, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, links, metas, nonce, nonceAttr, finalHtml;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -96,7 +96,7 @@ export var documentPlugin = function() {
                         4
                       ];
                     case 4:
-                      if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) {
+                      if ((_tsConfig = tsConfig) === null || _tsConfig === void 0 ? void 0 : _tsConfig.compilerOptions) {
                         tsConfig.compilerOptions.jsx = "react-jsx";
                       } else {
                         tsConfig.compilerOptions = {
@@ -210,7 +210,8 @@ export var documentPlugin = function() {
                 return {
                   tools: {
                     htmlPlugin: function(options, entry) {
-                      var hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _object_spread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
+                      var _options, _options1, _options2;
+                      var hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : _object_spread({}, (_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters);
                       var templateContent = documentEntry(
                         entry.entryName,
                         // options,

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

@@ -47,12 +47,13 @@ export var routerPlugin = function() {
         },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
+          var _runtimeConfig;
           var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;
           var userConfig = api.useResolvedConfigContext();
           var packageName = api.useAppContext().packageName;
           var runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
           runtimeConfigMap.set(entryName, runtimeConfig);
-          if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
+          if ((_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) {
             if (!isV5(userConfig)) {
               imports.push({
                 value: "@modern-js/runtime/plugins",

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

@@ -9,6 +9,7 @@ var setupFnStr = "function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA
 var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
 var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};";
 var DeferredDataScripts = function(props) {
+  var _props;
   var context = useContext(DataRouterContext);
   var staticContext = (context || {}).staticContext;
   var hydratedRef = useRef(false);
@@ -37,8 +38,9 @@ var DeferredDataScripts = function(props) {
       var deferredKeys = deferredData.deferredKeys;
       var deferredKeyPromiseStr = deferredKeys.map(function(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: routeId
@@ -74,7 +76,7 @@ var DeferredDataScripts = function(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/router/runtime/PrefetchLink.js

@@ -9,7 +9,8 @@ import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches,
 import { RuntimeReactContext } from "../../core";
 export function composeEventHandlers(theirHandler, ourHandler) {
   return function(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);
     }
@@ -98,7 +99,8 @@ function _loadRouteModule() {
           return [
             4,
             Promise.all(chunkIds.map(function(chunkId) {
-              return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
+              var _$__webpack_chunk_load__;
+              return (_$__webpack_chunk_load__ = __webpack_chunk_load__) === null || _$__webpack_chunk_load__ === void 0 ? void 0 : _$__webpack_chunk_load__(String(chunkId));
             }))
           ];
         case 2:
@@ -152,7 +154,8 @@ var PrefetchPageLinks = function(param) {
   var routeAssets = (routeManifest || {}).routeAssets;
   var matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    matches === null || matches === void 0 ? void 0 : matches.forEach(function(match) {
+    var _matches;
+    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach(function(match) {
       return loadRouteModule(match.route, routeAssets);
     });
   }
@@ -170,7 +173,8 @@ var PrefetchDataLinks = function(param) {
   var currentMatches = useMatches();
   var basename = useHref("/");
   var dataHrefs = useMemo(function() {
-    return matches === null || matches === void 0 ? void 0 : matches.filter(function(match, index) {
+    var _matches;
+    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter(function(match, index) {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }

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

@@ -56,6 +56,7 @@ export var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App;
+          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App: App
@@ -63,7 +64,7 @@ export var routerPlugin = function(param) {
           }
           var getRouteApp = function() {
             return function(props) {
-              var _window__SERVER_DATA;
+              var _window__SERVER_DATA, _hydrationData;
               beforeCreateRouter = false;
               routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                 routesConfig: finalRouteConfig,
@@ -74,7 +75,7 @@ export var routerPlugin = function(param) {
               var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               var 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 = _object_spread_props(_object_spread({}, hydrationData), {
                   errors: deserializeErrors(hydrationData.errors)
                 });
@@ -120,7 +121,7 @@ export var routerPlugin = function(param) {
           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/router/runtime/plugin.node.js

@@ -87,7 +87,7 @@ export var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           return _async_to_generator(function() {
-            var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, routes, query, remixRequest, routerContext, router, runner;
+            var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, routes, runner, query, remixRequest, routerContext, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -109,6 +109,8 @@ export var routerPlugin = function(param) {
                       nonce: nonce
                     }
                   }));
+                  runner = api.useHookRunners();
+                  routes = runner.modifyRoutes(routes);
                   query = createStaticHandler(routes, {
                     basename: _basename
                   }).query;
@@ -130,8 +132,6 @@ export var routerPlugin = function(param) {
                   context.routerContext = routerContext;
                   context.routes = routes;
                   context.routeManifest = context.ssrContext.routeManifest;
-                  runner = api.useHookRunners();
-                  runner.modifyRoutes(routes);
                   return [
                     2,
                     next({
@@ -144,6 +144,7 @@ export var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App;
+          var _routesConfig;
           if (!routesConfig) {
             return next({
               App: App
@@ -162,7 +163,7 @@ export var routerPlugin = function(param) {
             };
           };
           var 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)
             });
@@ -174,6 +175,12 @@ export var routerPlugin = function(param) {
         pickContext: function(param2, next) {
           var context = param2.context, pickedContext = param2.pickedContext;
           var remixRouter = context.remixRouter;
+          if (!remixRouter) {
+            return next({
+              context: context,
+              pickedContext: pickedContext
+            });
+          }
           var router = {
             navigate: remixRouter.navigate,
             get location() {

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

@@ -81,9 +81,9 @@ export function renderRoutes(param) {
   return routeElements;
 }
 export function getLocation(serverContext) {
-  var _url_replace;
-  var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
-  var 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;
+  var _ref = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
+  var 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://", "");
   var index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;