@modern-js/runtime 2.35.0 → 2.35.1

package/dist/cjs/core/compatible.js

@@ -72,16 +72,15 @@ const createApp = ({ plugins, props: globalProps }) => {
     }, {
       onLast: ({ App: App2 }) => {
         const WrapComponent = ({ context, ...props }) => {
-          var _contextValue;
           let contextValue = context;
-          if (!((_contextValue = contextValue) === null || _contextValue === void 0 ? void 0 : _contextValue.runner)) {
+          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
             contextValue = getInitialContext(runner);
             runner.init({
               context: contextValue
             }, {
               onLast: ({ context: context1 }) => {
-                var _App_init, _App;
-                return (_App = App2) === 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;
+                return App2 === null || App2 === void 0 ? void 0 : (_App_init = App2.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App2, context1);
               }
             });
           }
@@ -117,8 +116,8 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
     context: _context
   }, {
     onLast: ({ context: 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);
+      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);
     }
   });
   if (!id) {
@@ -129,9 +128,9 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
   const isBrowser = typeof window !== "undefined" && window.name !== "nodejs";
   if (isBrowser) {
     if (isClientArgs(id)) {
-      var _ssrData_data, _ssrData, _ssrData1, _ssrData_data1, _ssrData2;
+      var _ssrData_data, _ssrData_data1;
       const ssrData = window._SSR_DATA;
-      const loadersData = ((_ssrData = ssrData) === null || _ssrData === void 0 ? void 0 : (_ssrData_data = _ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
+      const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
       const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
         const loaderData = loadersData[key];
         if (loaderData.loading !== false) {
@@ -145,10 +144,10 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
           skipStatic: true
         }),
         ...ssrData ? {
-          ssrContext: (_ssrData1 = ssrData) === null || _ssrData1 === void 0 ? void 0 : _ssrData1.context
+          ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
         } : {}
       });
-      context.initialData = (_ssrData2 = ssrData) === null || _ssrData2 === void 0 ? void 0 : (_ssrData_data1 = _ssrData2.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
+      context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
       const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;

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

@@ -25,7 +25,7 @@ const useLoader = (loaderFn, options = {
     delete options._cache;
   }
   const load = (0, _react.useCallback)((params) => {
-    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA_data, _window__SSR_DATA, _window, _loaderRef_current;
+    var _unlistenLoaderChangeRef_current, _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();
@@ -45,7 +45,7 @@ const useLoader = (loaderFn, options = {
       params
     });
     loaderRef.current = loaderManager.get(id);
-    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
+    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
     if (isSSRRender) {
       return void 0;
     }
@@ -59,12 +59,12 @@ const useLoader = (loaderFn, options = {
     unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange((_status, _result) => {
       setResult(_result);
       if (_status === _loaderManager.LoaderStatus.fulfilled) {
-        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);
+        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);
       }
       if (_status === _loaderManager.LoaderStatus.rejected) {
-        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);
+        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);
       }
     });
     return res;
@@ -72,8 +72,8 @@ const useLoader = (loaderFn, options = {
     options.skip
   ]);
   (0, _react.useEffect)(() => () => {
-    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef;
-    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
+    var _unlistenLoaderChangeRef_current;
+    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
   }, []);
   (0, _react.useMemo)(() => {
     var _options_params;

package/dist/cjs/core/plugin.js

@@ -43,13 +43,12 @@ const createRuntime = () => (0, _plugin.createManager)(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
   App.init = async (context) => {
-    var _originalInit, _init1;
     if (!context.loaderManager) {
       context.loaderManager = (0, _loaderManager.createLoaderManager)({});
     }
     await Promise.all([
-      (_originalInit = originalInit) === null || _originalInit === void 0 ? void 0 : _originalInit(context),
-      (_init1 = _init) === null || _init1 === void 0 ? void 0 : _init1(context)
+      originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
+      _init === null || _init === void 0 ? void 0 : _init(context)
     ]);
   };
 };

package/dist/cjs/document/Html.js

@@ -18,8 +18,7 @@ function findTargetChild(tag, children) {
   return children.find((item) => getEleType(item) === tag);
 }
 function getEleType(ele) {
-  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;
+  return typeof (ele === null || ele === void 0 ? void 0 : ele.type) === "function" ? ele.type.name : ele === null || ele === void 0 ? void 0 : ele.type;
 }
 function findTargetElement(tag, children) {
   if (children.length === 0) {
@@ -27,11 +26,11 @@ function findTargetElement(tag, children) {
   }
   let nextChildren = [];
   for (const item of children) {
-    var _item_props, _item;
+    var _item_props;
     if (tag === getEleType(item)) {
       return item;
     }
-    if ((_item = item) === null || _item === void 0 ? void 0 : (_item_props = _item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
+    if (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/cjs/document/cli/index.js

@@ -68,7 +68,6 @@ const documentPlugin = () => ({
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        var _tsConfig, _partialsByEntrypoint;
         const config = api.useResolvedConfigContext();
         const documentParams = getDocParams({
           config,
@@ -83,7 +82,7 @@ const documentPlugin = () => ({
         } catch (err) {
           tsConfig = {};
         }
-        if ((_tsConfig = tsConfig) === null || _tsConfig === void 0 ? void 0 : _tsConfig.compilerOptions) {
+        if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) {
           tsConfig.compilerOptions.jsx = "react-jsx";
         } else {
           tsConfig.compilerOptions = {
@@ -143,7 +142,7 @@ const documentPlugin = () => ({
           partialsHead: "",
           partialsBody: ""
         };
-        if ((_partialsByEntrypoint = partialsByEntrypoint) === null || _partialsByEntrypoint === void 0 ? void 0 : _partialsByEntrypoint[entryName]) {
+        if (partialsByEntrypoint === null || partialsByEntrypoint === void 0 ? void 0 : partialsByEntrypoint[entryName]) {
           partialsContent.partialsTop = partialsByEntrypoint[entryName].top.join("\n");
           partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
           partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
@@ -176,9 +175,8 @@ const documentPlugin = () => ({
         return {
           tools: {
             htmlPlugin: (options, entry) => {
-              var _options, _options1, _options2;
-              const hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : {
-                ...(_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters
+              const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
+                ...options === null || options === void 0 ? void 0 : options.templateParameters
               };
               const templateContent = documentEntry(
                 entry.entryName,

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

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

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

@@ -10,15 +10,14 @@ Object.defineProperty(exports, "default", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
-const _router = require("@modern-js/utils/runtime/router");
-const _runtimenode = require("@modern-js/utils/runtime-node");
+const _router = require("@modern-js/runtime-utils/router");
+const _node = require("@modern-js/runtime-utils/node");
 const _common = require("../../common");
 const _utils = require("./utils");
 const 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}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
 const DeferredDataScripts = (props) => {
-  var _props;
   const context = (0, _react.useContext)(_router.UNSAFE_DataRouterContext);
   const { staticContext } = context || {};
   const hydratedRef = (0, _react.useRef)(false);
@@ -35,7 +34,7 @@ const DeferredDataScripts = (props) => {
       errors: (0, _utils.serializeErrors)(staticContext.errors)
     };
     let initialScripts = [
-      `_ROUTER_DATA = ${(0, _runtimenode.serializeJson)(_ROUTER_DATA)};`,
+      `_ROUTER_DATA = ${(0, _node.serializeJson)(_ROUTER_DATA)};`,
       `_ROUTER_DATA.s = ${setupFnStr}`,
       `_ROUTER_DATA.r = ${resolveFnStr}`,
       `_ROUTER_DATA.p = ${preResolvedFnStr}`
@@ -46,9 +45,8 @@ const DeferredDataScripts = (props) => {
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseStr = deferredKeys.map((key) => {
         if (pendingKeys.has(key)) {
-          var _props2;
           deferredDataScripts.push(/* @__PURE__ */ (0, _jsxruntime.jsx)(DeferredDataScript, {
-            nonce: (_props2 = props) === null || _props2 === void 0 ? void 0 : _props2.nonce,
+            nonce: props === null || props === void 0 ? void 0 : props.nonce,
             data: deferredData.data[key],
             dataKey: key,
             routeId
@@ -61,12 +59,12 @@ const DeferredDataScripts = (props) => {
               message: trackedPromise._error.message,
               stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
             };
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, _runtimenode.serializeJson)(error)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, _node.serializeJson)(error)})`;
           } else {
             if (typeof trackedPromise._data === "undefined") {
               throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
             }
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, _runtimenode.serializeJson)(trackedPromise._data)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, _node.serializeJson)(trackedPromise._data)})`;
           }
         }
       }).join(",\n");
@@ -84,7 +82,7 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ (0, _jsxruntime.jsx)("script", {
         async: true,
-        nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce,
+        nonce: props === null || props === void 0 ? void 0 : props.nonce,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
           __html: deferredScripts[0]
@@ -109,7 +107,7 @@ const DeferredDataScript = ({ data, routeId, dataKey, nonce }) => {
         nonce,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
-          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, _runtimenode.serializeJson)(data2)});`
+          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, _node.serializeJson)(data2)});`
         }
       })
     }) : null
@@ -121,7 +119,7 @@ const ErrorDeferredDataScript = ({ routeId, dataKey, nonce }) => {
     nonce,
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {
-      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, _runtimenode.serializeJson)({
+      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, _node.serializeJson)({
         message: error.message,
         stack: error.stack
       })});`

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

@@ -23,12 +23,11 @@ _export(exports, {
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
-const _router = require("@modern-js/utils/runtime/router");
+const _router = require("@modern-js/runtime-utils/router");
 const _core = require("../../core");
 function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
-    var _theirHandler;
-    (_theirHandler = theirHandler) === null || _theirHandler === void 0 ? void 0 : _theirHandler(event);
+    theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
     if (!event.defaultPrevented) {
       ourHandler(event);
     }
@@ -94,8 +93,7 @@ async function loadRouteModule(route, routeAssets) {
   }
   try {
     await Promise.all(chunkIds.map((chunkId) => {
-      var __webpack_chunk_load__1;
-      return (__webpack_chunk_load__1 = __webpack_chunk_load__) === null || __webpack_chunk_load__1 === void 0 ? void 0 : __webpack_chunk_load__1(String(chunkId));
+      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
     }));
   } catch (error) {
     console.error(error);
@@ -129,8 +127,7 @@ const PrefetchPageLinks = ({ pathname }) => {
   const { routeAssets } = routeManifest || {};
   const matches = Array.isArray(routes) ? (0, _router.matchRoutes)(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    var _matches;
-    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match) => loadRouteModule(match.route, routeAssets));
+    matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
   }
   if (!window._SSR_DATA) {
     return null;
@@ -145,8 +142,7 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = (0, _router.useMatches)();
   const basename = (0, _router.useHref)("/");
   const dataHrefs = (0, _react.useMemo)(() => {
-    var _matches;
-    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter((match, index) => {
+    return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }

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

@@ -203,7 +203,7 @@ _export(exports, {
   }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
-const _router = require("@modern-js/utils/runtime/router");
+const _router = require("@modern-js/runtime-utils/router");
 const _plugin = require("./plugin");
 const _utils = require("./utils");
 _export_star._(require("./withRouter"), exports);

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

@@ -27,9 +27,9 @@ const _interop_require_default = require("@swc/helpers/_/_interop_require_defaul
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
-const _router = require("@modern-js/utils/runtime/router");
+const _router = require("@modern-js/runtime-utils/router");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
-const _runtimebrowser = require("@modern-js/utils/runtime-browser");
+const _browser = require("@modern-js/runtime-utils/browser");
 const _core = require("../../core");
 const _hooks = require("./hooks");
 const _utils = require("./utils");
@@ -50,7 +50,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
-  window._SERVER_DATA = (0, _runtimebrowser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+  window._SERVER_DATA = (0, _browser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -73,7 +73,6 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App
@@ -88,8 +87,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
               const runtimeContext = (0, _react.useContext)(_core.RuntimeReactContext);
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
               return (0, _react.useMemo)(() => {
-                var _hydrationData;
-                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
                   hydrationData = {
                     ...hydrationData,
                     errors: (0, _utils.deserializeErrors)(hydrationData.errors)
@@ -149,7 +147,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
           if (App) {
             RouteApp = (0, _hoistnonreactstatics.default)(RouteApp, App);
           }
-          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: (0, _hoistnonreactstatics.default)(RouteApp, routesConfig.globalApp)
             });

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

@@ -24,12 +24,12 @@ const _interop_require_default = require("@swc/helpers/_/_interop_require_defaul
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
-const _remixrouter = require("@modern-js/utils/runtime/remix-router");
-const _router = require("@modern-js/utils/runtime-node/router");
+const _remixrouter = require("@modern-js/runtime-utils/remix-router");
+const _router = require("@modern-js/runtime-utils/node/router");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
-const _router1 = require("@modern-js/utils/runtime/router");
-const _runtimenode = require("@modern-js/utils/runtime-node");
-const _time = require("@modern-js/utils/universal/time");
+const _router1 = require("@modern-js/runtime-utils/router");
+const _node = require("@modern-js/runtime-utils/node");
+const _time = require("@modern-js/runtime-utils/time");
 const _constants = require("@modern-js/utils/universal/constants");
 const _core = require("../../core");
 const _utils = require("./utils");
@@ -80,8 +80,8 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const baseUrl = request.baseUrl;
           const _basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, basename) : baseUrl;
           const { reporter, serverTiming } = context.ssrContext;
-          const requestContext = (0, _runtimenode.createRequestContext)();
-          requestContext.set(_runtimenode.reporterCtx, reporter);
+          const requestContext = (0, _node.createRequestContext)();
+          requestContext.set(_node.reporterCtx, reporter);
           let routes = createRoutes ? createRoutes() : (0, _router1.createRoutesFromElements)((0, _utils.renderRoutes)({
             routesConfig,
             ssrMode,
@@ -116,7 +116,6 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!routesConfig) {
             return next({
               App
@@ -136,7 +135,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             };
           };
           const RouteApp = getRouteApp();
-          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: (0, _hoistnonreactstatics.default)(RouteApp, routesConfig.globalApp)
             });

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

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 const _export_star = require("@swc/helpers/_/_export_star");
-_export_star._(require("@modern-js/utils/runtime-node/router"), exports);
+_export_star._(require("@modern-js/runtime-utils/node/router"), exports);

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

@@ -35,9 +35,9 @@ _export(exports, {
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
-const _router = require("@modern-js/utils/runtime/router");
-const _remixrouter = require("@modern-js/utils/runtime/remix-router");
-const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
+const _router = require("@modern-js/runtime-utils/router");
+const _remixrouter = require("@modern-js/runtime-utils/remix-router");
+const _browser = require("@modern-js/runtime-utils/browser");
 const _DefaultNotFound = require("./DefaultNotFound");
 const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default._(require("./DeferredDataScripts"));
 function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
@@ -56,7 +56,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
   const routeElements = [];
   for (const route of routes) {
     if (route.type === "nested") {
-      const routeElement = (0, _nestedroutes.renderNestedRoute)(route, {
+      const routeElement = (0, _browser.renderNestedRoute)(route, {
         DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
         props,
         reporter
@@ -95,9 +95,9 @@ function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   return routeElements;
 }
 function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  const { pathname, url } = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {};
-  const 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 _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;

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

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "withRouter", {
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
-const _router = require("@modern-js/utils/runtime/router");
+const _router = require("@modern-js/runtime-utils/router");
 const withRouter = (Component) => {
   return (props) => {
     const location = (0, _router.useLocation)();

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

@@ -22,13 +22,12 @@ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const PLUGIN_IDENTIFIER = "ssr";
 const hasStringSSREntry = (userConfig) => {
-  var _server, _server1;
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server, output } = userConfig;
-  if ((((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
+  if (((server === null || server === void 0 ? void 0 : server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
     return true;
   }
-  if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (!isStreaming(server.ssrByEntries[name])) {
         return true;
@@ -38,9 +37,8 @@ const hasStringSSREntry = (userConfig) => {
   return false;
 };
 const checkUseStringSSR = (config) => {
-  var _output;
   const { output } = config;
-  return Boolean((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) || hasStringSSREntry(config);
+  return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
 const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
@@ -83,8 +81,8 @@ const ssrPlugin = () => ({
         return {
           source: {
             alias: {
-              // 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"),
+              // ensure that all packages use the same storage in @modern-js/runtime-utils/node
+              "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node"),
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             },
             globalVars: (values, { target }) => {
@@ -114,9 +112,9 @@ const ssrPlugin = () => ({
         pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
         const ssrConfig = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
         if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-          var _this, _runtimeConfig;
+          var _this;
           const runtimeConfig = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-          if (((_this = (_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) === null || _this === void 0 ? void 0 : _this.mode) === "react-router-5") {
+          if (((_this = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _this === void 0 ? void 0 : _this.mode) === "react-router-5") {
             throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
           }
           if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
@@ -142,8 +140,8 @@ const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
-          const chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find((config2) => config2.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;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server;
+          const chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find((config2) => config2.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;
           const config = api.useResolvedConfigContext();
           const { crossorigin, scriptLoading } = config.html;
           const disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;

package/dist/cjs/ssr/index.js

@@ -22,7 +22,7 @@ const _interop_require_default = require("@swc/helpers/_/_interop_require_defaul
 const _jsxruntime = require("react/jsx-runtime");
 const _component = require("@loadable/component");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
-const _runtimebrowser = require("@modern-js/utils/runtime-browser");
+const _browser = require("@modern-js/runtime-utils/browser");
 const _types = require("./serverRender/types");
 const _withCallback = require("./react/withCallback");
 const _utils = require("./utils");
@@ -33,8 +33,8 @@ const ssr = (config) => ({
   setup: () => {
     const mockResp = (0, _utils.mockResponse)();
     if (config.inlineScript === false) {
-      window._SSR_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
-      window._ROUTER_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
+      window._SSR_DATA = (0, _browser.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
+      window._ROUTER_DATA = (0, _browser.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
     }
     return {
       client: async ({ App, context, ModernRender, ModernHydrate }) => {

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

@@ -48,8 +48,7 @@ const ssr = (config = {}) => ({
         });
       },
       pickContext: ({ context, pickedContext }, next) => {
-        var _context;
-        const { request, response } = (_context = context) === null || _context === void 0 ? void 0 : _context.ssrContext;
+        const { request, response } = context === null || context === void 0 ? void 0 : context.ssrContext;
         const { initialData } = context;
         return next({
           context,

package/dist/cjs/ssr/prefetch.js

@@ -10,10 +10,10 @@ Object.defineProperty(exports, "default", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _server = require("react-dom/server");
-const _runtimenode = require("@modern-js/utils/runtime-node");
+const _node = require("@modern-js/runtime-utils/node");
 const _server1 = require("@loadable/server");
-const prefetch = async (App, context, config) => (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
-  var _context_store, _context;
+const prefetch = async (App, context, config) => (0, _node.run)(context.ssrContext.request.headers, async () => {
+  var _context_store;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
   if (!config.disablePrerender) {
@@ -53,7 +53,7 @@ const prefetch = async (App, context, config) => (0, _runtimenode.run)(context.s
     initialData: context.initialData,
     i18nData: context.__i18nData__,
     // todo: move to plugin state
-    storeState: (_context = context) === null || _context === void 0 ? void 0 : (_context_store = _context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+    storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
   };
 });
 const _default = prefetch;

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

@@ -55,9 +55,8 @@ const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName)
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
-      var _prop;
       const prop = next[propName];
-      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
     });
@@ -80,9 +79,8 @@ const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, pro
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
-      var _prop;
       const prop = next[propName];
-      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
     });