@modern-js/app-tools 3.3.0 → 3.5.0

package/dist/cjs/builder/generator/index.js

@@ -48,6 +48,13 @@ async function generateBuilder(options, bundlerType) {
         else mergedEnvironments[name] = builderConfig.environments[name];
         builderConfig.environments = mergedEnvironments;
     } else builderConfig.environments = environments;
+    const hooks = appContext._internalContext.pluginAPI?.getHooks();
+    if (hooks?.modifyBuilderEnvironments) {
+        const { environments: modifiedEnvironments } = await hooks.modifyBuilderEnvironments.call({
+            environments: builderConfig.environments
+        });
+        builderConfig.environments = modifiedEnvironments;
+    }
     const builder = await (0, builder_namespaceObject.createBuilder)({
         cwd: appContext.appDirectory,
         rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,

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

@@ -127,7 +127,8 @@ function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
             staticJsDir: normalizedConfig.output?.distPath?.js,
             disableFilenameHash: normalizedConfig.output?.filenameHash === false,
             scriptLoading: normalizedConfig.html?.scriptLoading,
-            nonce: normalizedConfig.security?.nonce
+            nonce: normalizedConfig.security?.nonce,
+            useRsc: (0, utils_namespaceObject.isUseRsc)(normalizedConfig)
         }
     ]);
 }

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

@@ -96,6 +96,25 @@ class RouterPlugin {
                     routeAssets: {}
                 });
                 const prevManifest = JSON.parse(prevManifestStr);
+                const namedChunkGroupInstances = new Map();
+                for (const cg of compilation.chunkGroups || [])if (cg.name) namedChunkGroupInstances.set(cg.name, cg);
+                const collectDescendantCssAssets = (name)=>{
+                    const root = namedChunkGroupInstances.get(name);
+                    if (!root) return [];
+                    const cssFiles = new Set();
+                    const visited = new Set();
+                    const stack = [
+                        ...root.childrenIterable
+                    ];
+                    while(stack.length){
+                        const child = stack.pop();
+                        if (visited.has(child)) continue;
+                        visited.add(child);
+                        for (const chunk of child.chunks)for (const file of chunk.files)if (/\.css$/.test(file)) cssFiles.add(publicPath ? normalizePath(publicPath) + file : file);
+                        for (const c of child.childrenIterable)stack.push(c);
+                    }
+                    return Array.from(cssFiles);
+                };
                 const asyncEntryNames = [];
                 for (const [name, chunkGroup] of Object.entries(namedChunkGroups)){
                     if (name.startsWith('async-')) asyncEntryNames.push(name);
@@ -103,7 +122,12 @@ class RouterPlugin {
                         const filename = asset.name;
                         return publicPath ? normalizePath(publicPath) + filename : filename;
                     });
-                    const referenceCssAssets = assets.filter((asset)=>/\.css$/.test(asset));
+                    const directCssAssets = assets.filter((asset)=>/\.css$/.test(asset));
+                    const descendantCssAssets = collectDescendantCssAssets(name).filter((asset)=>!directCssAssets.includes(asset));
+                    const referenceCssAssets = [
+                        ...directCssAssets,
+                        ...descendantCssAssets
+                    ];
                     routeAssets[name] = {
                         chunkIds: chunkGroup.chunks,
                         assets,
@@ -145,10 +169,14 @@ class RouterPlugin {
                     const manifest = {
                         routeAssets: relatedAssets
                     };
+                    const { useRsc } = this;
                     const injectedContent = `
             ;(function(){
               window.${constants_namespaceObject.ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v)=>{
-                        if (('assets' === k || 'referenceCssAssets' === k) && Array.isArray(v)) return v.map((item)=>item.replace(publicPath, ''));
+                        if (('assets' === k || 'referenceCssAssets' === k) && Array.isArray(v)) {
+                            if (!useRsc) return;
+                            return v.map((item)=>item.replace(publicPath, ''));
+                        }
                         return v;
                     })};
             })();
@@ -176,7 +204,7 @@ class RouterPlugin {
             });
         });
     }
-    constructor({ staticJsDir = 'static/js', HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = 'defer', nonce }){
+    constructor({ staticJsDir = 'static/js', HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = 'defer', nonce, useRsc = false }){
         this.name = 'RouterPlugin';
         this.HtmlBundlerPlugin = HtmlBundlerPlugin;
         this.enableInlineRouteManifests = enableInlineRouteManifests;
@@ -184,6 +212,7 @@ class RouterPlugin {
         this.disableFilenameHash = disableFilenameHash;
         this.scriptLoading = scriptLoading;
         this.nonce = nonce;
+        this.useRsc = useRsc;
     }
 }
 exports.RouterPlugin = __webpack_exports__.RouterPlugin;

package/dist/cjs/index.js

@@ -195,6 +195,7 @@ var __webpack_exports__ = {};
                 deploy: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 checkEntryPoint: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 modifyEntrypoints: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
+                modifyBuilderEnvironments: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 modifyFileSystemRoutes: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 generateEntryCode: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 onBeforeGenerateRoutes: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),

package/dist/esm/builder/generator/index.mjs

@@ -16,6 +16,13 @@ async function generateBuilder(options, bundlerType) {
         else mergedEnvironments[name] = builderConfig.environments[name];
         builderConfig.environments = mergedEnvironments;
     } else builderConfig.environments = environments;
+    const hooks = appContext._internalContext.pluginAPI?.getHooks();
+    if (hooks?.modifyBuilderEnvironments) {
+        const { environments: modifiedEnvironments } = await hooks.modifyBuilderEnvironments.call({
+            environments: builderConfig.environments
+        });
+        builderConfig.environments = modifiedEnvironments;
+    }
     const builder = await createBuilder({
         cwd: appContext.appDirectory,
         rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,

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

@@ -95,7 +95,8 @@ function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
             staticJsDir: normalizedConfig.output?.distPath?.js,
             disableFilenameHash: normalizedConfig.output?.filenameHash === false,
             scriptLoading: normalizedConfig.html?.scriptLoading,
-            nonce: normalizedConfig.security?.nonce
+            nonce: normalizedConfig.security?.nonce,
+            useRsc: isUseRsc(normalizedConfig)
         }
     ]);
 }

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

@@ -64,6 +64,25 @@ class RouterPlugin {
                     routeAssets: {}
                 });
                 const prevManifest = JSON.parse(prevManifestStr);
+                const namedChunkGroupInstances = new Map();
+                for (const cg of compilation.chunkGroups || [])if (cg.name) namedChunkGroupInstances.set(cg.name, cg);
+                const collectDescendantCssAssets = (name)=>{
+                    const root = namedChunkGroupInstances.get(name);
+                    if (!root) return [];
+                    const cssFiles = new Set();
+                    const visited = new Set();
+                    const stack = [
+                        ...root.childrenIterable
+                    ];
+                    while(stack.length){
+                        const child = stack.pop();
+                        if (visited.has(child)) continue;
+                        visited.add(child);
+                        for (const chunk of child.chunks)for (const file of chunk.files)if (/\.css$/.test(file)) cssFiles.add(publicPath ? normalizePath(publicPath) + file : file);
+                        for (const c of child.childrenIterable)stack.push(c);
+                    }
+                    return Array.from(cssFiles);
+                };
                 const asyncEntryNames = [];
                 for (const [name, chunkGroup] of Object.entries(namedChunkGroups)){
                     if (name.startsWith('async-')) asyncEntryNames.push(name);
@@ -71,7 +90,12 @@ class RouterPlugin {
                         const filename = asset.name;
                         return publicPath ? normalizePath(publicPath) + filename : filename;
                     });
-                    const referenceCssAssets = assets.filter((asset)=>/\.css$/.test(asset));
+                    const directCssAssets = assets.filter((asset)=>/\.css$/.test(asset));
+                    const descendantCssAssets = collectDescendantCssAssets(name).filter((asset)=>!directCssAssets.includes(asset));
+                    const referenceCssAssets = [
+                        ...directCssAssets,
+                        ...descendantCssAssets
+                    ];
                     routeAssets[name] = {
                         chunkIds: chunkGroup.chunks,
                         assets,
@@ -113,10 +137,14 @@ class RouterPlugin {
                     const manifest = {
                         routeAssets: relatedAssets
                     };
+                    const { useRsc } = this;
                     const injectedContent = `
             ;(function(){
               window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v)=>{
-                        if (('assets' === k || 'referenceCssAssets' === k) && Array.isArray(v)) return v.map((item)=>item.replace(publicPath, ''));
+                        if (('assets' === k || 'referenceCssAssets' === k) && Array.isArray(v)) {
+                            if (!useRsc) return;
+                            return v.map((item)=>item.replace(publicPath, ''));
+                        }
                         return v;
                     })};
             })();
@@ -144,7 +172,7 @@ class RouterPlugin {
             });
         });
     }
-    constructor({ staticJsDir = 'static/js', HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = 'defer', nonce }){
+    constructor({ staticJsDir = 'static/js', HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = 'defer', nonce, useRsc = false }){
         this.name = 'RouterPlugin';
         this.HtmlBundlerPlugin = HtmlBundlerPlugin;
         this.enableInlineRouteManifests = enableInlineRouteManifests;
@@ -152,6 +180,7 @@ class RouterPlugin {
         this.disableFilenameHash = disableFilenameHash;
         this.scriptLoading = scriptLoading;
         this.nonce = nonce;
+        this.useRsc = useRsc;
     }
 }
 export { RouterPlugin };

package/dist/esm/index.mjs

@@ -40,6 +40,7 @@ const appTools = ()=>({
             deploy: createAsyncHook(),
             checkEntryPoint: createAsyncHook(),
             modifyEntrypoints: createAsyncHook(),
+            modifyBuilderEnvironments: createAsyncHook(),
             modifyFileSystemRoutes: createAsyncHook(),
             generateEntryCode: createAsyncHook(),
             onBeforeGenerateRoutes: createAsyncHook(),

package/dist/esm-node/builder/generator/index.mjs

@@ -17,6 +17,13 @@ async function generateBuilder(options, bundlerType) {
         else mergedEnvironments[name] = builderConfig.environments[name];
         builderConfig.environments = mergedEnvironments;
     } else builderConfig.environments = environments;
+    const hooks = appContext._internalContext.pluginAPI?.getHooks();
+    if (hooks?.modifyBuilderEnvironments) {
+        const { environments: modifiedEnvironments } = await hooks.modifyBuilderEnvironments.call({
+            environments: builderConfig.environments
+        });
+        builderConfig.environments = modifiedEnvironments;
+    }
     const builder = await createBuilder({
         cwd: appContext.appDirectory,
         rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,

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

@@ -97,7 +97,8 @@ function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
             staticJsDir: normalizedConfig.output?.distPath?.js,
             disableFilenameHash: normalizedConfig.output?.filenameHash === false,
             scriptLoading: normalizedConfig.html?.scriptLoading,
-            nonce: normalizedConfig.security?.nonce
+            nonce: normalizedConfig.security?.nonce,
+            useRsc: isUseRsc(normalizedConfig)
         }
     ]);
 }

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

@@ -65,6 +65,25 @@ class RouterPlugin {
                     routeAssets: {}
                 });
                 const prevManifest = JSON.parse(prevManifestStr);
+                const namedChunkGroupInstances = new Map();
+                for (const cg of compilation.chunkGroups || [])if (cg.name) namedChunkGroupInstances.set(cg.name, cg);
+                const collectDescendantCssAssets = (name)=>{
+                    const root = namedChunkGroupInstances.get(name);
+                    if (!root) return [];
+                    const cssFiles = new Set();
+                    const visited = new Set();
+                    const stack = [
+                        ...root.childrenIterable
+                    ];
+                    while(stack.length){
+                        const child = stack.pop();
+                        if (visited.has(child)) continue;
+                        visited.add(child);
+                        for (const chunk of child.chunks)for (const file of chunk.files)if (/\.css$/.test(file)) cssFiles.add(publicPath ? normalizePath(publicPath) + file : file);
+                        for (const c of child.childrenIterable)stack.push(c);
+                    }
+                    return Array.from(cssFiles);
+                };
                 const asyncEntryNames = [];
                 for (const [name, chunkGroup] of Object.entries(namedChunkGroups)){
                     if (name.startsWith('async-')) asyncEntryNames.push(name);
@@ -72,7 +91,12 @@ class RouterPlugin {
                         const filename = asset.name;
                         return publicPath ? normalizePath(publicPath) + filename : filename;
                     });
-                    const referenceCssAssets = assets.filter((asset)=>/\.css$/.test(asset));
+                    const directCssAssets = assets.filter((asset)=>/\.css$/.test(asset));
+                    const descendantCssAssets = collectDescendantCssAssets(name).filter((asset)=>!directCssAssets.includes(asset));
+                    const referenceCssAssets = [
+                        ...directCssAssets,
+                        ...descendantCssAssets
+                    ];
                     routeAssets[name] = {
                         chunkIds: chunkGroup.chunks,
                         assets,
@@ -114,10 +138,14 @@ class RouterPlugin {
                     const manifest = {
                         routeAssets: relatedAssets
                     };
+                    const { useRsc } = this;
                     const injectedContent = `
             ;(function(){
               window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v)=>{
-                        if (('assets' === k || 'referenceCssAssets' === k) && Array.isArray(v)) return v.map((item)=>item.replace(publicPath, ''));
+                        if (('assets' === k || 'referenceCssAssets' === k) && Array.isArray(v)) {
+                            if (!useRsc) return;
+                            return v.map((item)=>item.replace(publicPath, ''));
+                        }
                         return v;
                     })};
             })();
@@ -145,7 +173,7 @@ class RouterPlugin {
             });
         });
     }
-    constructor({ staticJsDir = 'static/js', HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = 'defer', nonce }){
+    constructor({ staticJsDir = 'static/js', HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = 'defer', nonce, useRsc = false }){
         this.name = 'RouterPlugin';
         this.HtmlBundlerPlugin = HtmlBundlerPlugin;
         this.enableInlineRouteManifests = enableInlineRouteManifests;
@@ -153,6 +181,7 @@ class RouterPlugin {
         this.disableFilenameHash = disableFilenameHash;
         this.scriptLoading = scriptLoading;
         this.nonce = nonce;
+        this.useRsc = useRsc;
     }
 }
 export { RouterPlugin };

package/dist/esm-node/index.mjs

@@ -42,6 +42,7 @@ const appTools = ()=>({
             deploy: createAsyncHook(),
             checkEntryPoint: createAsyncHook(),
             modifyEntrypoints: createAsyncHook(),
+            modifyBuilderEnvironments: createAsyncHook(),
             modifyFileSystemRoutes: createAsyncHook(),
             generateEntryCode: createAsyncHook(),
             onBeforeGenerateRoutes: createAsyncHook(),

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

@@ -14,6 +14,7 @@ type Options = {
     disableFilenameHash?: boolean;
     scriptLoading?: ScriptLoading;
     nonce?: string;
+    useRsc?: boolean;
 };
 export declare class RouterPlugin {
     readonly name: string;
@@ -23,7 +24,8 @@ export declare class RouterPlugin {
     private disableFilenameHash?;
     private scriptLoading?;
     private nonce?;
-    constructor({ staticJsDir, HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash, scriptLoading, nonce, }: Options);
+    private useRsc;
+    constructor({ staticJsDir, HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash, scriptLoading, nonce, useRsc, }: Options);
     private isTargetNodeOrWebWorker;
     private getEntryChunks;
     private getEntryChunkFiles;

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

@@ -2,6 +2,7 @@ import type { AppContext, AsyncHook, InternalContext, PluginHook, PluginHookTap,
 import type { Hooks } from '@modern-js/plugin/cli';
 import type { Entrypoint, HtmlPartials, HtmlTemplates, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
 import type { EagerRouteComponentFilesByEntry } from '@modern-js/utils';
+import type { EnvironmentConfig } from '@rsbuild/core';
 import type { AppTools } from '.';
 import type { getHookRunners } from '../compat/hooks';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from './config';
@@ -13,6 +14,9 @@ export type CheckEntryPointFn = TransformFunction<{
 export type ModifyEntrypointsFn = TransformFunction<{
     entrypoints: Entrypoint[];
 }>;
+export type ModifyBuilderEnvironmentsFn = TransformFunction<{
+    environments: Record<string, EnvironmentConfig>;
+}>;
 export type ModifyFileSystemRoutesFn = TransformFunction<{
     entrypoint: Entrypoint;
     routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
@@ -34,6 +38,7 @@ export interface AppToolsExtendAPI {
     deploy: PluginHookTap<DeplpoyFn>;
     checkEntryPoint: PluginHookTap<CheckEntryPointFn>;
     modifyEntrypoints: PluginHookTap<ModifyEntrypointsFn>;
+    modifyBuilderEnvironments: PluginHookTap<ModifyBuilderEnvironmentsFn>;
     modifyFileSystemRoutes: PluginHookTap<ModifyFileSystemRoutesFn>;
     generateEntryCode: PluginHookTap<GenerateEntryCodeFn>;
     onBeforeGenerateRoutes: PluginHookTap<BeforeGenerateRoutesFn>;
@@ -63,6 +68,7 @@ export interface AppToolsExtendHooks extends Record<string, PluginHook<(...args:
     deploy: AsyncHook<DeplpoyFn>;
     checkEntryPoint: AsyncHook<CheckEntryPointFn>;
     modifyEntrypoints: AsyncHook<ModifyEntrypointsFn>;
+    modifyBuilderEnvironments: AsyncHook<ModifyBuilderEnvironmentsFn>;
     modifyFileSystemRoutes: AsyncHook<ModifyFileSystemRoutesFn>;
     generateEntryCode: AsyncHook<GenerateEntryCodeFn>;
     onBeforeGenerateRoutes: AsyncHook<BeforeGenerateRoutesFn>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.3.0",
+  "version": "3.5.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -83,8 +83,8 @@
     "@babel/parser": "^7.29.7",
     "@babel/traverse": "^7.29.7",
     "@babel/types": "^7.29.7",
-    "@rsbuild/core": "2.0.10",
-    "@swc/core": "1.15.40",
+    "@rsbuild/core": "2.1.0",
+    "@swc/core": "1.15.41",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.7.0",
     "flatted": "^3.4.2",
@@ -93,19 +93,19 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/i18n-utils": "3.3.0",
-    "@modern-js/plugin": "3.3.0",
-    "@modern-js/builder": "3.3.0",
-    "@modern-js/plugin-data-loader": "3.3.0",
-    "@modern-js/prod-server": "3.3.0",
-    "@modern-js/server": "3.3.0",
-    "@modern-js/server-core": "3.3.0",
-    "@modern-js/server-utils": "3.3.0",
-    "@modern-js/types": "3.3.0",
-    "@modern-js/utils": "3.3.0"
+    "@modern-js/builder": "3.5.0",
+    "@modern-js/i18n-utils": "3.5.0",
+    "@modern-js/plugin": "3.5.0",
+    "@modern-js/plugin-data-loader": "3.5.0",
+    "@modern-js/prod-server": "3.5.0",
+    "@modern-js/server": "3.5.0",
+    "@modern-js/server-core": "3.5.0",
+    "@modern-js/server-utils": "3.5.0",
+    "@modern-js/types": "3.5.0",
+    "@modern-js/utils": "3.5.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.22.0",
+    "@rslib/core": "0.23.0",
     "@types/babel__traverse": "7.28.0",
     "@types/node": "^20",
     "ts-node": "^10.9.2",