@modern-js/app-tools 3.10.1 → 3.10.3

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -28,13 +28,15 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    builderPluginAdapterSSR: ()=>builderPluginAdapterSSR
+    builderPluginAdapterSSR: ()=>builderPluginAdapterSSR,
+    isStreamingSSR: ()=>isStreamingSSR
 });
 const external_path_namespaceObject = require("path");
 const builder_namespaceObject = require("@modern-js/builder");
 const utils_namespaceObject = require("@modern-js/utils");
 const core_namespaceObject = require("@rsbuild/core");
 const utils_js_namespaceObject = require("../../../plugins/analyze/utils.js");
+const routes_js_namespaceObject = require("../../../utils/routes.js");
 const index_js_namespaceObject = require("../bundlerPlugins/index.js");
 const external_lazyCompilation_js_namespaceObject = require("../lazyCompilation.js");
 const builderPluginAdapterSSR = (options)=>({
@@ -44,7 +46,7 @@ const builderPluginAdapterSSR = (options)=>({
             api.modifyRsbuildConfig((config)=>{
                 const merged = (0, core_namespaceObject.mergeRsbuildConfig)(config, {
                     html: {
-                        inject: isStreamingSSR(normalizedConfig) ? 'head' : void 0
+                        inject: ({ entryName, value })=>isStreamingSSR(normalizedConfig, entryName, appContext) ? 'head' : value
                     },
                     server: {
                         compress: isStreamingSSR(normalizedConfig) || (0, utils_namespaceObject.isUseRsc)(normalizedConfig) ? false : void 0
@@ -74,18 +76,20 @@ const builderPluginAdapterSSR = (options)=>({
                 if (!(0, builder_namespaceObject.isHtmlDisabled)(builderConfig, target)) applyAsyncChunkHtmlPlugin({
                     chain,
                     modernConfig: options.normalizedConfig,
+                    appContext,
                     HtmlBundlerPlugin
                 });
             });
         }
     });
-const isStreamingSSR = (userConfig)=>{
+const isStreamingSSR = (userConfig, entryName, appContext)=>{
     const isStreaming = (ssr)=>{
         if (!ssr) return false;
         if ('boolean' == typeof ssr) return ssr;
         return 'string' !== ssr.mode;
     };
     const { server } = userConfig;
+    if (void 0 !== entryName) return isStreaming((0, utils_namespaceObject.getEntryOptions)(entryName, (0, routes_js_namespaceObject.isMainEntry)(entryName, userConfig.source?.mainEntryName), server.ssr, server.ssrByEntries, appContext?.packageName));
     if (isStreaming(server.ssr)) return true;
     if (server?.ssrByEntries && 'object' == typeof server.ssrByEntries) {
         for (const name of Object.keys(server.ssrByEntries))if (isStreaming(server.ssrByEntries[name])) return true;
@@ -108,9 +112,10 @@ function warnUnresolvedRouteComponents(appDirectory, unresolvedByEntry) {
     const detail = Array.from(unresolvedByEntry).map(([entry, comps])=>`${entry}: ${comps.join(', ')}`).join('; ');
     utils_namespaceObject.logger.warn(`[lazyCompilation] Skipped stream SSR route-eager optimization because some route components could not be resolved to a file (${detail}). Lazy compilation may break first-screen CSS/JS for these routes.`);
 }
-function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
+function applyAsyncChunkHtmlPlugin({ chain, modernConfig, appContext, HtmlBundlerPlugin }) {
     if (isStreamingSSR(modernConfig) || (0, utils_namespaceObject.isUseRsc)(modernConfig)) chain.plugin('html-async-chunk').use(index_js_namespaceObject.HtmlAsyncChunkPlugin, [
-        HtmlBundlerPlugin
+        HtmlBundlerPlugin,
+        (entryName)=>(0, utils_namespaceObject.isUseRsc)(modernConfig) || isStreamingSSR(modernConfig, entryName, appContext)
     ]);
 }
 function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
@@ -173,8 +178,10 @@ function applySSRDataLoader(chain, options) {
     chain.module.rule('ssr-data-loader').test(reg).use('data-loader').loader(require.resolve('@modern-js/plugin-data-loader/loader')).end();
 }
 exports.builderPluginAdapterSSR = __webpack_exports__.builderPluginAdapterSSR;
+exports.isStreamingSSR = __webpack_exports__.isStreamingSSR;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "builderPluginAdapterSSR"
+    "builderPluginAdapterSSR",
+    "isStreamingSSR"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -31,7 +31,20 @@ __webpack_require__.d(__webpack_exports__, {
     HtmlAsyncChunkPlugin: ()=>HtmlAsyncChunkPlugin
 });
 const builder_namespaceObject = require("@modern-js/builder");
+const utils_namespaceObject = require("@modern-js/utils");
 class HtmlAsyncChunkPlugin {
+    shouldProcess(plugin) {
+        if (!this.shouldProcessEntry) return true;
+        const { entryName } = plugin.options;
+        if (void 0 === entryName) {
+            if (!this.warnedMissingEntryName) {
+                this.warnedMissingEntryName = true;
+                utils_namespaceObject.logger.warn("[HtmlAsyncChunkPlugin] Skipping streaming script processing because HTML options are missing entryName. When returning a new object from tools.htmlPlugin, spread the original options to preserve entryName.");
+            }
+            return false;
+        }
+        return this.shouldProcessEntry(entryName);
+    }
     apply(compiler) {
         compiler.hooks.compilation.tap(this.name, (compilation)=>{
             const hooks = this.htmlPlugin.getCompilationHooks(compilation);
@@ -51,6 +64,7 @@ class HtmlAsyncChunkPlugin {
                 name: this.name,
                 stage: -1
             }, (assets)=>{
+                if (!this.shouldProcess(assets.plugin)) return assets;
                 const headTags = [];
                 const bodyTags = [];
                 const entryRuntimeUrls = runtimeInEntry ? getEntryRuntimeUrls(assets.publicPath) : new Set();
@@ -79,6 +93,7 @@ class HtmlAsyncChunkPlugin {
                 name: this.name,
                 stage: 1
             }, (assets)=>{
+                if (!this.shouldProcess(assets.plugin)) return assets;
                 const entryRuntimeUrls = getEntryRuntimeUrls(assets.publicPath);
                 for (const tag of assets.bodyTags){
                     const src = tag.attributes?.src;
@@ -113,7 +128,9 @@ class HtmlAsyncChunkPlugin {
             });
         });
     }
-    constructor(htmlPlugin){
+    constructor(htmlPlugin, shouldProcessEntry){
+        this.shouldProcessEntry = shouldProcessEntry;
+        this.warnedMissingEntryName = false;
         this.name = 'HtmlAsyncChunkPlugin';
         this.htmlPlugin = htmlPlugin;
     }

package/dist/cjs/plugins/analyze/getServerRoutes.js

@@ -143,16 +143,18 @@ const collectStaticRoutes = (appContext, config)=>{
     const { appDirectory } = appContext;
     const { source: { configDir }, server: { publicRoutes = {} } } = config;
     const publicFolder = external_path_default().resolve(appDirectory, configDir || '', 'public');
+    const configFolder = external_path_default().resolve(appDirectory, configDir || '');
+    const publicFolderLength = toPosix(publicFolder).length;
     const ignoreFiles = [
         '.gitkeep'
     ];
     return utils_namespaceObject.fs.existsSync(publicFolder) ? (0, external_utils_js_namespaceObject.walkDirectory)(publicFolder).filter((filePath)=>!ignoreFiles.includes(external_path_default().basename(filePath))).map((filePath)=>{
-        const urlPath = `${(0, utils_namespaceObject.urlJoin)(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
+        const urlPath = `${(0, utils_namespaceObject.urlJoin)(toPosix(filePath).slice(publicFolderLength))}`;
         return {
             urlPath: publicRoutes[(0, utils_namespaceObject.removeLeadingSlash)(urlPath)] || urlPath,
             isSPA: true,
             isSSR: false,
-            entryPath: toPosix(external_path_default().relative(external_path_default().resolve(appDirectory, configDir || ''), filePath))
+            entryPath: toPosix(external_path_default().relative(configFolder, filePath))
         };
     }) : [];
 };

package/dist/cjs/plugins/analyze/utils.js

@@ -52,17 +52,21 @@ var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_na
 const utils_namespaceObject = require("@modern-js/utils");
 const core_namespaceObject = require("@swc/core");
 const external_es_module_lexer_namespaceObject = require("es-module-lexer");
-const walkDirectory = (dir)=>external_fs_default().readdirSync(dir).reduce((previous, filename)=>{
-        const filePath = external_path_default().join(dir, filename);
-        if (external_fs_default().statSync(filePath).isDirectory()) return [
-            ...previous,
-            ...walkDirectory(filePath)
-        ];
-        else return [
-            ...previous,
-            filePath
-        ];
-    }, []);
+const walkDirectory = (dir)=>{
+    const files = [];
+    const walk = (current)=>{
+        for (const dirent of external_fs_default().readdirSync(current, {
+            withFileTypes: true
+        })){
+            const filePath = external_path_default().join(current, dirent.name);
+            const isDirectory = dirent.isSymbolicLink() ? external_fs_default().statSync(filePath).isDirectory() : dirent.isDirectory();
+            if (isDirectory) walk(filePath);
+            else files.push(filePath);
+        }
+    };
+    walk(dir);
+    return files;
+};
 const replaceWithAlias = (base, filePath, alias)=>{
     if (filePath.includes(base)) return (0, utils_namespaceObject.normalizeToPosixPath)(external_path_default().join(alias, external_path_default().relative(base, filePath)));
     else return filePath;

package/dist/cjs/plugins/deploy/platforms/netlify.js

@@ -42,7 +42,6 @@ __webpack_require__.d(__webpack_exports__, {
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
-const external_ndepe_namespaceObject = require("ndepe");
 const routes_js_namespaceObject = require("../../../utils/routes.js");
 const index_js_namespaceObject = require("../utils/index.js");
 const generator_js_namespaceObject = require("../utils/generator.js");
@@ -114,7 +113,8 @@ const createNetlifyPreset = ({ appContext, modernConfig, needModernServer })=>{
             const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             const netlifyEntry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server/netlify') : require.resolve('@modern-js/prod-server/netlify');
             if (!entry || !netlifyEntry) throw new Error('Cannot find @modern-js/prod-server');
-            await (0, external_ndepe_namespaceObject.nodeDepEmit)({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -42,7 +42,6 @@ __webpack_require__.d(__webpack_exports__, {
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
-const external_ndepe_namespaceObject = require("ndepe");
 const index_js_namespaceObject = require("../utils/index.js");
 const generator_js_namespaceObject = require("../utils/generator.js");
 const createNodePreset = ({ appContext, modernConfig, api })=>{
@@ -72,7 +71,8 @@ const createNodePreset = ({ appContext, modernConfig, api })=>{
             const filter = (filePath)=>!filePath.startsWith(staticDirectory) && !filePath.endsWith('.map');
             const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            await (0, external_ndepe_namespaceObject.nodeDepEmit)({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: outputDirectory,
                 includeEntries: [

package/dist/cjs/plugins/deploy/platforms/vercel.js

@@ -42,7 +42,6 @@ __webpack_require__.d(__webpack_exports__, {
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
-const external_ndepe_namespaceObject = require("ndepe");
 const routes_js_namespaceObject = require("../../../utils/routes.js");
 const index_js_namespaceObject = require("../utils/index.js");
 const generator_js_namespaceObject = require("../utils/generator.js");
@@ -134,7 +133,8 @@ const createVercelPreset = ({ appContext, modernConfig, needModernServer })=>{
             if (!needModernServer) return;
             const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            await (0, external_ndepe_namespaceObject.nodeDepEmit)({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/esm/builder/shared/builderPlugins/adapterSSR.mjs

@@ -1,7 +1,8 @@
 import { SERVICE_WORKER_ENVIRONMENT_NAME, isHtmlDisabled } from "@modern-js/builder";
-import { fs, isUseRsc, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isUseRsc, isUseSSRBundle, logger } from "@modern-js/utils";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { getServerCombinedModuleFile } from "../../../plugins/analyze/utils.mjs";
+import { isMainEntry } from "../../../utils/routes.mjs";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins/index.mjs";
 import { aggregateEagerRouteComponentFiles, planSSRLazyCompilation } from "../lazyCompilation.mjs";
 import * as __rspack_external_path from "path";
@@ -12,7 +13,7 @@ const builderPluginAdapterSSR = (options)=>({
             api.modifyRsbuildConfig((config)=>{
                 const merged = mergeRsbuildConfig(config, {
                     html: {
-                        inject: isStreamingSSR(normalizedConfig) ? 'head' : void 0
+                        inject: ({ entryName, value })=>isStreamingSSR(normalizedConfig, entryName, appContext) ? 'head' : value
                     },
                     server: {
                         compress: isStreamingSSR(normalizedConfig) || isUseRsc(normalizedConfig) ? false : void 0
@@ -42,18 +43,20 @@ const builderPluginAdapterSSR = (options)=>({
                 if (!isHtmlDisabled(builderConfig, target)) applyAsyncChunkHtmlPlugin({
                     chain,
                     modernConfig: options.normalizedConfig,
+                    appContext,
                     HtmlBundlerPlugin
                 });
             });
         }
     });
-const isStreamingSSR = (userConfig)=>{
+const isStreamingSSR = (userConfig, entryName, appContext)=>{
     const isStreaming = (ssr)=>{
         if (!ssr) return false;
         if ('boolean' == typeof ssr) return ssr;
         return 'string' !== ssr.mode;
     };
     const { server } = userConfig;
+    if (void 0 !== entryName) return isStreaming(getEntryOptions(entryName, isMainEntry(entryName, userConfig.source?.mainEntryName), server.ssr, server.ssrByEntries, appContext?.packageName));
     if (isStreaming(server.ssr)) return true;
     if (server?.ssrByEntries && 'object' == typeof server.ssrByEntries) {
         for (const name of Object.keys(server.ssrByEntries))if (isStreaming(server.ssrByEntries[name])) return true;
@@ -76,9 +79,10 @@ function warnUnresolvedRouteComponents(appDirectory, unresolvedByEntry) {
     const detail = Array.from(unresolvedByEntry).map(([entry, comps])=>`${entry}: ${comps.join(', ')}`).join('; ');
     logger.warn(`[lazyCompilation] Skipped stream SSR route-eager optimization because some route components could not be resolved to a file (${detail}). Lazy compilation may break first-screen CSS/JS for these routes.`);
 }
-function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
+function applyAsyncChunkHtmlPlugin({ chain, modernConfig, appContext, HtmlBundlerPlugin }) {
     if (isStreamingSSR(modernConfig) || isUseRsc(modernConfig)) chain.plugin('html-async-chunk').use(HtmlAsyncChunkPlugin, [
-        HtmlBundlerPlugin
+        HtmlBundlerPlugin,
+        (entryName)=>isUseRsc(modernConfig) || isStreamingSSR(modernConfig, entryName, appContext)
     ]);
 }
 function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
@@ -140,4 +144,4 @@ function applySSRDataLoader(chain, options) {
     const reg = new RegExp(`${absolutePath}.*\\.(loader|data|data.client)\\.[t|j]sx?$`);
     chain.module.rule('ssr-data-loader').test(reg).use('data-loader').loader(require.resolve('@modern-js/plugin-data-loader/loader')).end();
 }
-export { builderPluginAdapterSSR };
+export { builderPluginAdapterSSR, isStreamingSSR };

package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.mjs

@@ -1,5 +1,18 @@
 import { RUNTIME_CHUNK_REGEX } from "@modern-js/builder";
+import { logger } from "@modern-js/utils";
 class HtmlAsyncChunkPlugin {
+    shouldProcess(plugin) {
+        if (!this.shouldProcessEntry) return true;
+        const { entryName } = plugin.options;
+        if (void 0 === entryName) {
+            if (!this.warnedMissingEntryName) {
+                this.warnedMissingEntryName = true;
+                logger.warn("[HtmlAsyncChunkPlugin] Skipping streaming script processing because HTML options are missing entryName. When returning a new object from tools.htmlPlugin, spread the original options to preserve entryName.");
+            }
+            return false;
+        }
+        return this.shouldProcessEntry(entryName);
+    }
     apply(compiler) {
         compiler.hooks.compilation.tap(this.name, (compilation)=>{
             const hooks = this.htmlPlugin.getCompilationHooks(compilation);
@@ -19,6 +32,7 @@ class HtmlAsyncChunkPlugin {
                 name: this.name,
                 stage: -1
             }, (assets)=>{
+                if (!this.shouldProcess(assets.plugin)) return assets;
                 const headTags = [];
                 const bodyTags = [];
                 const entryRuntimeUrls = runtimeInEntry ? getEntryRuntimeUrls(assets.publicPath) : new Set();
@@ -47,6 +61,7 @@ class HtmlAsyncChunkPlugin {
                 name: this.name,
                 stage: 1
             }, (assets)=>{
+                if (!this.shouldProcess(assets.plugin)) return assets;
                 const entryRuntimeUrls = getEntryRuntimeUrls(assets.publicPath);
                 for (const tag of assets.bodyTags){
                     const src = tag.attributes?.src;
@@ -81,7 +96,9 @@ class HtmlAsyncChunkPlugin {
             });
         });
     }
-    constructor(htmlPlugin){
+    constructor(htmlPlugin, shouldProcessEntry){
+        this.shouldProcessEntry = shouldProcessEntry;
+        this.warnedMissingEntryName = false;
         this.name = 'HtmlAsyncChunkPlugin';
         this.htmlPlugin = htmlPlugin;
     }

package/dist/esm/plugins/analyze/getServerRoutes.mjs

@@ -100,16 +100,18 @@ const collectStaticRoutes = (appContext, config)=>{
     const { appDirectory } = appContext;
     const { source: { configDir }, server: { publicRoutes = {} } } = config;
     const publicFolder = path.resolve(appDirectory, configDir || '', 'public');
+    const configFolder = path.resolve(appDirectory, configDir || '');
+    const publicFolderLength = toPosix(publicFolder).length;
     const ignoreFiles = [
         '.gitkeep'
     ];
     return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).filter((filePath)=>!ignoreFiles.includes(path.basename(filePath))).map((filePath)=>{
-        const urlPath = `${urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
+        const urlPath = `${urlJoin(toPosix(filePath).slice(publicFolderLength))}`;
         return {
             urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,
             isSPA: true,
             isSSR: false,
-            entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir || ''), filePath))
+            entryPath: toPosix(path.relative(configFolder, filePath))
         };
     }) : [];
 };

package/dist/esm/plugins/analyze/utils.mjs

@@ -3,17 +3,21 @@ import path from "path";
 import { JS_EXTENSIONS, getCommand, normalizeToPosixPath } from "@modern-js/utils";
 import { transform } from "@swc/core";
 import { parse } from "es-module-lexer";
-const walkDirectory = (dir)=>fs.readdirSync(dir).reduce((previous, filename)=>{
-        const filePath = path.join(dir, filename);
-        if (fs.statSync(filePath).isDirectory()) return [
-            ...previous,
-            ...walkDirectory(filePath)
-        ];
-        else return [
-            ...previous,
-            filePath
-        ];
-    }, []);
+const walkDirectory = (dir)=>{
+    const files = [];
+    const walk = (current)=>{
+        for (const dirent of fs.readdirSync(current, {
+            withFileTypes: true
+        })){
+            const filePath = path.join(current, dirent.name);
+            const isDirectory = dirent.isSymbolicLink() ? fs.statSync(filePath).isDirectory() : dirent.isDirectory();
+            if (isDirectory) walk(filePath);
+            else files.push(filePath);
+        }
+    };
+    walk(dir);
+    return files;
+};
 const replaceWithAlias = (base, filePath, alias)=>{
     if (filePath.includes(base)) return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
     else return filePath;

package/dist/esm/plugins/deploy/platforms/netlify.mjs

@@ -1,6 +1,5 @@
 import node_path from "node:path";
 import { fs, removeModuleSyncFromExports } from "@modern-js/utils";
-import { nodeDepEmit } from "ndepe";
 import { isMainEntry } from "../../../utils/routes.mjs";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
@@ -72,7 +71,8 @@ const createNetlifyPreset = ({ appContext, modernConfig, needModernServer })=>{
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             const netlifyEntry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server/netlify') : require.resolve('@modern-js/prod-server/netlify');
             if (!entry || !netlifyEntry) throw new Error('Cannot find @modern-js/prod-server');
-            await nodeDepEmit({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/esm/plugins/deploy/platforms/node.mjs

@@ -1,6 +1,5 @@
 import node_path from "node:path";
 import { chalk, fs, removeModuleSyncFromExports } from "@modern-js/utils";
-import { nodeDepEmit } from "ndepe";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
 const createNodePreset = ({ appContext, modernConfig, api })=>{
@@ -30,7 +29,8 @@ const createNodePreset = ({ appContext, modernConfig, api })=>{
             const filter = (filePath)=>!filePath.startsWith(staticDirectory) && !filePath.endsWith('.map');
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            await nodeDepEmit({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: outputDirectory,
                 includeEntries: [

package/dist/esm/plugins/deploy/platforms/vercel.mjs

@@ -1,6 +1,5 @@
 import node_path from "node:path";
 import { fs, removeModuleSyncFromExports } from "@modern-js/utils";
-import { nodeDepEmit } from "ndepe";
 import { isMainEntry } from "../../../utils/routes.mjs";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
@@ -92,7 +91,8 @@ const createVercelPreset = ({ appContext, modernConfig, needModernServer })=>{
             if (!needModernServer) return;
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            await nodeDepEmit({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.mjs

@@ -1,9 +1,10 @@
 import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import { SERVICE_WORKER_ENVIRONMENT_NAME, isHtmlDisabled } from "@modern-js/builder";
-import { fs, isUseRsc, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isUseRsc, isUseSSRBundle, logger } from "@modern-js/utils";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { getServerCombinedModuleFile } from "../../../plugins/analyze/utils.mjs";
+import { isMainEntry } from "../../../utils/routes.mjs";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins/index.mjs";
 import { aggregateEagerRouteComponentFiles, planSSRLazyCompilation } from "../lazyCompilation.mjs";
 import * as __rspack_external_path from "path";
@@ -14,7 +15,7 @@ const builderPluginAdapterSSR = (options)=>({
             api.modifyRsbuildConfig((config)=>{
                 const merged = mergeRsbuildConfig(config, {
                     html: {
-                        inject: isStreamingSSR(normalizedConfig) ? 'head' : void 0
+                        inject: ({ entryName, value })=>isStreamingSSR(normalizedConfig, entryName, appContext) ? 'head' : value
                     },
                     server: {
                         compress: isStreamingSSR(normalizedConfig) || isUseRsc(normalizedConfig) ? false : void 0
@@ -44,18 +45,20 @@ const builderPluginAdapterSSR = (options)=>({
                 if (!isHtmlDisabled(builderConfig, target)) applyAsyncChunkHtmlPlugin({
                     chain,
                     modernConfig: options.normalizedConfig,
+                    appContext,
                     HtmlBundlerPlugin
                 });
             });
         }
     });
-const isStreamingSSR = (userConfig)=>{
+const isStreamingSSR = (userConfig, entryName, appContext)=>{
     const isStreaming = (ssr)=>{
         if (!ssr) return false;
         if ('boolean' == typeof ssr) return ssr;
         return 'string' !== ssr.mode;
     };
     const { server } = userConfig;
+    if (void 0 !== entryName) return isStreaming(getEntryOptions(entryName, isMainEntry(entryName, userConfig.source?.mainEntryName), server.ssr, server.ssrByEntries, appContext?.packageName));
     if (isStreaming(server.ssr)) return true;
     if (server?.ssrByEntries && 'object' == typeof server.ssrByEntries) {
         for (const name of Object.keys(server.ssrByEntries))if (isStreaming(server.ssrByEntries[name])) return true;
@@ -78,9 +81,10 @@ function warnUnresolvedRouteComponents(appDirectory, unresolvedByEntry) {
     const detail = Array.from(unresolvedByEntry).map(([entry, comps])=>`${entry}: ${comps.join(', ')}`).join('; ');
     logger.warn(`[lazyCompilation] Skipped stream SSR route-eager optimization because some route components could not be resolved to a file (${detail}). Lazy compilation may break first-screen CSS/JS for these routes.`);
 }
-function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
+function applyAsyncChunkHtmlPlugin({ chain, modernConfig, appContext, HtmlBundlerPlugin }) {
     if (isStreamingSSR(modernConfig) || isUseRsc(modernConfig)) chain.plugin('html-async-chunk').use(HtmlAsyncChunkPlugin, [
-        HtmlBundlerPlugin
+        HtmlBundlerPlugin,
+        (entryName)=>isUseRsc(modernConfig) || isStreamingSSR(modernConfig, entryName, appContext)
     ]);
 }
 function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
@@ -142,4 +146,4 @@ function applySSRDataLoader(chain, options) {
     const reg = new RegExp(`${absolutePath}.*\\.(loader|data|data.client)\\.[t|j]sx?$`);
     chain.module.rule('ssr-data-loader').test(reg).use('data-loader').loader(require.resolve('@modern-js/plugin-data-loader/loader')).end();
 }
-export { builderPluginAdapterSSR };
+export { builderPluginAdapterSSR, isStreamingSSR };

package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.mjs

@@ -1,6 +1,19 @@
 import "node:module";
 import { RUNTIME_CHUNK_REGEX } from "@modern-js/builder";
+import { logger } from "@modern-js/utils";
 class HtmlAsyncChunkPlugin {
+    shouldProcess(plugin) {
+        if (!this.shouldProcessEntry) return true;
+        const { entryName } = plugin.options;
+        if (void 0 === entryName) {
+            if (!this.warnedMissingEntryName) {
+                this.warnedMissingEntryName = true;
+                logger.warn("[HtmlAsyncChunkPlugin] Skipping streaming script processing because HTML options are missing entryName. When returning a new object from tools.htmlPlugin, spread the original options to preserve entryName.");
+            }
+            return false;
+        }
+        return this.shouldProcessEntry(entryName);
+    }
     apply(compiler) {
         compiler.hooks.compilation.tap(this.name, (compilation)=>{
             const hooks = this.htmlPlugin.getCompilationHooks(compilation);
@@ -20,6 +33,7 @@ class HtmlAsyncChunkPlugin {
                 name: this.name,
                 stage: -1
             }, (assets)=>{
+                if (!this.shouldProcess(assets.plugin)) return assets;
                 const headTags = [];
                 const bodyTags = [];
                 const entryRuntimeUrls = runtimeInEntry ? getEntryRuntimeUrls(assets.publicPath) : new Set();
@@ -48,6 +62,7 @@ class HtmlAsyncChunkPlugin {
                 name: this.name,
                 stage: 1
             }, (assets)=>{
+                if (!this.shouldProcess(assets.plugin)) return assets;
                 const entryRuntimeUrls = getEntryRuntimeUrls(assets.publicPath);
                 for (const tag of assets.bodyTags){
                     const src = tag.attributes?.src;
@@ -82,7 +97,9 @@ class HtmlAsyncChunkPlugin {
             });
         });
     }
-    constructor(htmlPlugin){
+    constructor(htmlPlugin, shouldProcessEntry){
+        this.shouldProcessEntry = shouldProcessEntry;
+        this.warnedMissingEntryName = false;
         this.name = 'HtmlAsyncChunkPlugin';
         this.htmlPlugin = htmlPlugin;
     }

package/dist/esm-node/plugins/analyze/getServerRoutes.mjs

@@ -101,16 +101,18 @@ const collectStaticRoutes = (appContext, config)=>{
     const { appDirectory } = appContext;
     const { source: { configDir }, server: { publicRoutes = {} } } = config;
     const publicFolder = path.resolve(appDirectory, configDir || '', 'public');
+    const configFolder = path.resolve(appDirectory, configDir || '');
+    const publicFolderLength = toPosix(publicFolder).length;
     const ignoreFiles = [
         '.gitkeep'
     ];
     return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).filter((filePath)=>!ignoreFiles.includes(path.basename(filePath))).map((filePath)=>{
-        const urlPath = `${urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
+        const urlPath = `${urlJoin(toPosix(filePath).slice(publicFolderLength))}`;
         return {
             urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,
             isSPA: true,
             isSSR: false,
-            entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir || ''), filePath))
+            entryPath: toPosix(path.relative(configFolder, filePath))
         };
     }) : [];
 };

package/dist/esm-node/plugins/analyze/utils.mjs

@@ -4,17 +4,21 @@ import path from "path";
 import { JS_EXTENSIONS, getCommand, normalizeToPosixPath } from "@modern-js/utils";
 import { transform } from "@swc/core";
 import { parse } from "es-module-lexer";
-const walkDirectory = (dir)=>fs.readdirSync(dir).reduce((previous, filename)=>{
-        const filePath = path.join(dir, filename);
-        if (fs.statSync(filePath).isDirectory()) return [
-            ...previous,
-            ...walkDirectory(filePath)
-        ];
-        else return [
-            ...previous,
-            filePath
-        ];
-    }, []);
+const walkDirectory = (dir)=>{
+    const files = [];
+    const walk = (current)=>{
+        for (const dirent of fs.readdirSync(current, {
+            withFileTypes: true
+        })){
+            const filePath = path.join(current, dirent.name);
+            const isDirectory = dirent.isSymbolicLink() ? fs.statSync(filePath).isDirectory() : dirent.isDirectory();
+            if (isDirectory) walk(filePath);
+            else files.push(filePath);
+        }
+    };
+    walk(dir);
+    return files;
+};
 const replaceWithAlias = (base, filePath, alias)=>{
     if (filePath.includes(base)) return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
     else return filePath;

package/dist/esm-node/plugins/deploy/platforms/netlify.mjs

@@ -2,7 +2,6 @@ import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import node_path from "node:path";
 import { fs, removeModuleSyncFromExports } from "@modern-js/utils";
-import { nodeDepEmit } from "ndepe";
 import { isMainEntry } from "../../../utils/routes.mjs";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
@@ -74,7 +73,8 @@ const createNetlifyPreset = ({ appContext, modernConfig, needModernServer })=>{
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             const netlifyEntry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server/netlify') : require.resolve('@modern-js/prod-server/netlify');
             if (!entry || !netlifyEntry) throw new Error('Cannot find @modern-js/prod-server');
-            await nodeDepEmit({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/esm-node/plugins/deploy/platforms/node.mjs

@@ -2,7 +2,6 @@ import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import node_path from "node:path";
 import { chalk, fs, removeModuleSyncFromExports } from "@modern-js/utils";
-import { nodeDepEmit } from "ndepe";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
 const createNodePreset = ({ appContext, modernConfig, api })=>{
@@ -32,7 +31,8 @@ const createNodePreset = ({ appContext, modernConfig, api })=>{
             const filter = (filePath)=>!filePath.startsWith(staticDirectory) && !filePath.endsWith('.map');
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            await nodeDepEmit({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: outputDirectory,
                 includeEntries: [

package/dist/esm-node/plugins/deploy/platforms/vercel.mjs

@@ -2,7 +2,6 @@ import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import node_path from "node:path";
 import { fs, removeModuleSyncFromExports } from "@modern-js/utils";
-import { nodeDepEmit } from "ndepe";
 import { isMainEntry } from "../../../utils/routes.mjs";
 import { readTemplate, resolveESMDependency } from "../utils/index.mjs";
 import { generateHandler } from "../utils/generator.mjs";
@@ -94,7 +93,8 @@ const createVercelPreset = ({ appContext, modernConfig, needModernServer })=>{
             if (!needModernServer) return;
             const entry = isEsmProject ? await resolveESMDependency('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
             if (!entry) throw new Error('Cannot find @modern-js/prod-server');
-            await nodeDepEmit({
+            const { nodeDepEmit: handleDependencies } = await import("ndepe");
+            await handleDependencies({
                 appDir: appDirectory,
                 sourceDir: funcsDirectory,
                 includeEntries: [

package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts

@@ -1,3 +1,6 @@
 import { type RsbuildPlugin } from '@rsbuild/core';
+import type { AppNormalizedConfig } from '../../../types/index.js';
+import type { AppToolsContext } from '../../../types/plugin.js';
 import type { BuilderOptions } from '../types.js';
 export declare const builderPluginAdapterSSR: (options: BuilderOptions) => RsbuildPlugin;
+export declare const isStreamingSSR: (userConfig: AppNormalizedConfig, entryName?: string, appContext?: Pick<AppToolsContext, "packageName">) => boolean;

package/dist/types/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts

@@ -1,7 +1,10 @@
 import type { Rspack } from '@modern-js/builder';
 export declare class HtmlAsyncChunkPlugin {
+    private readonly shouldProcessEntry?;
     name: string;
     htmlPlugin: typeof Rspack.HtmlRspackPlugin;
-    constructor(htmlPlugin: typeof Rspack.HtmlRspackPlugin);
+    private warnedMissingEntryName;
+    constructor(htmlPlugin: typeof Rspack.HtmlRspackPlugin, shouldProcessEntry?: ((entryName: string) => boolean) | undefined);
+    private shouldProcess;
     apply(compiler: Rspack.Compiler): void;
 }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.10.1",
+  "version": "3.10.3",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -126,16 +126,16 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.10.1",
-    "@modern-js/i18n-utils": "3.10.1",
-    "@modern-js/plugin-data-loader": "3.10.1",
-    "@modern-js/plugin": "3.10.1",
-    "@modern-js/prod-server": "3.10.1",
-    "@modern-js/server-core": "3.10.1",
-    "@modern-js/server-utils": "3.10.1",
-    "@modern-js/server": "3.10.1",
-    "@modern-js/types": "3.10.1",
-    "@modern-js/utils": "3.10.1"
+    "@modern-js/builder": "3.10.3",
+    "@modern-js/plugin": "3.10.3",
+    "@modern-js/i18n-utils": "3.10.3",
+    "@modern-js/plugin-data-loader": "3.10.3",
+    "@modern-js/prod-server": "3.10.3",
+    "@modern-js/server": "3.10.3",
+    "@modern-js/server-core": "3.10.3",
+    "@modern-js/server-utils": "3.10.3",
+    "@modern-js/types": "3.10.3",
+    "@modern-js/utils": "3.10.3"
   },
   "devDependencies": {
     "@types/babel__traverse": "7.28.0",
@@ -143,8 +143,8 @@
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0"
+    "@scripts/rstest-config": "2.66.2",
+    "@modern-js/rslib": "3.10.3"
   },
   "peerDependencies": {
     "ts-node": "^10.9.2",