feat: improve support rsc with rspack (#6931)

Author: yimingjfe

.changeset/early-drinks-repeat.md

@@ -0,0 +1,6 @@
+---
+'@modern-js/uni-builder': patch
+---
+
+feat: improve support rsc with rspack
+feat: 完善 rspack 下对 rsc 的支持

.changeset/two-guests-argue.md

@@ -0,0 +1,7 @@
+---
+'@modern-js/runtime': patch
+'@modern-js/runtime-utils': patch
+---
+
+feat: Add response APIs to support setting response headers, status codes, and redirects
+feat: 添加一些响应的 API，可以设置响应头，状态码，及重定向

packages/cli/uni-builder/src/shared/rsc/plugins/rsc-server-plugin.ts

@@ -1,10 +1,5 @@
 import type Webpack from 'webpack';
-import {
-  type Compilation,
-  Module,
-  type ModuleGraph,
-  NormalModule,
-} from 'webpack';
+import { type Compilation, NormalModule } from 'webpack';
 import {
   type ServerManifest,
   type ServerReferencesMap,

packages/cli/uni-builder/src/shared/rsc/plugins/rspack-rsc-client-plugin.ts

@@ -1,6 +1,3 @@
-/**
- * The plugin is developing, ignore it now
- */
 import path from 'path';
 import type Webpack from 'webpack';
 import type { Module } from 'webpack';
@@ -38,11 +35,9 @@ export class RspackRscClientPlugin {
   apply(compiler: Webpack.Compiler): void {
     const {
       EntryPlugin,
-      // AsyncDependenciesBlock,
       RuntimeGlobals,
       RuntimeModule,
       WebpackError,
-      // dependencies: { ModuleDependency, NullDependency },
       sources: { RawSource },
     } = compiler.webpack;
 
@@ -52,20 +47,10 @@ export class RspackRscClientPlugin {
       styles: [],
     };
 
-    // class ClientReferenceDependency extends ModuleDependency {
-    //   override get type(): string {
-    //     return `client-reference`;
-    //   }
-    // }
-
     const getEntryModule = (compilation: Webpack.Compilation): Module[] => {
       const entryModules: Webpack.Module[] = [];
 
       for (const [, entryValue] of compilation.entries.entries()) {
-        // const entryDependency = entryValue.dependencies.find(
-        //   dependency => dependency.constructor.name === `EntryDependency`,
-        // );
-
         const entryDependency = entryValue.dependencies[0];
 
         if (!entryDependency) {
@@ -100,16 +85,18 @@ export class RspackRscClientPlugin {
     ) => {
       const promises = [];
       [...this.clientReferencesMap.keys()].forEach((resourcePath, index) => {
-        const dependency = EntryPlugin.createDependency(resourcePath, {
-          name: resourcePath,
-        });
         const entries = compilation.entries.entries();
 
         for (const [entryName, entry] of entries) {
+          const runtimeName = entry.options.runtime || entryName;
           if (hasExtension(entryName)) {
             continue;
           }
 
+          const dependency = EntryPlugin.createDependency(resourcePath, {
+            name: resourcePath,
+          });
+
           promises.push(
             new Promise((resolve, reject) => {
               compilation.addInclude(
@@ -122,6 +109,9 @@ export class RspackRscClientPlugin {
                   if (error) {
                     reject(error);
                   } else {
+                    compilation.moduleGraph
+                      .getExportsInfo(module!)
+                      .setUsedInUnknownWay(runtimeName);
                     this.dependencies.push(dependency);
                     resolve(undefined);
                   }
@@ -147,6 +137,9 @@ export class RspackRscClientPlugin {
                   if (error) {
                     reject(error);
                   } else {
+                    compilation.moduleGraph
+                      .getExportsInfo(module!)
+                      .setUsedInUnknownWay(undefined);
                     this.dependencies.push(dependency);
                     resolve(undefined);
                   }
@@ -226,9 +219,15 @@ export class RspackRscClientPlugin {
 
         compilation.hooks.processAssets.tap(RspackRscClientPlugin.name, () => {
           const clientManifest: ClientManifest = {};
-          const { chunkGraph, moduleGraph, modules } = compilation;
-
-          for (const module of modules) {
+          const { chunkGraph, moduleGraph } = compilation;
+
+          // use dependencies, not modules
+          // so that the bundler can get the moduleId if the dependency points to a different module when optimizing like concat modules.
+          for (const dependency of this.dependencies) {
+            const module = moduleGraph.getModule(dependency);
+            if (!module) {
+              continue;
+            }
             const resourcePath = module.nameForCondition();
 
             const clientReferences = resourcePath

packages/cli/uni-builder/src/shared/rsc/plugins/rspack-rsc-server-plugin.ts

@@ -1,6 +1,3 @@
-/**
- * The plugin is developing, ignore it now
- */
 import type Webpack from 'webpack';
 import type { Compilation, ModuleGraph, NormalModule } from 'webpack';
 import {
@@ -25,13 +22,12 @@ export interface ModuleExportsInfo {
   readonly exportName: string;
 }
 
-const resourcePath2Entries = new Map<
-  string,
-  {
-    entryName: string;
-    entryPath: string;
-  }[]
->();
+export interface EntryInfo {
+  readonly entryName: string;
+  readonly entryPath: string;
+}
+
+const resourcePath2Entries = new Map<string, EntryInfo[]>();
 export class RscServerPlugin {
   private clientReferencesMap: ClientReferencesMap = new Map();
   private serverReferencesMap: ServerReferencesMap = new Map();
@@ -41,29 +37,47 @@ export class RscServerPlugin {
   private styles: Set<string>;
   constructor(options: RscServerPluginOptions) {
     this.styles = new Set();
-
     this.serverManifestFilename =
       options?.serverManifestFilename || `react-server-manifest.json`;
-
     this.entryPath2Name = options?.entryPath2Name || new Map();
   }
 
+  private isValidModule(module: NormalModule): boolean {
+    return Boolean(module?.resource);
+  }
+
+  private hasValidEntries(
+    entries: EntryInfo[] | undefined,
+  ): entries is EntryInfo[] {
+    return Boolean(entries && entries.length > 0);
+  }
+
+  private getEntryNameFromIssuer(issuer: NormalModule): string | undefined {
+    return issuer.resource
+      ? this.entryPath2Name.get(issuer.resource)
+      : undefined;
+  }
+
+  private createEntryFromIssuer(
+    issuer: NormalModule,
+    entryName: string,
+  ): EntryInfo {
+    return { entryName, entryPath: issuer.resource };
+  }
+
   private findModuleEntries(
     module: NormalModule,
     compilation: Compilation,
-    resourcePath2Entries: Map<
-      string,
-      Array<{ entryName: string; entryPath: string }>
-    >,
+    resourcePath2Entries: Map<string, EntryInfo[]>,
     visited = new Set<string>(),
-  ): Array<{ entryName: string; entryPath: string }> {
-    if (!module?.resource || visited.has(module.resource)) {
+  ): EntryInfo[] {
+    if (!this.isValidModule(module) || visited.has(module.resource)) {
       return [];
     }
     visited.add(module.resource);
 
     const currentEntries = resourcePath2Entries.get(module.resource);
-    if (currentEntries && currentEntries?.length > 0) {
+    if (this.hasValidEntries(currentEntries)) {
       return currentEntries;
     }
 
@@ -78,15 +92,13 @@ export class RscServerPlugin {
       resourcePath2Entries,
       visited,
     );
-    if (issuerEntries.length > 0) {
+    if (this.hasValidEntries(issuerEntries)) {
       return issuerEntries;
     }
 
-    if (issuer.resource) {
-      const entryName = this.entryPath2Name.get(issuer.resource);
-      if (entryName) {
-        return [{ entryName, entryPath: issuer.resource }];
-      }
+    const entryName = this.getEntryNameFromIssuer(issuer);
+    if (entryName) {
+      return [this.createEntryFromIssuer(issuer, entryName)];
     }
 
     return [];
@@ -96,38 +108,9 @@ export class RscServerPlugin {
     const {
       EntryPlugin,
       WebpackError,
-      // dependencies: { NullDependency },
-      // util: {
-      //   runtime: { getEntryRuntime },
-      // },
       sources: { RawSource },
-      // RuntimeGlobals,
     } = compiler.webpack;
 
-    // class ServerReferenceDependency extends NullDependency {
-    //   override get type(): string {
-    //     return `server-reference`;
-    //   }
-    // }
-
-    // ServerReferenceDependency.Template = class ServerReferenceDependencyTemplate extends (
-    //   NullDependency.Template
-    // ) {
-    //   override apply(
-    //     _dependency: ServerReferenceDependency,
-    //     _source: Webpack.sources.ReplaceSource,
-    //     { runtimeRequirements }: { runtimeRequirements: Set<string> },
-    //   ) {
-    //     runtimeRequirements.add(RuntimeGlobals.moduleId);
-    //   }
-    // };
-
-    // function hasServerReferenceDependency(module: Webpack.Module): boolean {
-    //   return module.dependencies.some(
-    //     dependency => dependency instanceof ServerReferenceDependency,
-    //   );
-    // }
-
     const includeModule = async (
       compilation: Webpack.Compilation,
       resource: string,