@modern-js/runtime 2.17.1 → 2.18.1

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

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -233,7 +233,7 @@ export default function() {
             config: {
               output: config.output
             },
-            entryName,
+            entryName: entryName,
             templateParams: templateParameters
           };
         }
@@ -253,8 +253,8 @@ export default function() {
                       htmlWebpackPlugin = param.htmlWebpackPlugin;
                       documentParams = getDocParams({
                         config: api.useResolvedConfigContext(),
-                        entryName,
-                        templateParameters
+                        entryName: entryName,
+                        templateParameters: templateParameters
                       });
                       tempTsConfigFile = path.join(internalDirectory, "./document/_tempTsconfig.json");
                       userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
@@ -322,7 +322,7 @@ export default function() {
                                   }
                                   return {
                                     path: args.path,
-                                    external
+                                    external: external
                                   };
                                 });
                               }
@@ -398,7 +398,7 @@ export default function() {
                         hackParameters
                       );
                       var documentHtmlOptions = templateContent ? {
-                        templateContent,
+                        templateContent: templateContent,
                         inject: false
                       } : {};
                       return _object_spread({}, options, documentHtmlOptions);

package/dist/esm/document/constants.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

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

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -107,8 +107,8 @@ export default function() {
             throw new Error("should enable runtime.router for entry ".concat(entryName));
           }
           return {
-            entrypoint,
-            imports
+            entrypoint: entrypoint,
+            imports: imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -128,15 +128,15 @@ export default function() {
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({
-                serverBase
+                serverBase: serverBase
               }, runtimeConfig.router), {
                 routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
               })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
             });
           }
           return {
-            entrypoint,
-            plugins
+            entrypoint: entrypoint,
+            plugins: plugins
           };
         },
         addRuntimeExports: function addRuntimeExports() {

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

@@ -59,7 +59,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
 import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "react-router-dom";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./utils";
 var setupFnStr = "function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};";
@@ -97,7 +97,7 @@ var DeferredDataScripts = function() {
           deferredDataScripts.push(/* @__PURE__ */ _jsx(DeferredDataScript, {
             data: deferredData.data[key],
             dataKey: key,
-            routeId
+            routeId: routeId
           }, "".concat(routeId, " | ").concat(key)));
           return "".concat(JSON.stringify(key), ": _ROUTER_DATA.s(").concat(JSON.stringify(routeId), ",").concat(JSON.stringify(key), ") ");
         } else {
@@ -146,8 +146,8 @@ var DeferredDataScript = function(param) {
     children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ _jsx(Await, {
       resolve: data,
       errorElement: /* @__PURE__ */ _jsx(ErrorDeferredDataScript, {
-        routeId,
-        dataKey
+        routeId: routeId,
+        dataKey: dataKey
       }),
       children: function(data2) {
         return /* @__PURE__ */ _jsx("script", {

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

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -380,7 +380,7 @@ var createDataHref = function(href) {
   return /* @__PURE__ */ _jsx("link", {
     rel: "prefetch",
     as: "fetch",
-    href
+    href: href
   }, href);
 };
 var getDataHref = function(route, pathname, basename) {
@@ -404,9 +404,9 @@ var PrefetchPageLinks = function(param) {
     return null;
   }
   return /* @__PURE__ */ _jsx(PrefetchDataLinks, {
-    matches,
-    pathname,
-    routeManifest
+    matches: matches,
+    pathname: pathname,
+    routeManifest: routeManifest
   });
 };
 var PrefetchDataLinks = function(param) {
@@ -455,10 +455,10 @@ var createPrefetchLink = function(Link2) {
       children: [
         /* @__PURE__ */ _jsx(Link2, _object_spread({
           ref: forwardedRef,
-          to
+          to: to
         }, props, prefetchHandlers)),
         shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ _jsx(PrefetchPageLinks, {
-          pathname
+          pathname: pathname
         }) : null
       ]
     });

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

@@ -5,7 +5,7 @@ export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
 export { Link, NavLink } from "./PrefetchLink";
 export var useRouteLoaderData = function(routeId) {
-  var realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
+  var realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
 export {
@@ -63,4 +63,4 @@ export {
   unstable_useBlocker,
   unstable_usePrompt
 } from "react-router-dom";
-export { defer, json, redirect } from "@modern-js/utils/universal/remix-router";
+export { defer, json, redirect } from "@modern-js/utils/runtime/router";

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

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -53,7 +53,7 @@ function _object_spread_props(target, source) {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
 export var finalRouteConfig = {
@@ -89,8 +89,8 @@ export var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           context.router = {
-            useMatches,
-            useLocation
+            useMatches: useMatches,
+            useLocation: useLocation
           };
           Object.defineProperty(context, "routes", {
             get: function get() {
@@ -98,14 +98,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() {
@@ -114,7 +114,7 @@ export var routerPlugin = function(param) {
               beforeCreateRouter = false;
               routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                 routesConfig: finalRouteConfig,
-                props
+                props: props
               }));
               var runner = api.useHookRunners();
               routes = runner.modifyRoutes(routes);
@@ -128,14 +128,14 @@ export var routerPlugin = function(param) {
               }
               var router = supportHtml5History ? createBrowserRouter(routes, {
                 basename: _basename,
-                hydrationData
+                hydrationData: hydrationData
               }) : createHashRouter(routes, {
                 basename: _basename,
-                hydrationData
+                hydrationData: hydrationData
               });
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
-                  router
+                  router: router
                 })
               }));
             };

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

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -248,7 +248,7 @@ var __generator = function(thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/universal/remix-router";
+import { createStaticHandler } from "@modern-js/utils/runtime/router";
 import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "react-router-dom";
@@ -337,7 +337,7 @@ export var routerPlugin = function(param) {
                     return [
                       2,
                       next({
-                        context
+                        context: context
                       })
                     ];
                   }
@@ -345,8 +345,8 @@ export var routerPlugin = function(param) {
                   baseUrl = request.baseUrl;
                   _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
                   routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                    routesConfig,
-                    ssrMode
+                    routesConfig: routesConfig,
+                    ssrMode: ssrMode
                   }));
                   query = createStaticHandler(routes, {
                     basename: _basename
@@ -374,7 +374,7 @@ export var routerPlugin = function(param) {
                   return [
                     2,
                     next({
-                      context
+                      context: context
                     })
                   ];
               }
@@ -385,7 +385,7 @@ export var routerPlugin = function(param) {
           var App = param2.App;
           if (!routesConfig) {
             return next({
-              App
+              App: App
             });
           }
           var getRouteApp = function() {
@@ -393,7 +393,7 @@ export var routerPlugin = function(param) {
               var _useContext = useContext(RuntimeReactContext), router = _useContext.router, routerContext = _useContext.routerContext;
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(StaticRouterProvider, {
-                  router,
+                  router: router,
                   context: routerContext,
                   hydrate: false
                 })

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

@@ -12,7 +12,7 @@ function _array_with_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -149,8 +149,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route } from "react-router-dom";
-import { ErrorResponse, isRouteErrorResponse } from "@modern-js/utils/universal/remix-router";
-import { renderNestedRoute } from "@modern-js/utils/universal/nestedRoutes";
+import { ErrorResponse, isRouteErrorResponse, renderNestedRoute } from "@modern-js/utils/runtime/router";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, param) {
@@ -164,7 +163,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 = [];
@@ -175,7 +174,7 @@ export function getRouteComponents(routes, param) {
       if (route.type === "nested") {
         var routeElement = renderNestedRoute(route, {
           DeferredDataComponent: ssrMode === "stream" ? DeferredDataScripts : void 0,
-          props
+          props: props
         });
         routeElements.push(routeElement);
       } else {
@@ -218,9 +217,9 @@ export function renderRoutes(param) {
     return null;
   }
   var routeElements = getRouteComponents(routes, {
-    globalApp,
-    ssrMode,
-    props
+    globalApp: globalApp,
+    ssrMode: ssrMode,
+    props: props
   });
   return routeElements;
 }

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

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -58,9 +58,9 @@ export var withRouter = function(Component) {
     var params = useParams();
     var navigate = useNavigate();
     return /* @__PURE__ */ _jsx(Component, _object_spread_props(_object_spread({}, props), {
-      location,
-      params,
-      navigate
+      location: location,
+      params: params,
+      navigate: navigate
     }));
   };
 };

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

@@ -48,21 +48,36 @@ export default function() {
         config: function config() {
           var appContext = api.useAppContext();
           pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          var userConfig = api.useResolvedConfigContext();
           var _api_useAppContext = api.useAppContext(), _api_useAppContext_bundlerType = _api_useAppContext.bundlerType, bundlerType = _api_useAppContext_bundlerType === void 0 ? "webpack" : _api_useAppContext_bundlerType;
-          var babelConfig = bundlerType === "webpack" ? function(config2) {
-            var _config_plugins;
-            (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-            var userConfig = api.useResolvedConfigContext();
-            if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
-              var _config_plugins1;
-              (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+          var babelConfig = function() {
+            if (bundlerType === "webpack") {
+              return function(config2) {
+                var _config_plugins;
+                (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+                  var _config_plugins1;
+                  (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                }
+              };
+            } else if (bundlerType === "rspack") {
+              if (isUseSSRBundle(userConfig)) {
+                return function(config2) {
+                  var _config_plugins;
+                  (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                  if (hasStringSSREntry(userConfig)) {
+                    var _config_plugins1;
+                    (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                  }
+                };
+              }
             }
-          } : void 0;
+          }();
           return {
             source: {
               alias: {
-                // ensure that all packages use the same storage in @modern-js/utils/ssr
-                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
+                // ensure that all packages use the same storage in @modern-js/utils/runtime-node
+                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: function(values, param) {
@@ -71,12 +86,12 @@ export default function() {
               }
             },
             tools: {
-              webpackChain: function(chain, param) {
+              bundlerChain: function bundlerChain(chain, param) {
                 var isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
-                var userConfig = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
-                  var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
-                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
+                var userConfig2 = api.useResolvedConfigContext();
+                if (isUseSSRBundle(userConfig2) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig2)) {
+                  var LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
+                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableBundlerPlugin, [
                     {
                       filename: LOADABLE_STATS_FILE
                     }
@@ -117,8 +132,8 @@ export default function() {
             });
           }
           return {
-            entrypoint,
-            imports
+            entrypoint: entrypoint,
+            imports: imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -130,15 +145,15 @@ export default function() {
             });
           }
           return {
-            entrypoint,
-            plugins
+            entrypoint: entrypoint,
+            plugins: plugins
           };
         },
         modifyEntryExport: function modifyEntryExport(param) {
           var entrypoint = param.entrypoint, exportStatement = param.exportStatement;
           if (ssrConfigMap.get(entrypoint.entryName)) {
             return {
-              entrypoint,
+              entrypoint: entrypoint,
               exportStatement: [
                 "export function ".concat(SERVER_RENDER_FUNCTION_NAME, "(context) {\n              return bootstrap(AppWrapper, context)\n            }"),
                 exportStatement
@@ -146,8 +161,8 @@ export default function() {
             };
           }
           return {
-            entrypoint,
-            exportStatement
+            entrypoint: entrypoint,
+            exportStatement: exportStatement
           };
         }
       };