@modern-js/runtime 2.35.0 → 2.35.1

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

@@ -45,7 +45,6 @@ export const documentPlugin = () => ({
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        var _tsConfig, _partialsByEntrypoint;
         const config = api.useResolvedConfigContext();
         const documentParams = getDocParams({
           config,
@@ -60,7 +59,7 @@ export 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 = {
@@ -120,7 +119,7 @@ export 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");
@@ -153,9 +152,8 @@ export 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/esm-node/router/cli/index.js

@@ -43,13 +43,12 @@ export const routerPlugin = () => ({
         ];
       },
       modifyEntryImports({ entrypoint, imports }) {
-        var _runtimeConfig;
         const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
         const { packageName } = api.useAppContext();
         const runtimeConfig = 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 (!isV5(userConfig)) {
             imports.push({
               value: "@modern-js/runtime/plugins",

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

@@ -1,14 +1,13 @@
 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 "@modern-js/utils/runtime/router";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/runtime-utils/router";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./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 = useContext(DataRouterContext);
   const { staticContext } = context || {};
   const hydratedRef = useRef(false);
@@ -36,9 +35,8 @@ const DeferredDataScripts = (props) => {
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseStr = deferredKeys.map((key) => {
         if (pendingKeys.has(key)) {
-          var _props2;
           deferredDataScripts.push(/* @__PURE__ */ _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
@@ -74,7 +72,7 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ _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]

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

@@ -1,11 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
-import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/utils/runtime/router";
+import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/runtime-utils/router";
 import { RuntimeReactContext } from "../../core";
 export 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);
     }
@@ -71,8 +70,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);
@@ -106,8 +104,7 @@ const PrefetchPageLinks = ({ pathname }) => {
   const { routeAssets } = routeManifest || {};
   const matches = Array.isArray(routes) ? 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;
@@ -122,8 +119,7 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = 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/esm-node/router/runtime/index.js

@@ -1,4 +1,4 @@
-import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
+import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
 import { routerPlugin } from "./plugin";
 export { renderRoutes } from "./utils";
 export default routerPlugin;
@@ -66,4 +66,4 @@ export {
   defer,
   json,
   redirect
-} from "@modern-js/utils/runtime/router";
+} from "@modern-js/runtime-utils/router";

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

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
@@ -46,7 +46,6 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App
@@ -61,8 +60,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
               const runtimeContext = useContext(RuntimeReactContext);
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
               return 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: deserializeErrors(hydrationData.errors)
@@ -122,7 +120,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           if (App) {
             RouteApp = hoistNonReactStatics(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: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

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

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
-import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
+import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
+import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { createRoutesFromElements } from "@modern-js/utils/runtime/router";
-import { createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
+import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
@@ -92,7 +92,6 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!routesConfig) {
             return next({
               App
@@ -112,7 +111,7 @@ export 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: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

package/dist/esm-node/router/runtime/server.js

@@ -1 +1 @@
-export * from "@modern-js/utils/runtime-node/router";
+export * from "@modern-js/runtime-utils/node/router";

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Route, isRouteErrorResponse } from "@modern-js/utils/runtime/router";
-import { ErrorResponse } from "@modern-js/utils/runtime/remix-router";
-import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
+import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+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, { globalApp, ssrMode, props, reporter }) {
@@ -59,9 +59,9 @@ export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   return routeElements;
 }
 export 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/esm-node/router/runtime/withRouter.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useLocation, useNavigate, useParams } from "@modern-js/utils/runtime/router";
+import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
 export const withRouter = (Component) => {
   return (props) => {
     const location = useLocation();

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

@@ -2,13 +2,12 @@ import path from "path";
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@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;
@@ -18,9 +17,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);
 };
 export const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
@@ -63,8 +61,8 @@ export 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 }) => {
@@ -94,9 +92,9 @@ export const ssrPlugin = () => ({
         pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
         const ssrConfig = getEntryOptions(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
         if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-          var _this, _runtimeConfig;
+          var _this;
           const runtimeConfig = 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) {
@@ -122,8 +120,8 @@ export 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/esm-node/ssr/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";

package/dist/esm-node/ssr/index.node.js

@@ -26,8 +26,7 @@ export 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/esm-node/ssr/prefetch.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/utils/runtime-node";
+import { run } from "@modern-js/runtime-utils/node";
 import { ChunkExtractor } from "@loadable/server";
 const prefetch = async (App, context, config) => run(context.ssrContext.request.headers, async () => {
-  var _context_store, _context;
+  var _context_store;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
   if (!config.disablePrerender) {
@@ -43,7 +43,7 @@ const prefetch = async (App, context, config) => run(context.ssrContext.request.
     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()
   };
 });
 export default prefetch;

package/dist/esm-node/ssr/react/prerender/util.js

@@ -27,9 +27,8 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, pr
   }, {});
   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]));
       }
     });
@@ -52,9 +51,8 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsLi
   }, {});
   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]);
       }
     });

package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,4 +1,4 @@
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import { attributesToString } from "../utils";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -1,5 +1,5 @@
 import ReactHelmet from "react-helmet";
-import { matchRoutes } from "@modern-js/utils/runtime/router";
+import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
 import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
@@ -20,7 +20,6 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   function injectCss(headTemplate2) {
     return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
-      var _matches;
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -28,7 +27,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const { routeAssets } = routeManifest;
       const cssChunks = [];
       const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match, index) => {
+      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
         if (!index) {
           return;
         }
@@ -37,10 +36,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
           const routeManifest2 = routeAssets[routeId];
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => {
-              var _asset;
-              return ((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.endsWith(".css")) && !headTemplate2.includes(asset);
-            });
+            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset));
             cssChunks.push(..._cssChunks);
           }
         }

package/dist/esm-node/ssr/serverRender/renderToStream/index.js

@@ -1,6 +1,6 @@
 import { createElement } from "react";
-import { run } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { run } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { PreRender } from "../../react/prerender";
 import { SSRErrors, SSRTimings } from "../tracker";
 import renderToPipe from "./renderToPipe";

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js

@@ -13,7 +13,6 @@ function renderToPipe(rootElement, context, options) {
   const chunkVec = [];
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
-      var _ssrContext;
       let renderToPipeableStream;
       try {
         ({ renderToPipeableStream } = require("react-dom/server"));
@@ -21,11 +20,11 @@ function renderToPipe(rootElement, context, options) {
       }
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady() {
-          var _options_onShellReady, _options;
+          var _options_onShellReady;
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.SERVER_RENDER);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellReady = _options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(_options);
+          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
           const injectableTransform = new Transform({
             transform(chunk, _encoding, callback) {
               try {
@@ -53,11 +52,11 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError(error) {
-          var _options_onShellError, _options;
+          var _options_onShellError;
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.CLIENT_RENDER);
           const fallbackHtml = `${shellBefore}${shellAfter}`;
           resolve(fallbackHtml);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellError = _options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(_options, error);
+          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
         }
       });
     });

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -19,13 +19,12 @@ function renderToPipe(rootElement, context, options) {
     }
     const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.SERVER_RENDER);
     try {
-      var _ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onError(error) {
-          var _options_onError, _options;
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, 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, error);
         }
       });
       const reader = readableOriginal.getReader();
@@ -56,8 +55,7 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      var _ssrContext1;
-      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.tracker.trackError(SSRErrors.RENDER_SHELL, err);
+      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.tracker.trackError(SSRErrors.RENDER_SHELL, err);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = getTemplates(context, RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

package/dist/esm-node/ssr/serverRender/renderToString/entry.js

@@ -1,8 +1,8 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import React from "react";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import ReactHelmet from "react-helmet";
-import { time } from "@modern-js/utils/universal/time";
+import { time } from "@modern-js/runtime-utils/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";

package/dist/esm-node/ssr/serverRender/renderToString/index.js

@@ -1,5 +1,5 @@
-import { run } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { run } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { PreRender } from "../../react/prerender";
 import { SSRTimings } from "../tracker";
 import SSREntry from "./entry";

package/dist/esm-node/ssr/serverRender/renderToString/loadable.js

@@ -2,11 +2,10 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, getLoadableScripts } from "../utils";
 const extname = (uri) => {
-  var _uri;
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return `.${(_uri = uri) === null || _uri === void 0 ? void 0 : _uri.split(".").pop()}` || "";
+  return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 class LoadableCollector {
   collect(comopnent) {
@@ -30,35 +29,47 @@ class LoadableCollector {
     const { extractor } = this;
     const chunks = extractor.getChunkAssets(extractor.chunks);
     chunksMap.js = (chunksMap.js || "") + getLoadableScripts(extractor);
+    const attributes = this.generateAttributes();
     for (const v of chunks) {
-      const fileType = extname(v.url).slice(1);
-      const attributes = {};
-      const { crossorigin, scriptLoading = "defer" } = config;
-      if (crossorigin) {
-        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-      }
-      switch (scriptLoading) {
-        case "defer":
-          attributes.defer = true;
-          break;
-        case "module":
-          attributes.type = "module";
-          break;
-        default:
+      if (!v.url) {
+        continue;
       }
+      const fileType = extname(v.url).slice(1);
       if (fileType === "js") {
         const jsChunkReg = new RegExp(`<script .*src="${v.url}".*>`);
         if (!jsChunkReg.test(template)) {
+          const { scriptLoading = "defer" } = config;
+          switch (scriptLoading) {
+            case "defer":
+              attributes.defer = true;
+              break;
+            case "module":
+              attributes.type = "module";
+              break;
+            default:
+          }
           attributes.nonce = nonce;
           const attrsStr = attributesToString(attributes);
           chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
         }
       } else if (fileType === "css") {
-        const attrsStr = attributesToString(attributes);
-        chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
+        const cssChunkReg = new RegExp(`<link .*href="${v.url}".*>`);
+        if (!cssChunkReg.test(template)) {
+          const attrsStr = attributesToString(attributes);
+          chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
+        }
       }
     }
   }
+  generateAttributes() {
+    const { config } = this.options;
+    const { crossorigin } = config;
+    const attributes = {};
+    if (crossorigin) {
+      attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+    }
+    return attributes;
+  }
   constructor(options) {
     _define_property(this, "options", void 0);
     _define_property(this, "extractor", void 0);

package/dist/types/router/runtime/PrefetchLink.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { LinkProps as RouterLinkProps, NavLinkProps as RouterNavLinkProps } from '@modern-js/utils/runtime/router';
+import { LinkProps as RouterLinkProps, NavLinkProps as RouterNavLinkProps } from '@modern-js/runtime-utils/router';
 export declare function composeEventHandlers<EventType extends React.SyntheticEvent | Event>(theirHandler: ((event: EventType) => any) | undefined, ourHandler: (event: EventType) => any): (event: EventType) => any;
 /**
  * Modified from https://github.com/remix-run/remix/blob/9a0601bd704d2f3ee622e0ddacab9b611eb0c5bc/packages/remix-react/components.tsx#L218

package/dist/types/router/runtime/hooks.d.ts

@@ -1,3 +1,3 @@
-import { RouteObject } from '@modern-js/utils/runtime/router';
+import { RouteObject } from '@modern-js/runtime-utils/router';
 declare const modifyRoutes: import("@modern-js/plugin").Waterfall<RouteObject[]>;
 export { modifyRoutes };