@rspack/core 0.7.3-canary-607ec67-20240612123914 → 0.7.3-canary-e3de538-20240625072228

package/dist/builtin-plugin/RSCClientEntryRspackPlugin.d.ts

@@ -1,10 +1,16 @@
-import { BuiltinPluginName } from "@rspack/binding";
-export declare const RSCClientEntryRspackPlugin: {
-    new (options: any): {
-        name: BuiltinPluginName;
-        _options: any;
-        affectedHooks: "make" | "compile" | "emit" | "afterEmit" | "invalid" | "done" | "thisCompilation" | "afterDone" | "compilation" | "normalModuleFactory" | "contextModuleFactory" | "initialize" | "shouldEmit" | "infrastructureLog" | "beforeRun" | "run" | "assetEmitted" | "failed" | "shutdown" | "watchRun" | "watchClose" | "environment" | "afterEnvironment" | "afterPlugins" | "afterResolvers" | "beforeCompile" | "afterCompile" | "finishMake" | "entryOption" | undefined;
-        raw(): import("@rspack/binding").BuiltinPlugin;
-        apply(compiler: import("../Compiler").Compiler): void;
-    };
-};
+import type { RawRscClientEntryRspackPluginOptions } from "@rspack/binding";
+import type { Compiler } from "../Compiler";
+import type { RspackBuiltinPlugin } from "./base";
+interface Options extends RawRscClientEntryRspackPluginOptions {
+}
+interface ResolvedOptions {
+    root: string;
+}
+export declare class RSCClientEntryRspackPlugin {
+    plugin: RspackBuiltinPlugin;
+    options: Options;
+    constructor(options: Options);
+    apply(compiler: Compiler): void;
+    resolveOptions(compiler: Compiler): ResolvedOptions;
+}
+export {};

package/dist/builtin-plugin/RSCClientEntryRspackPlugin.js

@@ -1,6 +1,42 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RSCClientEntryRspackPlugin = void 0;
 const binding_1 = require("@rspack/binding");
+const path_1 = __importDefault(require("path"));
 const base_1 = require("./base");
-exports.RSCClientEntryRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.RSCClientEntryRspackPlugin, options => options, "compilation");
+const RawRSCClientEntryRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.RSCClientEntryRspackPlugin, options => options, "compilation");
+class RSCClientEntryRspackPlugin {
+    constructor(options) {
+        this.plugin = new RawRSCClientEntryRspackPlugin(options);
+        this.options = options;
+    }
+    apply(compiler) {
+        this.plugin.apply(compiler);
+        if (!compiler.options.module.rules) {
+            compiler.options.module.rules = [];
+        }
+        const resolvedOptions = this.resolveOptions(compiler);
+        compiler.options.module.rules.push({
+            enforce: "pre",
+            test: /rsc-server-action-entry-loader\.(j|t|mj|cj)sx?/,
+            use: [
+                {
+                    loader: "builtin:rsc-server-action-server-loader",
+                    options: resolvedOptions
+                }
+            ]
+        });
+    }
+    resolveOptions(compiler) {
+        const root = compiler.options.context ?? process.cwd();
+        // TODO: config output
+        const output = path_1.default.resolve(root, "./dist/server");
+        return {
+            root: output
+        };
+    }
+}
+exports.RSCClientEntryRspackPlugin = RSCClientEntryRspackPlugin;

package/dist/builtin-plugin/RSCClientReferenceManifestRspackPlugin.d.ts

@@ -3,18 +3,17 @@ import type { Compiler } from "../Compiler";
 import type { RuleSetCondition } from "../config/zod";
 import type { RspackBuiltinPlugin } from "./base";
 interface ResolvedOptions {
-    routes: NonNullable<RawRscClientReferenceManifestRspackPluginOptions["routes"]>;
-    entry: Record<string, string>;
     root: string;
 }
-interface Options extends Pick<RawRscClientReferenceManifestRspackPluginOptions, "routes"> {
+interface Options extends RawRscClientReferenceManifestRspackPluginOptions {
     exclude?: RuleSetCondition;
+    serverProxy?: string;
 }
 export declare class RSCClientReferenceManifestRspackPlugin {
     plugin: RspackBuiltinPlugin;
     options: Options;
     resolvedOptions: ResolvedOptions;
-    constructor(options?: Options);
+    constructor(options: Options);
     apply(compiler: Compiler): void;
     resolveOptions(compiler: Compiler): ResolvedOptions;
 }

package/dist/builtin-plugin/RSCClientReferenceManifestRspackPlugin.js

@@ -4,13 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RSCClientReferenceManifestRspackPlugin = void 0;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const binding_1 = require("@rspack/binding");
 const base_1 = require("./base");
-const RawRSCClientReferenceManifestRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.RSCClientReferenceManifestRspackPlugin, () => { }, "compilation");
+const RawRSCClientReferenceManifestRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.RSCClientReferenceManifestRspackPlugin, options => options, "compilation");
 class RSCClientReferenceManifestRspackPlugin {
-    constructor(options = {}) {
-        this.plugin = new RawRSCClientReferenceManifestRspackPlugin();
+    constructor(options) {
+        this.plugin = new RawRSCClientReferenceManifestRspackPlugin({
+            routes: options.routes
+        });
         this.options = options;
         this.resolvedOptions = {};
     }
@@ -21,6 +23,16 @@ class RSCClientReferenceManifestRspackPlugin {
             compiler.options.module.rules = [];
         }
         compiler.options.module.rules.push({
+            test: /rsc-client-entry-loader\.(j|t|mj|cj)sx?/,
+            use: [
+                {
+                    loader: "builtin:rsc-client-entry-loader",
+                    options: this.resolvedOptions
+                }
+            ]
+        });
+        compiler.options.module.rules.push({
+            enforce: "post",
             test: [/\.(j|t|mj|cj)sx?$/i],
             exclude: this.options.exclude ?? {
                 // Exclude libraries in node_modules ...
@@ -28,32 +40,18 @@ class RSCClientReferenceManifestRspackPlugin {
             },
             use: [
                 {
-                    loader: "builtin:rsc-client-entry-loader",
-                    options: this.resolvedOptions
+                    loader: "builtin:rsc-server-action-client-loader",
+                    options: { serverProxy: this.options.serverProxy }
                 }
             ]
         });
     }
     resolveOptions(compiler) {
-        const entry = Object.assign({}, compiler.options.entry);
-        const resolvedEntry = {};
         const root = compiler.options.context ?? process.cwd();
-        // TODO: support dynamic entry
-        if (typeof entry === "object") {
-            for (let item of Object.keys(entry)) {
-                const imports = entry[item].import;
-                if (imports) {
-                    resolvedEntry[item] = imports[0];
-                }
-            }
-        }
-        const resolvedRoutes = this.options.routes ?? [];
         // TODO: config output
-        const output = path_1.default.resolve(root, "./dist/server");
+        const output = node_path_1.default.resolve(root, "./dist/server");
         return {
-            entry: resolvedEntry,
-            root: output,
-            routes: resolvedRoutes
+            root: output
         };
     }
 }

package/dist/builtin-plugin/RSCProxyRspackPlugin.d.ts

@@ -1,12 +1,18 @@
 import type { Compiler } from "../Compiler";
 import type { RuleSetCondition } from "../config/zod";
+import type { RspackBuiltinPlugin } from "./base";
 interface Options {
     clientProxy: string;
     exclude?: RuleSetCondition;
 }
+interface ResolvedOptions {
+    root: string;
+}
 export declare class RSCProxyRspackPlugin {
+    plugin: RspackBuiltinPlugin;
     options: Options;
     constructor(options: Options);
     apply(compiler: Compiler): void;
+    resolveOptions(compiler: Compiler): ResolvedOptions;
 }
 export {};

package/dist/builtin-plugin/RSCProxyRspackPlugin.js

@@ -1,11 +1,20 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RSCProxyRspackPlugin = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const binding_1 = require("@rspack/binding");
+const base_1 = require("./base");
+const RawRSCProxyRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.RSCProxyRspackPlugin, options => options, "compilation");
 class RSCProxyRspackPlugin {
     constructor(options) {
+        this.plugin = new RawRSCProxyRspackPlugin({});
         this.options = options;
     }
     apply(compiler) {
+        this.plugin.apply(compiler);
         if (!compiler.options.module.rules) {
             compiler.options.module.rules = [];
         }
@@ -23,6 +32,25 @@ class RSCProxyRspackPlugin {
                 }
             ]
         });
+        const resolvedOptions = this.resolveOptions(compiler);
+        compiler.options.module.rules.push({
+            enforce: "pre",
+            test: /rsc-server-action-entry-loader\.(j|t|mj|cj)sx?/,
+            use: [
+                {
+                    loader: "builtin:rsc-server-action-server-loader",
+                    options: resolvedOptions
+                }
+            ]
+        });
+    }
+    resolveOptions(compiler) {
+        const root = compiler.options.context ?? process.cwd();
+        // TODO: config output
+        const output = node_path_1.default.resolve(root, "./dist/server");
+        return {
+            root: output
+        };
     }
 }
 exports.RSCProxyRspackPlugin = RSCProxyRspackPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "0.7.3-canary-607ec67-20240612123914",
+  "version": "0.7.3-canary-e3de538-20240625072228",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "A Fast Rust-based Web Bundler",
@@ -72,15 +72,15 @@
     "watchpack": "^2.4.0",
     "zod": "^3.21.4",
     "zod-validation-error": "1.3.1",
-    "@rspack/plugin-minify": "^0.7.3-canary-607ec67-20240612123914",
-    "@rspack/core": "0.7.3-canary-607ec67-20240612123914"
+    "@rspack/core": "0.7.3-canary-e3de538-20240625072228",
+    "@rspack/plugin-minify": "^0.7.3-canary-e3de538-20240625072228"
   },
   "dependencies": {
     "@module-federation/runtime-tools": "0.1.6",
     "caniuse-lite": "^1.0.30001616",
     "tapable": "2.2.1",
     "webpack-sources": "3.2.3",
-    "@rspack/binding": "0.7.3-canary-607ec67-20240612123914"
+    "@rspack/binding": "0.7.3-canary-e3de538-20240625072228"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"