@modern-js/runtime 2.21.0 → 2.22.0

package/dist/cjs/router/runtime/hooks.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "modifyRoutes", {
   enumerable: true,
-  get: () => modifyRoutes
+  get: function() {
+    return modifyRoutes;
+  }
 });
 const _plugin = require("@modern-js/plugin");
 const modifyRoutes = (0, _plugin.createWaterfall)();

package/dist/cjs/router/runtime/index.js

@@ -10,72 +10,194 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  default: () => _default,
-  modifyRoutes: () => _plugin.modifyRoutes,
-  Link: () => _PrefetchLink.Link,
-  NavLink: () => _PrefetchLink.NavLink,
-  useRouteLoaderData: () => useRouteLoaderData,
+  default: function() {
+    return _default;
+  },
+  modifyRoutes: function() {
+    return _plugin.modifyRoutes;
+  },
+  Link: function() {
+    return _PrefetchLink.Link;
+  },
+  NavLink: function() {
+    return _PrefetchLink.NavLink;
+  },
+  useRouteLoaderData: function() {
+    return useRouteLoaderData;
+  },
   // Routers
-  createBrowserRouter: () => _router.createBrowserRouter,
-  createHashRouter: () => _router.createHashRouter,
-  createMemoryRouter: () => _router.createMemoryRouter,
-  RouterProvider: () => _router.RouterProvider,
+  createBrowserRouter: function() {
+    return _router.createBrowserRouter;
+  },
+  createHashRouter: function() {
+    return _router.createHashRouter;
+  },
+  createMemoryRouter: function() {
+    return _router.createMemoryRouter;
+  },
+  RouterProvider: function() {
+    return _router.RouterProvider;
+  },
   // Router Components
-  BrowserRouter: () => _router.BrowserRouter,
-  HashRouter: () => _router.HashRouter,
-  MemoryRouter: () => _router.MemoryRouter,
-  Router: () => _router.Router,
+  BrowserRouter: function() {
+    return _router.BrowserRouter;
+  },
+  HashRouter: function() {
+    return _router.HashRouter;
+  },
+  MemoryRouter: function() {
+    return _router.MemoryRouter;
+  },
+  Router: function() {
+    return _router.Router;
+  },
   // Components
-  Await: () => _router.Await,
-  Form: () => _router.Form,
-  Navigate: () => _router.Navigate,
-  Outlet: () => _router.Outlet,
-  Route: () => _router.Route,
-  Routes: () => _router.Routes,
-  ScrollRestoration: () => _router.ScrollRestoration,
+  Await: function() {
+    return _router.Await;
+  },
+  Form: function() {
+    return _router.Form;
+  },
+  Navigate: function() {
+    return _router.Navigate;
+  },
+  Outlet: function() {
+    return _router.Outlet;
+  },
+  Route: function() {
+    return _router.Route;
+  },
+  Routes: function() {
+    return _router.Routes;
+  },
+  ScrollRestoration: function() {
+    return _router.ScrollRestoration;
+  },
   // Hooks
-  useActionData: () => _router.useActionData,
-  useAsyncError: () => _router.useAsyncError,
-  useAsyncValue: () => _router.useAsyncValue,
-  useBeforeUnload: () => _router.useBeforeUnload,
-  useFetcher: () => _router.useFetcher,
-  useFetchers: () => _router.useFetchers,
-  useFormAction: () => _router.useFormAction,
-  useHref: () => _router.useHref,
-  useInRouterContext: () => _router.useInRouterContext,
-  useLinkClickHandler: () => _router.useLinkClickHandler,
-  useLoaderData: () => _router.useLoaderData,
-  useLocation: () => _router.useLocation,
-  useMatch: () => _router.useMatch,
-  useMatches: () => _router.useMatches,
-  useNavigate: () => _router.useNavigate,
-  useNavigation: () => _router.useNavigation,
-  useNavigationType: () => _router.useNavigationType,
-  useOutlet: () => _router.useOutlet,
-  useOutletContext: () => _router.useOutletContext,
-  useParams: () => _router.useParams,
-  useResolvedPath: () => _router.useResolvedPath,
-  useRevalidator: () => _router.useRevalidator,
-  useRouteError: () => _router.useRouteError,
-  useRoutes: () => _router.useRoutes,
-  useSearchParams: () => _router.useSearchParams,
-  useSubmit: () => _router.useSubmit,
+  useActionData: function() {
+    return _router.useActionData;
+  },
+  useAsyncError: function() {
+    return _router.useAsyncError;
+  },
+  useAsyncValue: function() {
+    return _router.useAsyncValue;
+  },
+  useBeforeUnload: function() {
+    return _router.useBeforeUnload;
+  },
+  useFetcher: function() {
+    return _router.useFetcher;
+  },
+  useFetchers: function() {
+    return _router.useFetchers;
+  },
+  useFormAction: function() {
+    return _router.useFormAction;
+  },
+  useHref: function() {
+    return _router.useHref;
+  },
+  useInRouterContext: function() {
+    return _router.useInRouterContext;
+  },
+  useLinkClickHandler: function() {
+    return _router.useLinkClickHandler;
+  },
+  useLoaderData: function() {
+    return _router.useLoaderData;
+  },
+  useLocation: function() {
+    return _router.useLocation;
+  },
+  useMatch: function() {
+    return _router.useMatch;
+  },
+  useMatches: function() {
+    return _router.useMatches;
+  },
+  useNavigate: function() {
+    return _router.useNavigate;
+  },
+  useNavigation: function() {
+    return _router.useNavigation;
+  },
+  useNavigationType: function() {
+    return _router.useNavigationType;
+  },
+  useOutlet: function() {
+    return _router.useOutlet;
+  },
+  useOutletContext: function() {
+    return _router.useOutletContext;
+  },
+  useParams: function() {
+    return _router.useParams;
+  },
+  useResolvedPath: function() {
+    return _router.useResolvedPath;
+  },
+  useRevalidator: function() {
+    return _router.useRevalidator;
+  },
+  useRouteError: function() {
+    return _router.useRouteError;
+  },
+  useRoutes: function() {
+    return _router.useRoutes;
+  },
+  useSearchParams: function() {
+    return _router.useSearchParams;
+  },
+  useSubmit: function() {
+    return _router.useSubmit;
+  },
   // Utilities
-  createRoutesFromChildren: () => _router.createRoutesFromChildren,
-  createRoutesFromElements: () => _router.createRoutesFromElements,
-  createSearchParams: () => _router.createSearchParams,
-  generatePath: () => _router.generatePath,
-  isRouteErrorResponse: () => _router.isRouteErrorResponse,
-  matchPath: () => _router.matchPath,
-  matchRoutes: () => _router.matchRoutes,
-  renderMatches: () => _router.renderMatches,
-  resolvePath: () => _router.resolvePath,
-  createPath: () => _router.createPath,
-  unstable_useBlocker: () => _router.unstable_useBlocker,
-  unstable_usePrompt: () => _router.unstable_usePrompt,
-  defer: () => _router.defer,
-  json: () => _router.json,
-  redirect: () => _router.redirect
+  createRoutesFromChildren: function() {
+    return _router.createRoutesFromChildren;
+  },
+  createRoutesFromElements: function() {
+    return _router.createRoutesFromElements;
+  },
+  createSearchParams: function() {
+    return _router.createSearchParams;
+  },
+  generatePath: function() {
+    return _router.generatePath;
+  },
+  isRouteErrorResponse: function() {
+    return _router.isRouteErrorResponse;
+  },
+  matchPath: function() {
+    return _router.matchPath;
+  },
+  matchRoutes: function() {
+    return _router.matchRoutes;
+  },
+  renderMatches: function() {
+    return _router.renderMatches;
+  },
+  resolvePath: function() {
+    return _router.resolvePath;
+  },
+  createPath: function() {
+    return _router.createPath;
+  },
+  unstable_useBlocker: function() {
+    return _router.unstable_useBlocker;
+  },
+  unstable_usePrompt: function() {
+    return _router.unstable_usePrompt;
+  },
+  defer: function() {
+    return _router.defer;
+  },
+  json: function() {
+    return _router.json;
+  },
+  redirect: function() {
+    return _router.redirect;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _router = require("@modern-js/utils/runtime/router");

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

@@ -10,17 +10,27 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  finalRouteConfig: () => finalRouteConfig,
-  beforeCreateRouter: () => beforeCreateRouter,
-  modifyRoutes: () => modifyRoutes,
-  routerPlugin: () => routerPlugin
+  finalRouteConfig: function() {
+    return finalRouteConfig;
+  },
+  beforeCreateRouter: function() {
+    return beforeCreateRouter;
+  },
+  modifyRoutes: function() {
+    return modifyRoutes;
+  },
+  routerPlugin: function() {
+    return routerPlugin;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
 const _router = require("@modern-js/utils/runtime/router");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
 const _runtimebrowser = require("@modern-js/utils/runtime-browser");
+const _core = require("../../core");
 const _hooks = require("./hooks");
 const _utils = require("./utils");
 let finalRouteConfig = {
@@ -94,6 +104,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
                 basename: _basename,
                 hydrationData
               });
+              const runtimeContext = (0, _react.useContext)(_core.RuntimeReactContext);
+              runtimeContext.remixRouter = router;
               return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
                 children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.RouterProvider, {
@@ -114,6 +126,22 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
           return next({
             App: RouteApp
           });
+        },
+        pickContext: ({ context, pickedContext }, next) => {
+          const { remixRouter } = context;
+          const router = {
+            navigate: remixRouter.navigate,
+            get location() {
+              return remixRouter.state.location;
+            }
+          };
+          return next({
+            context,
+            pickedContext: {
+              ...pickedContext,
+              router
+            }
+          });
         }
       };
     }

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

@@ -10,9 +10,15 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createFetchHeaders: () => createFetchHeaders,
-  routerPlugin: () => routerPlugin,
-  modifyRoutes: () => modifyRoutes
+  createFetchHeaders: function() {
+    return createFetchHeaders;
+  },
+  routerPlugin: function() {
+    return routerPlugin;
+  },
+  modifyRoutes: function() {
+    return modifyRoutes;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
@@ -83,7 +89,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             return routerContext;
           }
           const router = (0, _router.createStaticRouter)(routes, routerContext);
-          context.router = router;
+          context.remixRouter = router;
           context.routerContext = routerContext;
           context.routes = routes;
           context.routeManifest = context.ssrContext.routeManifest;
@@ -101,11 +107,11 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           }
           const getRouteApp = () => {
             return (props) => {
-              const { router, routerContext } = (0, _react.useContext)(_core.RuntimeReactContext);
+              const { remixRouter, routerContext } = (0, _react.useContext)(_core.RuntimeReactContext);
               return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
                 children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.StaticRouterProvider, {
-                  router,
+                  router: remixRouter,
                   context: routerContext,
                   hydrate: false
                 })
@@ -121,6 +127,22 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           return next({
             App: RouteApp
           });
+        },
+        pickContext: ({ context, pickedContext }, next) => {
+          const { remixRouter } = context;
+          const router = {
+            navigate: remixRouter.navigate,
+            get location() {
+              return remixRouter.state.location;
+            }
+          };
+          return next({
+            context,
+            pickedContext: {
+              ...pickedContext,
+              router
+            }
+          });
         }
       };
     }

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

@@ -10,13 +10,27 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  getRouteComponents: () => getRouteComponents,
-  renderRoutes: () => renderRoutes,
-  getLocation: () => getLocation,
-  urlJoin: () => urlJoin,
-  standardSlash: () => standardSlash,
-  serializeErrors: () => serializeErrors,
-  deserializeErrors: () => deserializeErrors
+  getRouteComponents: function() {
+    return getRouteComponents;
+  },
+  renderRoutes: function() {
+    return renderRoutes;
+  },
+  getLocation: function() {
+    return getLocation;
+  },
+  urlJoin: function() {
+    return urlJoin;
+  },
+  standardSlash: function() {
+    return standardSlash;
+  },
+  serializeErrors: function() {
+    return serializeErrors;
+  },
+  deserializeErrors: function() {
+    return deserializeErrors;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");

package/dist/cjs/router/runtime/withRouter.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "withRouter", {
   enumerable: true,
-  get: () => withRouter
+  get: function() {
+    return withRouter;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");

package/dist/cjs/runtimeContext.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  RuntimeReactContext: () => RuntimeReactContext,
-  ServerRouterContext: () => ServerRouterContext
+  RuntimeReactContext: function() {
+    return RuntimeReactContext;
+  },
+  ServerRouterContext: function() {
+    return ServerRouterContext;
+  }
 });
 const _react = require("react");
 const RuntimeReactContext = (0, _react.createContext)({});

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
@@ -123,11 +125,16 @@ const _default = () => {
             imports
           };
         },
-        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+        modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
           if (ssrConfigMap.get(entrypoint.entryName)) {
+            var _bundlerConfigs_find, _bundlerConfigs_find_output;
+            const chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find((config) => config.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
+              options: JSON.stringify({
+                ...ssrConfigMap.get(entrypoint.entryName) || {},
+                chunkLoadingGlobal
+              })
             });
           }
           return {

package/dist/cjs/ssr/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  ssr: () => ssr,
-  default: () => _default
+  ssr: function() {
+    return ssr;
+  },
+  default: function() {
+    return _default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -57,6 +61,9 @@ const ssr = (config) => {
                 context
               }));
             } else if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
+              const loadableReadyOptions = {
+                chunkLoadingGlobal: config.chunkLoadingGlobal
+              };
               if ((0, _utils.isReact18)()) {
                 (0, _component.loadableReady)(() => {
                   let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
@@ -67,13 +74,13 @@ const ssr = (config) => {
                   });
                   SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
                   ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
-                });
+                }, loadableReadyOptions);
               } else {
                 (0, _component.loadableReady)(() => {
                   ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                     context: hydrateContext
                   }), callback);
-                });
+                }, loadableReadyOptions);
               }
             } else {
               console.warn(`unknow render level: ${renderLevel}, execute render()`);

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  ssr: () => ssr,
-  default: () => _default
+  ssr: function() {
+    return ssr;
+  },
+  default: function() {
+    return _default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/ssr/prefetch.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _server = require("react-dom/server");

package/dist/cjs/ssr/react/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  PreRender: () => _prerender.PreRender,
-  NoSSR: () => _nossr.NoSSR
+  PreRender: function() {
+    return _prerender.PreRender;
+  },
+  NoSSR: function() {
+    return _nossr.NoSSR;
+  }
 });
 const _prerender = require("./prerender");
 const _nossr = require("./nossr");

package/dist/cjs/ssr/react/nossr/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "NoSSR", {
   enumerable: true,
-  get: () => NoSSR
+  get: function() {
+    return NoSSR;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));

package/dist/cjs/ssr/react/prerender/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "PreRender", {
   enumerable: true,
-  get: () => PreRender
+  get: function() {
+    return PreRender;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/ssr/react/prerender/util.js

@@ -10,11 +10,21 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  getInnermostProperty: () => getInnermostProperty,
-  getOutermostProperty: () => getOutermostProperty,
-  aggKeysFromPropsList: () => aggKeysFromPropsList,
-  aggMatchesFromPropsList: () => aggMatchesFromPropsList,
-  exist: () => exist
+  getInnermostProperty: function() {
+    return getInnermostProperty;
+  },
+  getOutermostProperty: function() {
+    return getOutermostProperty;
+  },
+  aggKeysFromPropsList: function() {
+    return aggKeysFromPropsList;
+  },
+  aggMatchesFromPropsList: function() {
+    return aggMatchesFromPropsList;
+  },
+  exist: function() {
+    return exist;
+  }
 });
 const REQUEST_META = [
   "header",

package/dist/cjs/ssr/react/withCallback/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "WithCallback", {
   enumerable: true,
-  get: () => WithCallback
+  get: function() {
+    return WithCallback;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));

package/dist/cjs/ssr/serverRender/helmet.js

@@ -8,7 +8,9 @@ Object.defineProperty(
   "default",
   {
     enumerable: true,
-    get: () => helmet
+    get: function() {
+      return helmet;
+    }
   }
 );
 const _os = require("os");

package/dist/cjs/ssr/serverRender/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => serverRender
+  get: function() {
+    return serverRender;
+  }
 });
 const _utils = require("../utils");
 const _utils1 = require("./utils");