@modern-js/runtime 2.55.0 → 2.56.1

package/dist/esm-node/core/server/string/loadable.js

@@ -111,7 +111,7 @@ class LoadableCollector {
         return link;
       }
     }));
-    chunkSet.jsChunk += css.filter((css2) => Boolean(css2)).join("");
+    chunkSet.cssChunk += css.filter((css2) => Boolean(css2)).join("");
   }
   generateAttributes(extraAtr = {}) {
     const { config } = this.options;

package/dist/esm-node/core/server/string/prefetch.js

@@ -5,13 +5,13 @@ import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
 import React from "react";
 import { SSRErrors, SSRTimings } from "../tracer";
-const prefetch = async (App, request, options, { onError, onTiming }) => {
+const prefetch = async (App, request, options, ssrConfig, { onError, onTiming }) => {
   const headersData = parseHeaders(request);
-  const { runtimeContext: context, resource, config } = options;
+  const { runtimeContext: context, resource } = options;
   const { entryName, loadableStats } = resource;
   return run(headersData, async () => {
     var _context_store;
-    if (!config.disablePrerender) {
+    if (typeof ssrConfig === "boolean" || !ssrConfig.disablePrerender) {
       try {
         const end = time();
         if (loadableStats) {

package/dist/esm-node/core/utils/merge.js

@@ -0,0 +1,29 @@
+function isObject(obj) {
+  return obj && typeof obj === "object" && !Array.isArray(obj);
+}
+function merge(target, ...sources) {
+  if (!sources.length) {
+    return target;
+  }
+  const source = sources.shift();
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) {
+          Object.assign(target, {
+            [key]: {}
+          });
+        }
+        merge(target[key], source[key]);
+      } else {
+        Object.assign(target, {
+          [key]: source[key]
+        });
+      }
+    }
+  }
+  return merge(target, ...sources);
+}
+export {
+  merge
+};

package/dist/esm-node/router/cli/code/index.js

@@ -14,10 +14,10 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
-    const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
+    const { entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry } = entrypoint;
     const { metaName } = api.useAppContext();
     if (isAutoMount) {
-      if (fileSystemRoutes) {
+      if (pageRoutesEntry || nestedRoutesEntry) {
         var _config_output;
         let initialRoutes = [];
         let nestedRoutes = null;

package/dist/esm-node/router/cli/entry.js

@@ -18,29 +18,30 @@ const modifyEntrypoints = (entrypoints, config = {}) => {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
+    if (entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.isCustomSourceEntry) {
+      if (entrypoint.fileSystemRoutes) {
+        if (isRouterV5(config)) {
+          throw Error("Custom entries with conventional routing not support use react router v5!");
+        }
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
+      return entrypoint;
+    }
     const isHasApp = hasApp(entrypoint.absoluteEntryDir);
     if (isHasApp) {
       return entrypoint;
     }
-    const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
     const isHasPages = hasPages(entrypoint.absoluteEntryDir);
-    if (!isHasNestedRoutes && !isHasPages && !entrypoint.fileSystemRoutes) {
-      return entrypoint;
-    }
-    if (entrypoint.fileSystemRoutes && !isRouterV5(config)) {
-      entrypoint.nestedRoutesEntry = entrypoint.entry;
-    } else if (!entrypoint.fileSystemRoutes) {
+    if (isHasPages) {
+      entrypoint.pageRoutesEntry = path.join(entrypoint.absoluteEntryDir, PAGES_DIR_NAME);
       entrypoint.fileSystemRoutes = {
+        ...entrypoint.fileSystemRoutes,
         globalApp: findExists(JS_EXTENSIONS.map((ext) => path.resolve(entrypoint.absoluteEntryDir, `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
       };
-      if (isHasPages) {
-        entrypoint.pageRoutesEntry = path.join(entrypoint.absoluteEntryDir, PAGES_DIR_NAME);
-      }
-      if (isHasNestedRoutes) {
-        entrypoint.nestedRoutesEntry = path.join(entrypoint.absoluteEntryDir, NESTED_ROUTES_DIR);
-      }
-    } else {
-      throw Error("Custom entries with conventional routing not support use react router v5!");
+    }
+    const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
+    if (isHasNestedRoutes) {
+      entrypoint.nestedRoutesEntry = path.join(entrypoint.absoluteEntryDir, NESTED_ROUTES_DIR);
     }
     return entrypoint;
   });

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

@@ -70,7 +70,7 @@ async function loadRouteModule(route, routeAssets) {
   }
   try {
     await Promise.all(chunkIds.map((chunkId) => {
-      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
+      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(chunkId);
     }));
   } catch (error) {
     console.error(error);

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

@@ -12,20 +12,15 @@ import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { renderRoutes, urlJoin } from "./utils";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import DeferredDataScripts from "./DeferredDataScripts.node";
-function createFetchHeaders(requestHeaders) {
-  const headers = new Headers();
-  for (const [key, values] of Object.entries(requestHeaders || {})) {
-    if (values) {
-      if (Array.isArray(values)) {
-        for (const value of values) {
-          headers.append(key, value);
-        }
-      } else {
-        headers.set(key, values);
-      }
-    }
-  }
-  return headers;
+function createRemixReuqest(request) {
+  const method = "GET";
+  const { headers } = request;
+  const controller = new AbortController();
+  return new Request(request.url, {
+    method,
+    headers,
+    signal: controller.signal
+  });
 }
 const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
   return {
@@ -66,7 +61,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const { query } = createStaticHandler(routes, {
             basename: _basename
           });
-          const remixRequest = context.ssrContext.request.raw;
+          const remixRequest = createRemixReuqest(context.ssrContext.request.raw);
           const end = time();
           const routerContext = await query(remixRequest, {
             requestContext
@@ -150,7 +145,6 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
 const modifyRoutes = () => {
 };
 export {
-  createFetchHeaders,
   modifyRoutes,
   routerPlugin
 };

package/dist/types/core/browser/index.d.ts

@@ -1,2 +1,3 @@
 import React from 'react';
+export type RenderFunc = typeof render;
 export declare function render(App: React.ReactElement, id?: HTMLElement | string): Promise<HTMLElement | import("react-dom/client").Root>;

package/dist/types/core/plugin/index.d.ts

@@ -17,4 +17,4 @@ export declare function registerPlugin(internalPlugins: Plugin[], runtimeConfig?
         pickedContext: import("../context/runtime").TRuntimeContext;
     }, import("../context/runtime").TRuntimeContext>;
 }>;
-export declare function mergeConfig(config: Record<string, any>, ...otherConfig: Record<string, any>[]): any;
+export declare function mergeConfig(config: Record<string, any>, ...otherConfig: Record<string, any>[]): Record<string, any>;

package/dist/types/core/server/string/prefetch.d.ts

@@ -2,7 +2,8 @@ import React from 'react';
 import { LoaderResult } from '../../loader/loaderManager';
 import { HandleRequestOptions } from '../requestHandler';
 import { Tracer } from '../tracer';
-export declare const prefetch: (App: React.ReactElement, request: Request, options: HandleRequestOptions, { onError, onTiming }: Tracer) => Promise<{
+import { SSRConfig } from '../shared';
+export declare const prefetch: (App: React.ReactElement, request: Request, options: HandleRequestOptions, ssrConfig: SSRConfig, { onError, onTiming }: Tracer) => Promise<{
     initialData: Record<string, unknown> | undefined;
     i18nData: any;
     loadersData?: undefined;

package/dist/types/core/utils/merge.d.ts

@@ -0,0 +1,6 @@
+type PlainObject = {
+    [key: string]: any;
+};
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+export declare function merge<T extends PlainObject, U extends PlainObject[]>(target: T, ...sources: U): T & UnionToIntersection<U[number]>;
+export {};

package/dist/types/router/runtime/plugin.node.d.ts

@@ -1,6 +1,4 @@
 import type { Plugin } from '../../core';
-import { SSRServerContext } from '../../core/types';
 import type { RouterConfig } from './types';
-export declare function createFetchHeaders(requestHeaders: SSRServerContext['request']['headers']): Headers;
 export declare const routerPlugin: ({ basename, routesConfig, createRoutes, }: RouterConfig) => Plugin;
 export declare const modifyRoutes: () => void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.55.0",
+  "version": "2.56.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -175,14 +175,13 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
-    "@babel/types": "^7.23.0",
+    "@babel/core": "^7.24.7",
+    "@babel/types": "^7.24.7",
     "cookie": "0.5.0",
     "isbot": "3.7.1",
     "@loadable/babel-plugin": "5.15.3",
     "@loadable/component": "5.15.3",
     "@loadable/server": "5.15.3",
-    "@loadable/webpack-plugin": "5.15.2",
     "@modern-js-reduck/plugin-auto-actions": "^1.1.10",
     "@modern-js-reduck/plugin-devtools": "^1.1.10",
     "@modern-js-reduck/plugin-effects": "^1.1.10",
@@ -200,18 +199,18 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/types": "2.55.0",
-    "@modern-js/plugin-data-loader": "2.55.0",
-    "@modern-js/utils": "2.55.0",
-    "@modern-js/runtime-utils": "2.55.0",
-    "@modern-js/plugin": "2.55.0"
+    "@modern-js/types": "2.56.1",
+    "@modern-js/plugin": "2.56.1",
+    "@modern-js/utils": "2.56.1",
+    "@modern-js/plugin-data-loader": "2.56.1",
+    "@modern-js/runtime-utils": "2.56.1"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.7.10",
+    "@rsbuild/core": "1.0.1-beta.3",
     "@types/cookie": "0.5.1",
     "@remix-run/web-fetch": "^4.1.3",
     "@testing-library/react": "^13.4.0",
@@ -226,11 +225,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.92.0",
-    "@modern-js/app-tools": "2.55.0",
-    "@modern-js/core": "2.55.0",
-    "@scripts/jest-config": "2.55.0",
-    "@scripts/build": "2.55.0"
+    "webpack": "^5.93.0",
+    "@modern-js/app-tools": "2.56.1",
+    "@modern-js/core": "2.56.1",
+    "@scripts/build": "2.56.1",
+    "@scripts/jest-config": "2.56.1"
   },
   "sideEffects": false,
   "publishConfig": {