@modern-js/runtime 2.35.1 → 2.36.0

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

@@ -1,15 +1,15 @@
 import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
 import { routerPlugin } from "./plugin";
-export { renderRoutes } from "./utils";
-export default routerPlugin;
-export { modifyRoutes } from "./plugin";
+import { renderRoutes } from "./utils";
+var runtime_default = routerPlugin;
+import { modifyRoutes } from "./plugin";
 export * from "./withRouter";
-export { Link, NavLink } from "./PrefetchLink";
-export var useRouteLoaderData = function(routeId) {
+import { Link, NavLink } from "./PrefetchLink";
+var useRouteLoaderData = function(routeId) {
   var realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
-export {
+import {
   createBrowserRouter,
   createHashRouter,
   createMemoryRouter,
@@ -67,3 +67,67 @@ export {
   json,
   redirect
 } from "@modern-js/runtime-utils/router";
+export {
+  Await,
+  BrowserRouter,
+  Form,
+  HashRouter,
+  Link,
+  MemoryRouter,
+  NavLink,
+  Navigate,
+  Outlet,
+  Route,
+  Router,
+  RouterProvider,
+  Routes,
+  ScrollRestoration,
+  createBrowserRouter,
+  createHashRouter,
+  createMemoryRouter,
+  createPath,
+  createRoutesFromChildren,
+  createRoutesFromElements,
+  createSearchParams,
+  runtime_default as default,
+  defer,
+  generatePath,
+  isRouteErrorResponse,
+  json,
+  matchPath,
+  matchRoutes,
+  modifyRoutes,
+  redirect,
+  renderMatches,
+  renderRoutes,
+  resolvePath,
+  unstable_useBlocker,
+  unstable_usePrompt,
+  useActionData,
+  useAsyncError,
+  useAsyncValue,
+  useBeforeUnload,
+  useFetcher,
+  useFetchers,
+  useFormAction,
+  useHref,
+  useInRouterContext,
+  useLinkClickHandler,
+  useLoaderData,
+  useLocation,
+  useMatch,
+  useMatches,
+  useNavigate,
+  useNavigation,
+  useNavigationType,
+  useOutlet,
+  useOutletContext,
+  useParams,
+  useResolvedPath,
+  useRevalidator,
+  useRouteError,
+  useRouteLoaderData,
+  useRoutes,
+  useSearchParams,
+  useSubmit
+};

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

@@ -9,11 +9,11 @@ import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
-export var finalRouteConfig = {
+var finalRouteConfig = {
   routes: []
 };
-export var beforeCreateRouter = true;
-export function modifyRoutes(modifyFunction) {
+var beforeCreateRouter = true;
+function modifyRoutes(modifyFunction) {
   if (beforeCreateRouter) {
     var originRoutes = finalRouteConfig.routes;
     var newRoutes = modifyFunction(originRoutes);
@@ -22,7 +22,7 @@ export function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-export var routerPlugin = function(param) {
+var routerPlugin = function(param) {
   var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
   var select = function(pathname) {
     return serverBase.find(function(baseUrl) {
@@ -42,8 +42,8 @@ export var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           context.router = {
-            useMatches: useMatches,
-            useLocation: useLocation
+            useMatches,
+            useLocation
           };
           Object.defineProperty(context, "routes", {
             get: function get() {
@@ -51,14 +51,14 @@ export var routerPlugin = function(param) {
             }
           });
           return next({
-            context: context
+            context
           });
         },
         hoc: function(param2, next) {
           var App = param2.App;
           if (!finalRouteConfig && !createRoutes) {
             return next({
-              App: App
+              App
             });
           }
           var getRouteApp = function() {
@@ -77,16 +77,16 @@ export var routerPlugin = function(param) {
                 }
                 routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                   routesConfig: finalRouteConfig,
-                  props: props
+                  props
                 }));
                 var runner = api.useHookRunners();
                 routes = runner.modifyRoutes(routes);
                 var router = supportHtml5History ? createBrowserRouter(routes, {
                   basename: _basename,
-                  hydrationData: hydrationData
+                  hydrationData
                 }) : createHashRouter(routes, {
                   basename: _basename,
-                  hydrationData: hydrationData
+                  hydrationData
                 });
                 var originSubscribe = router.subscribe;
                 router.subscribe = function(listener) {
@@ -122,7 +122,7 @@ export var routerPlugin = function(param) {
               var router = useCreateRouter(props);
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
-                  router: router
+                  router
                 })
               }));
             };
@@ -145,8 +145,8 @@ export var routerPlugin = function(param) {
           var remixRouter = context.remixRouter;
           if (!remixRouter) {
             return next({
-              context: context,
-              pickedContext: pickedContext
+              context,
+              pickedContext
             });
           }
           var router = {
@@ -156,9 +156,9 @@ export var routerPlugin = function(param) {
             }
           };
           return next({
-            context: context,
+            context,
             pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-              router: router
+              router
             })
           });
         }
@@ -166,3 +166,9 @@ export var routerPlugin = function(param) {
     }
   };
 };
+export {
+  beforeCreateRouter,
+  finalRouteConfig,
+  modifyRoutes,
+  routerPlugin
+};

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

@@ -29,7 +29,7 @@ function createFetchRequest(req) {
   };
   return new Request(url.href, init);
 }
-export function createFetchHeaders(requestHeaders) {
+function createFetchHeaders(requestHeaders) {
   var headers = new Headers();
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
@@ -78,7 +78,7 @@ export function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-export var routerPlugin = function(param) {
+var routerPlugin = function(param) {
   var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
   return {
     name: "@modern-js/plugin-router",
@@ -98,7 +98,7 @@ export var routerPlugin = function(param) {
                     return [
                       2,
                       next({
-                        context: context
+                        context
                       })
                     ];
                   }
@@ -109,12 +109,12 @@ export var routerPlugin = function(param) {
                   requestContext = createRequestContext();
                   requestContext.set(reporterCtx, reporter);
                   routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                    routesConfig: routesConfig,
-                    ssrMode: ssrMode,
+                    routesConfig,
+                    ssrMode,
                     props: {
-                      nonce: nonce
+                      nonce
                     },
-                    reporter: reporter
+                    reporter
                   }));
                   runner = api.useHookRunners();
                   routes = runner.modifyRoutes(routes);
@@ -126,7 +126,7 @@ export var routerPlugin = function(param) {
                   return [
                     4,
                     query(remixRequest, {
-                      requestContext: requestContext
+                      requestContext
                     })
                   ];
                 case 1:
@@ -148,7 +148,7 @@ export var routerPlugin = function(param) {
                   return [
                     2,
                     next({
-                      context: context
+                      context
                     })
                   ];
               }
@@ -159,7 +159,7 @@ export var routerPlugin = function(param) {
           var App = param2.App;
           if (!routesConfig) {
             return next({
-              App: App
+              App
             });
           }
           var getRouteApp = function() {
@@ -189,8 +189,8 @@ export var routerPlugin = function(param) {
           var remixRouter = context.remixRouter;
           if (!remixRouter) {
             return next({
-              context: context,
-              pickedContext: pickedContext
+              context,
+              pickedContext
             });
           }
           var router = {
@@ -200,9 +200,9 @@ export var routerPlugin = function(param) {
             }
           };
           return next({
-            context: context,
+            context,
             pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-              router: router
+              router
             })
           });
         }
@@ -210,5 +210,10 @@ export var routerPlugin = function(param) {
     }
   };
 };
-export var modifyRoutes = function() {
+var modifyRoutes = function() {
+};
+export {
+  createFetchHeaders,
+  modifyRoutes,
+  routerPlugin
 };

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

@@ -1 +0,0 @@
-export {};

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

@@ -9,7 +9,7 @@ import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
-export function getRouteComponents(routes, param) {
+function getRouteComponents(routes, param) {
   var globalApp = param.globalApp, ssrMode = param.ssrMode, props = param.props, reporter = param.reporter;
   var Layout = function(_param) {
     var Component = _param.Component, props2 = _object_without_properties(_param, [
@@ -20,7 +20,7 @@ export function getRouteComponents(routes, param) {
       return /* @__PURE__ */ _jsx(Component, _object_spread({}, props2));
     }
     return /* @__PURE__ */ _jsx(GlobalLayout, _object_spread({
-      Component: Component
+      Component
     }, props2));
   };
   var routeElements = [];
@@ -31,8 +31,8 @@ export function getRouteComponents(routes, param) {
       if (route.type === "nested") {
         var routeElement = renderNestedRoute(route, {
           DeferredDataComponent: ssrMode === "stream" ? DeferredDataScripts : void 0,
-          props: props,
-          reporter: reporter
+          props,
+          reporter
         });
         routeElements.push(routeElement);
       } else {
@@ -65,7 +65,7 @@ export function getRouteComponents(routes, param) {
   }, "*"));
   return routeElements;
 }
-export function renderRoutes(param) {
+function renderRoutes(param) {
   var routesConfig = param.routesConfig, props = param.props, ssrMode = param.ssrMode, reporter = param.reporter;
   if (!routesConfig) {
     return null;
@@ -75,14 +75,14 @@ export function renderRoutes(param) {
     return null;
   }
   var routeElements = getRouteComponents(routes, {
-    globalApp: globalApp,
-    ssrMode: ssrMode,
-    props: props,
-    reporter: reporter
+    globalApp,
+    ssrMode,
+    props,
+    reporter
   });
   return routeElements;
 }
-export function getLocation(serverContext) {
+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 === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
@@ -92,7 +92,7 @@ export function getLocation(serverContext) {
   }
   return cleanUrl.substring(index);
 }
-export var urlJoin = function() {
+var urlJoin = function() {
   for (var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++) {
     parts[_key] = arguments[_key];
   }
@@ -100,7 +100,7 @@ export var urlJoin = function() {
   var replace = new RegExp("".concat(separator, "{1,}"), "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
+function standardSlash(str) {
   var addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -116,7 +116,7 @@ export function standardSlash(str) {
   }
   return addr;
 }
-export function serializeErrors(errors) {
+function serializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -156,7 +156,7 @@ export function serializeErrors(errors) {
   }
   return serialized;
 }
-export function deserializeErrors(errors) {
+function deserializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -192,3 +192,12 @@ export function deserializeErrors(errors) {
   }
   return serialized;
 }
+export {
+  deserializeErrors,
+  getLocation,
+  getRouteComponents,
+  renderRoutes,
+  serializeErrors,
+  standardSlash,
+  urlJoin
+};

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

@@ -2,15 +2,18 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
-export var withRouter = function(Component) {
+var withRouter = function(Component) {
   return function(props) {
     var location = useLocation();
     var params = useParams();
     var navigate = useNavigate();
     return /* @__PURE__ */ _jsx(Component, _object_spread_props(_object_spread({}, props), {
-      location: location,
-      params: params,
-      navigate: navigate
+      location,
+      params,
+      navigate
     }));
   };
 };
+export {
+  withRouter
+};

package/dist/esm/runtimeContext.js

@@ -1,3 +1,7 @@
 import { createContext } from "react";
-export var RuntimeReactContext = createContext({});
-export var ServerRouterContext = createContext({});
+var RuntimeReactContext = createContext({});
+var ServerRouterContext = createContext({});
+export {
+  RuntimeReactContext,
+  ServerRouterContext
+};

package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js

@@ -1,109 +1,118 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 import crypto from "crypto";
-import { Buffer } from "buffer";
+import { Buffer as Buffer2 } from "buffer";
 import * as t from "@babel/types";
 import { get } from "@modern-js/utils/lodash";
-var RUNTIME_PACKAGE_NAMES = [
-  "@modern-js/runtime"
-];
-var FUNCTION_USE_LOADER_NAME = "useLoader";
-function getHash(filepath) {
-  var cwd = process.cwd();
-  var point = filepath.indexOf(cwd);
-  var relativePath = filepath;
-  if (point !== -1) {
-    relativePath = filepath.substring(point + cwd.length);
-  }
-  var fileBuf = Buffer.from(relativePath);
-  var fsHash = crypto.createHash("md5");
-  var md5 = fsHash.update(fileBuf).digest("hex");
-  return md5;
-}
-function getUseLoaderPath(path, calleeName) {
-  var node = path.node;
-  if (!calleeName || node.callee.name !== calleeName) {
-    return false;
-  }
-  var arg1 = get(node, "arguments.0");
-  if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
-    var loaderPath = path.get("arguments.0");
-    if (isDuplicateInnerLoader(loaderPath)) {
-      return false;
-    } else {
-      return loaderPath;
-    }
-  }
-  console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
-  throw path.buildCodeFrameError("\n    please check the usage of ".concat(path.node.name, "\n  "));
-}
-function isDuplicateInnerLoader(path) {
-  var node = path.node;
-  if (t.isFunctionExpression(node.callee)) {
-    if (t.isBlockStatement(node.callee.body)) {
-      if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
-        return true;
+var require_babel_plugin_ssr_loader_id = __commonJS({
+  "src/ssr/cli/babel-plugin-ssr-loader-id.ts"(exports, module) {
+    var RUNTIME_PACKAGE_NAMES = [
+      "@modern-js/runtime"
+    ];
+    var FUNCTION_USE_LOADER_NAME = "useLoader";
+    function getHash(filepath) {
+      var cwd = process.cwd();
+      var point = filepath.indexOf(cwd);
+      var relativePath = filepath;
+      if (point !== -1) {
+        relativePath = filepath.substring(point + cwd.length);
       }
+      var fileBuf = Buffer2.from(relativePath);
+      var fsHash = crypto.createHash("md5");
+      var md5 = fsHash.update(fileBuf).digest("hex");
+      return md5;
     }
-  }
-  return false;
-}
-function getSelfRunLoaderExpression(loaderExpression, id) {
-  return t.callExpression(t.functionExpression(null, [], t.blockStatement([
-    t.variableDeclaration("var", [
-      t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
-    ]),
-    t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
-    t.returnStatement(t.identifier("innerLoader"))
-  ])), []);
-}
-module.exports = function() {
-  var genId = function genId2() {
-    return "".concat(hash, "_").concat(index++);
-  };
-  var useLoader = null;
-  var hash = "";
-  var index = 0;
-  return {
-    name: "babel-plugin-ssr-loader-id",
-    pre: function pre() {
-      index = 0;
-      useLoader = null;
-      hash = "";
-    },
-    visitor: {
-      ImportDeclaration: function ImportDeclaration(path, state) {
-        if (useLoader) {
-          return false;
-        }
-        if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+    function getUseLoaderPath(path, calleeName) {
+      var node = path.node;
+      if (!calleeName || node.callee.name !== calleeName) {
+        return false;
+      }
+      var arg1 = get(node, "arguments.0");
+      if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
+        var loaderPath = path.get("arguments.0");
+        if (isDuplicateInnerLoader(loaderPath)) {
           return false;
+        } else {
+          return loaderPath;
         }
-        hash = getHash(state.file.opts.filename);
-        get(path, "node.specifiers", []).forEach(function(param) {
-          var imported = param.imported, local = param.local;
-          if (!imported) {
-            throw path.buildCodeFrameError("please `import { useLoader } from ".concat(RUNTIME_PACKAGE_NAMES[0], "`"));
-          }
-          if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
-            useLoader = local.name;
-          }
-        });
-        return false;
-      },
-      CallExpression: function CallExpression(path) {
-        var loaderPath = getUseLoaderPath(path, useLoader);
-        if (loaderPath) {
-          if (!Array.isArray(loaderPath)) {
-            loaderPath = [
-              loaderPath
-            ];
+      }
+      console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
+      throw path.buildCodeFrameError("\n    please check the usage of ".concat(path.node.name, "\n  "));
+    }
+    function isDuplicateInnerLoader(path) {
+      var node = path.node;
+      if (t.isFunctionExpression(node.callee)) {
+        if (t.isBlockStatement(node.callee.body)) {
+          if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
+            return true;
           }
-          loaderPath.forEach(function(p) {
-            p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
-          });
-          return false;
         }
-        return false;
       }
+      return false;
     }
-  };
-};
+    function getSelfRunLoaderExpression(loaderExpression, id) {
+      return t.callExpression(t.functionExpression(null, [], t.blockStatement([
+        t.variableDeclaration("var", [
+          t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
+        ]),
+        t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
+        t.returnStatement(t.identifier("innerLoader"))
+      ])), []);
+    }
+    module.exports = function() {
+      var genId = function genId2() {
+        return "".concat(hash, "_").concat(index++);
+      };
+      var useLoader = null;
+      var hash = "";
+      var index = 0;
+      return {
+        name: "babel-plugin-ssr-loader-id",
+        pre: function pre() {
+          index = 0;
+          useLoader = null;
+          hash = "";
+        },
+        visitor: {
+          ImportDeclaration: function ImportDeclaration(path, state) {
+            if (useLoader) {
+              return false;
+            }
+            if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+              return false;
+            }
+            hash = getHash(state.file.opts.filename);
+            get(path, "node.specifiers", []).forEach(function(param) {
+              var imported = param.imported, local = param.local;
+              if (!imported) {
+                throw path.buildCodeFrameError("please `import { useLoader } from ".concat(RUNTIME_PACKAGE_NAMES[0], "`"));
+              }
+              if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
+                useLoader = local.name;
+              }
+            });
+            return false;
+          },
+          CallExpression: function CallExpression(path) {
+            var loaderPath = getUseLoaderPath(path, useLoader);
+            if (loaderPath) {
+              if (!Array.isArray(loaderPath)) {
+                loaderPath = [
+                  loaderPath
+                ];
+              }
+              loaderPath.forEach(function(p) {
+                p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
+              });
+              return false;
+            }
+            return false;
+          }
+        }
+      };
+    };
+  }
+});
+export default require_babel_plugin_ssr_loader_id();