@modern-js/runtime 2.69.7 → 3.0.0-alpha.1

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

@@ -1,216 +0,0 @@
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { merge } from "@modern-js/runtime-utils/merge";
-import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
-import { normalizePathname } from "@modern-js/runtime-utils/url";
-import * as React from "react";
-import { useContext, useMemo } from "react";
-import { RuntimeReactContext } from "../../core";
-import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
-import { getGlobalIsRscClient } from "../../core/context";
-import { modifyRoutes as modifyRoutesHook, onBeforeCreateRoutes as onBeforeCreateRoutesHook } from "./hooks";
-import { createClientRouterFromPayload } from "./rsc-router";
-import { createRouteObjectsFromConfig, deserializeErrors, renderRoutes, urlJoin } from "./utils";
-var finalRouteConfig = {
-  routes: []
-};
-var beforeCreateRouter = true;
-function modifyRoutes(modifyFunction) {
-  if (beforeCreateRouter) {
-    var originRoutes = finalRouteConfig.routes;
-    var newRoutes = modifyFunction(originRoutes);
-    finalRouteConfig.routes = newRoutes;
-  } else {
-    console.error("It is not allowed to modify routes config after create router.");
-  }
-}
-var routerPlugin = function() {
-  var userConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-  return {
-    name: "@modern-js/plugin-router",
-    registryHooks: {
-      modifyRoutes: modifyRoutesHook,
-      onBeforeCreateRoutes: onBeforeCreateRoutesHook
-    },
-    setup: function(api) {
-      var routesContainer = {
-        current: []
-      };
-      api.onBeforeRender(function(context) {
-        if (window._SSR_DATA && userConfig.unstable_reloadOnURLMismatch) {
-          var _ssrContext_request;
-          var ssrContext = context.ssrContext;
-          var currentPathname = normalizePathname(window.location.pathname);
-          var initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && normalizePathname(ssrContext.request.pathname);
-          if (initialPathname && initialPathname !== currentPathname) {
-            var errorMsg = "The initial URL ".concat(initialPathname, " and the URL ").concat(currentPathname, " to be hydrated do not match, reload.");
-            console.error(errorMsg);
-            window.location.reload();
-          }
-        }
-        context.router = {
-          useMatches,
-          useLocation,
-          useHref
-        };
-        Object.defineProperty(context, "routes", {
-          get: function get() {
-            return routesContainer.current;
-          },
-          enumerable: true
-        });
-      });
-      api.wrapRoot(function(App) {
-        var mergedConfig = merge(api.getRuntimeConfig().router || {}, userConfig);
-        var _mergedConfig_serverBase = mergedConfig.serverBase, serverBase = _mergedConfig_serverBase === void 0 ? [] : _mergedConfig_serverBase, _mergedConfig_supportHtml5History = mergedConfig.supportHtml5History, supportHtml5History = _mergedConfig_supportHtml5History === void 0 ? true : _mergedConfig_supportHtml5History, _mergedConfig_basename = mergedConfig.basename, basename = _mergedConfig_basename === void 0 ? "" : _mergedConfig_basename, routesConfig = mergedConfig.routesConfig, createRoutes = mergedConfig.createRoutes, future = mergedConfig.future;
-        finalRouteConfig = _object_spread({
-          routes: getGlobalRoutes(),
-          globalApp: getGlobalLayoutApp()
-        }, routesConfig);
-        if (!finalRouteConfig.routes && !createRoutes) {
-          return App;
-        }
-        var selectBasePath = function(pathname) {
-          var match = serverBase.find(function(baseUrl) {
-            return isSegmentPrefix(pathname, baseUrl);
-          });
-          return match || "/";
-        };
-        var RouterWrapper = function(props) {
-          var _useRouterCreation = useRouterCreation(_object_spread_props(_object_spread({}, props), {
-            rscPayload: props === null || props === void 0 ? void 0 : props.rscPayload
-          }), {
-            api,
-            createRoutes,
-            supportHtml5History,
-            selectBasePath,
-            basename,
-            future
-          }), router = _useRouterCreation.router, routes = _useRouterCreation.routes;
-          routesContainer.current = routes;
-          beforeCreateRouter = false;
-          var RouterContent = function() {
-            return /* @__PURE__ */ _jsxs(_Fragment, {
-              children: [
-                /* @__PURE__ */ _jsx(RouterProvider, {
-                  router,
-                  future
-                }),
-                /* @__PURE__ */ _jsx(EmptyComponent, {}),
-                /* @__PURE__ */ _jsx(EmptyComponent, {})
-              ]
-            });
-          };
-          return App ? /* @__PURE__ */ _jsx(App, {
-            children: /* @__PURE__ */ _jsx(RouterContent, {})
-          }) : /* @__PURE__ */ _jsx(RouterContent, {});
-        };
-        return RouterWrapper;
-      });
-    }
-  };
-};
-var EmptyComponent = function() {
-  return null;
-};
-var safeUse = function(promise) {
-  var useProp = "use";
-  var useHook = React && React[useProp];
-  if (typeof useHook === "function") {
-    return useHook(promise);
-  }
-  return null;
-};
-function normalizeBase(b) {
-  if (b.length > 1 && b.endsWith("/"))
-    return b.slice(0, -1);
-  return b || "/";
-}
-function isSegmentPrefix(pathname, base) {
-  var b = normalizeBase(base);
-  var p = pathname || "/";
-  return p === b || p.startsWith("".concat(b, "/"));
-}
-function useRouterCreation(props, options) {
-  var api = options.api, createRoutes = options.createRoutes, supportHtml5History = options.supportHtml5History, selectBasePath = options.selectBasePath, basename = options.basename;
-  var runtimeContext = useContext(RuntimeReactContext);
-  var baseUrl = selectBasePath(location.pathname).replace(/^\/*/, "/");
-  var _basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || basename) : baseUrl;
-  var getBlockNavState = runtimeContext.unstable_getBlockNavState;
-  var rscPayload = (props === null || props === void 0 ? void 0 : props.rscPayload) ? safeUse(props.rscPayload) : null;
-  var hydrationData = window._ROUTER_DATA || rscPayload;
-  return useMemo(function() {
-    if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
-      hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
-        errors: deserializeErrors(hydrationData.errors)
-      });
-    }
-    var isRscClient = getGlobalIsRscClient();
-    var routes = null;
-    if (isRscClient) {
-      routes = createRoutes ? createRoutes() : createRouteObjectsFromConfig({
-        routesConfig: finalRouteConfig
-      });
-    } else {
-      routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-        routesConfig: finalRouteConfig,
-        props
-      }));
-    }
-    if (!routes) {
-      routes = [];
-    }
-    var hooks = api.getHooks();
-    if (rscPayload) {
-      try {
-        var router = createClientRouterFromPayload(rscPayload, routes, _basename);
-        return {
-          router,
-          routes: router.routes || []
-        };
-      } catch (e) {
-        console.error("Failed to create router from RSC payload:", e);
-      }
-    }
-    var modifiedRoutes = hooks.modifyRoutes.call(routes);
-    var router1 = supportHtml5History ? createBrowserRouter(modifiedRoutes, {
-      basename: _basename,
-      hydrationData
-    }) : createHashRouter(modifiedRoutes, {
-      basename: _basename,
-      hydrationData
-    });
-    var originSubscribe = router1.subscribe;
-    router1.subscribe = function(listener) {
-      var wrappedListener = function() {
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-        var blockRoute = getBlockNavState ? getBlockNavState() : false;
-        if (blockRoute) {
-          return;
-        }
-        return listener.apply(void 0, _to_consumable_array(args));
-      };
-      return originSubscribe(wrappedListener);
-    };
-    return {
-      router: router1,
-      routes: modifiedRoutes
-    };
-  }, [
-    finalRouteConfig,
-    props,
-    _basename,
-    hydrationData,
-    getBlockNavState
-  ]);
-}
-export {
-  beforeCreateRouter,
-  finalRouteConfig,
-  modifyRoutes,
-  routerPlugin
-};

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

@@ -1,235 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { merge } from "@modern-js/runtime-utils/merge";
-import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
-import { StaticRouterProvider, createStaticRouter } from "@modern-js/runtime-utils/node/router";
-import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
-import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
-import { time } from "@modern-js/runtime-utils/time";
-import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
-import { useContext } from "react";
-import { RuntimeReactContext } from "../../core";
-import { getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
-import { setServerPayload } from "../../core/context/serverPayload/index.server";
-import DeferredDataScripts from "./DeferredDataScripts.node";
-import { modifyRoutes as modifyRoutesHook, onBeforeCreateRoutes as onBeforeCreateRoutesHook } from "./hooks";
-import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router";
-import { createRouteObjectsFromConfig, renderRoutes, urlJoin } from "./utils";
-function createRemixReuqest(request) {
-  var method = "GET";
-  var headers = request.headers;
-  var controller = new AbortController();
-  return new Request(request.url, {
-    method,
-    headers,
-    signal: controller.signal
-  });
-}
-var routerPlugin = function() {
-  var userConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-  return {
-    name: "@modern-js/plugin-router",
-    registryHooks: {
-      modifyRoutes: modifyRoutesHook,
-      onBeforeCreateRoutes: onBeforeCreateRoutesHook
-    },
-    setup: function(api) {
-      var finalRouteConfig = {};
-      api.onBeforeRender(function() {
-        var _ref = _async_to_generator(function(context, interrupt) {
-          var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, enableRsc, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, hooks, routes, query, remixRequest, end, routerContext, cost, isRSCNavigation, errors, payload, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                pluginConfig = api.getRuntimeConfig();
-                _merge = merge(pluginConfig.router || {}, userConfig), _merge_basename = _merge.basename, basename = _merge_basename === void 0 ? "" : _merge_basename, routesConfig = _merge.routesConfig, createRoutes = _merge.createRoutes;
-                finalRouteConfig = _object_spread({
-                  routes: getGlobalRoutes(),
-                  globalApp: getGlobalLayoutApp()
-                }, routesConfig);
-                if (!finalRouteConfig.routes && !createRoutes) {
-                  return [
-                    2
-                  ];
-                }
-                enableRsc = getGlobalEnableRsc();
-                if (!enableRsc)
-                  return [
-                    3,
-                    2
-                  ];
-                return [
-                  4,
-                  prepareRSCRoutes(finalRouteConfig.routes)
-                ];
-              case 1:
-                _state.sent();
-                _state.label = 2;
-              case 2:
-                _context_ssrContext2 = context.ssrContext, request = _context_ssrContext2.request, ssrMode = _context_ssrContext2.mode, nonce = _context_ssrContext2.nonce, _context_ssrContext_loaderFailureMode = _context_ssrContext2.loaderFailureMode, loaderFailureMode = _context_ssrContext_loaderFailureMode === void 0 ? "errorBoundary" : _context_ssrContext_loaderFailureMode;
-                baseUrl = request.baseUrl;
-                _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-                reporter = context.ssrContext.reporter;
-                requestContext = createRequestContext((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
-                requestContext.set(reporterCtx, reporter);
-                hooks = api.getHooks();
-                return [
-                  4,
-                  hooks.onBeforeCreateRoutes.call(context)
-                ];
-              case 3:
-                _state.sent();
-                routes = [];
-                if (enableRsc) {
-                  routes = createRoutes ? createRoutes() : createRouteObjectsFromConfig({
-                    routesConfig: finalRouteConfig
-                  });
-                } else {
-                  routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                    routesConfig: finalRouteConfig,
-                    ssrMode,
-                    props: {
-                      nonce
-                    }
-                  }));
-                }
-                routes = hooks.modifyRoutes.call(routes);
-                query = createStaticHandler(routes, {
-                  basename: _basename
-                }).query;
-                remixRequest = createRemixReuqest(context.ssrContext.request.raw);
-                end = time();
-                return [
-                  4,
-                  query(remixRequest, {
-                    requestContext
-                  })
-                ];
-              case 4:
-                routerContext = _state.sent();
-                cost = end();
-                (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : (_context_ssrContext_onTiming = _context_ssrContext1.onTiming) === null || _context_ssrContext_onTiming === void 0 ? void 0 : _context_ssrContext_onTiming.call(_context_ssrContext1, LOADER_REPORTER_NAME, cost);
-                isRSCNavigation = remixRequest.headers.get("x-rsc-tree") === "true";
-                if (_instanceof(routerContext, Response)) {
-                  if (enableRsc && isRSCNavigation) {
-                    return [
-                      2,
-                      interrupt(handleRSCRedirect(routerContext.headers, _basename, routerContext.status))
-                    ];
-                  } else {
-                    return [
-                      2,
-                      interrupt(routerContext)
-                    ];
-                  }
-                }
-                errors = Object.values(routerContext.errors || {});
-                if (
-                  // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
-                  errors.length > 0 && loaderFailureMode === "clientRender"
-                ) {
-                  routerContext.statusCode = 200;
-                  throw errors[0];
-                }
-                context.routerContext = routerContext;
-                if (enableRsc) {
-                  if (isRSCNavigation) {
-                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-                    try {
-                      for (_iterator = routerContext.matches[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                        match = _step.value;
-                        if (match.route.hasClientLoader) {
-                          delete routerContext.loaderData[match.route.id];
-                        }
-                      }
-                    } catch (err) {
-                      _didIteratorError = true;
-                      _iteratorError = err;
-                    } finally {
-                      try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                          _iterator.return();
-                        }
-                      } finally {
-                        if (_didIteratorError) {
-                          throw _iteratorError;
-                        }
-                      }
-                    }
-                  }
-                  payload = createServerPayload(routerContext, routes);
-                  setServerPayload(payload);
-                }
-                Object.defineProperty(context, "routes", {
-                  get: function get() {
-                    return routes;
-                  },
-                  enumerable: true
-                });
-                return [
-                  2
-                ];
-            }
-          });
-        });
-        return function(context, interrupt) {
-          return _ref.apply(this, arguments);
-        };
-      }());
-      api.wrapRoot(function(App) {
-        if (!finalRouteConfig) {
-          return App;
-        }
-        var getRouteApp = function() {
-          var enableRsc = getGlobalEnableRsc();
-          return function(props) {
-            var context = useContext(RuntimeReactContext);
-            var routerContext = context.routerContext, ssrContext = context.ssrContext, routes = context.routes;
-            var nonce = ssrContext.nonce, mode = ssrContext.mode, useJsonScript = ssrContext.useJsonScript;
-            var basename = routerContext.basename;
-            var remixRouter = createStaticRouter(routes, routerContext);
-            if (!enableRsc) {
-              var routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
-                children: [
-                  /* @__PURE__ */ _jsx(StaticRouterProvider, {
-                    router: remixRouter,
-                    context: routerContext,
-                    hydrate: false
-                  }),
-                  mode === "stream" && // ROUTER_DATA will inject in `packages/runtime/plugin-runtime/src/core/server/string/ssrData.ts` in string ssr
-                  // So we can inject it only when streaming ssr
-                  /* @__PURE__ */ _jsx(DeferredDataScripts, {
-                    nonce,
-                    context: routerContext,
-                    useJsonScript
-                  })
-                ]
-              });
-              return App ? /* @__PURE__ */ _jsx(App, {
-                children: routerWrapper
-              }) : routerWrapper;
-            } else {
-              return App ? /* @__PURE__ */ _jsx(App, {
-                children: /* @__PURE__ */ _jsx(RSCStaticRouter, {
-                  basename
-                })
-              }) : /* @__PURE__ */ _jsx(RSCStaticRouter, {
-                basename
-              });
-            }
-          };
-        };
-        return getRouteApp();
-      });
-    }
-  };
-};
-var modifyRoutes = function() {
-};
-export {
-  modifyRoutes,
-  routerPlugin
-};

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

@@ -1,26 +0,0 @@
-import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
-var createShouldRevalidate = function(routeId) {
-  return function(arg) {
-    var _window_ROUTE_MODULES, _window;
-    var routeModule = (_window = window) === null || _window === void 0 ? void 0 : (_window_ROUTE_MODULES = _window[ROUTE_MODULES]) === null || _window_ROUTE_MODULES === void 0 ? void 0 : _window_ROUTE_MODULES[routeId];
-    if (routeModule && typeof routeModule.shouldRevalidate === "function") {
-      return routeModule.shouldRevalidate(arg);
-    }
-    return arg.defaultShouldRevalidate;
-  };
-};
-var handleRouteModule = function(routeModule, routeId) {
-  if (typeof document !== "undefined") {
-    window[ROUTE_MODULES][routeId] = routeModule;
-  }
-  return routeModule;
-};
-var handleRouteModuleError = function(error) {
-  console.error(error);
-  return null;
-};
-export {
-  createShouldRevalidate,
-  handleRouteModule,
-  handleRouteModuleError
-};