@evjs/webpack-plugin 0.0.1-alpha.5 → 0.0.1-alpha.7

package/README.md

@@ -1,15 +1,34 @@
 # @evjs/webpack-plugin
 
-Build-time integration for React Server Functions in the **ev** framework.
+Webpack adapter for the **ev** framework. Thin wrapper over [`@evjs/build-tools`](../build-tools) that connects bundler-agnostic build logic to Webpack's plugin and loader APIs.
 
-## Features
+## Installation
 
-- **`EvWebpackPlugin`**: Zero-config plugin that:
-  - Auto-discovers `"use server"` files on server builds (`target: "node"`).
-  - Emits a versioned `manifest.json` mapping function IDs to source locations.
-- **`server-fn-loader`**: Transforms files marked with `"use server"`.
-  - On the **server**: Keeps source code and registers the function.
-  - On the **client**: Replaces the implementation with an RPC stub.
+```bash
+npm install @evjs/webpack-plugin
+```
+
+## Exports
+
+| Export | Description |
+|--------|-------------|
+| `EvWebpackPlugin` | Plugin that auto-discovers `"use server"` files and manages server builds |
+| `server-fn-loader` | Loader that transforms `"use server"` files for client/server |
+
+## How It Works
+
+### EvWebpackPlugin
+
+1. **Scans client modules** for `"use server"` files via `detectUseServer()` from build-tools.
+2. **Generates a server entry** via `generateServerEntry()` — produces a virtual data-URI module.
+3. **Spawns a child compiler** targeting Node.js — builds the server bundle alongside the client.
+4. **Emits `manifest.json`** mapping function IDs to their module and export names.
+
+### server-fn-loader
+
+Auto-detects whether it's running in the client or server compiler and delegates to `transformServerFile()`:
+- **Client compiler** → replaces function bodies with RPC stubs.
+- **Server compiler** → keeps original source, appends registrations, and reports to the manifest.
 
 ## Usage
 
@@ -18,7 +37,18 @@ const { EvWebpackPlugin } = require("@evjs/webpack-plugin");
 
 module.exports = {
   plugins: [
-    new EvWebpackPlugin()
+    new EvWebpackPlugin({
+      server: {
+        // App factory (default: "@evjs/runtime/server#createApp")
+        appFactory: "@evjs/runtime/server#createApp",
+        // Runner — bake into bundle for self-starting dev server
+        runner: process.env.NODE_ENV === "development"
+          ? "@evjs/runtime/server#runNodeServer"
+          : undefined,
+        // Extra imports (middleware, config, etc.)
+        setup: [],
+      },
+    }),
   ],
   module: {
     rules: [
@@ -26,16 +56,19 @@ module.exports = {
         test: /\.tsx?$/,
         exclude: /node_modules/,
         use: [
-          { loader: "swc-loader", /* ... */ },
-          {
-            loader: "@evjs/webpack-plugin/server-fn-loader",
-            options: { isServer: false }
-          }
-        ]
-      }
-    ]
-  }
+          { loader: "swc-loader" },
+          { loader: "@evjs/webpack-plugin/server-fn-loader" },
+        ],
+      },
+    ],
+  },
 };
 ```
 
-On server builds, `EvWebpackPlugin` automatically discovers all `"use server"` files under `./src/` and injects them as Webpack entries — no manual imports needed.
+### Plugin Options
+
+| Option | Type | Default | Description |
+|--------|------|---------|-------------|
+| `server.appFactory` | `string` | `"@evjs/runtime/server#createApp"` | Module ref for app factory |
+| `server.runner` | `string?` | `undefined` | Module ref for auto-starting the server |
+| `server.setup` | `string[]` | `[]` | Extra imports to prepend to server entry |

package/esm/index.d.ts

@@ -1,12 +1,18 @@
+import { type ServerEntryConfig } from "@evjs/build-tools";
 import type { Compiler } from "webpack";
+export type { ServerEntryConfig };
+export interface EvWebpackPluginOptions {
+    server?: ServerEntryConfig;
+}
 /**
  * Webpack plugin for the ev framework.
  *
- * On server builds (target: "node"), automatically discovers files with
- * the "use server" directive and adds them as entries.
- * On all builds, emits the `manifest.json` mapping function IDs to assets.
+ * Automatically discovers files with the "use server" directive based on the client dependencies
+ * and manages the server-side build via a child compiler.
  */
 export declare class EvWebpackPlugin {
+    private options;
+    constructor(options?: EvWebpackPluginOptions);
     apply(compiler: Compiler): void;
 }
 //# sourceMappingURL=index.d.ts.map

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA+BxC;;;;;;GAMG;AACH,qBAAa,eAAe;IAC1B,KAAK,CAAC,QAAQ,EAAE,QAAQ;CAqEzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAmBxC,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B;AAED;;;;;GAKG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAyB;gBAE5B,OAAO,CAAC,EAAE,sBAAsB;IAG5C,KAAK,CAAC,QAAQ,EAAE,QAAQ;CA8JzB"}

package/esm/index.js

@@ -1,93 +1,136 @@
 import fs from "node:fs";
-import path from "node:path";
-import { glob } from "node:fs";
+import { detectUseServer, generateServerEntry, } from "@evjs/build-tools";
 class ManifestCollector {
-    serverFunctions = {};
+    serverFns = {};
     addServerFn(id, meta) {
-        this.serverFunctions[id] = meta;
+        this.serverFns[id] = meta;
     }
     getManifest() {
         return {
             version: 1,
-            serverFunctions: this.serverFunctions,
+            serverFns: this.serverFns,
         };
     }
 }
-/**
- * Check if a file starts with the "use server" directive.
- */
-function hasUseServerDirective(filePath) {
-    try {
-        const content = fs.readFileSync(filePath, "utf-8");
-        const firstLine = content.trimStart().split("\n")[0];
-        return /^["']use server["'];?\s*$/.test(firstLine.trim());
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Webpack plugin for the ev framework.
  *
- * On server builds (target: "node"), automatically discovers files with
- * the "use server" directive and adds them as entries.
- * On all builds, emits the `manifest.json` mapping function IDs to assets.
+ * Automatically discovers files with the "use server" directive based on the client dependencies
+ * and manages the server-side build via a child compiler.
  */
 export class EvWebpackPlugin {
+    options;
+    constructor(options) {
+        this.options = options ?? {};
+    }
     apply(compiler) {
         const collector = new ManifestCollector();
         // Attach collector to compiler so the loader can access it
         compiler._ev_manifest_collector = collector;
-        // Auto-discover server function files on server builds
-        const isServer = compiler.options.target === "node" ||
-            (Array.isArray(compiler.options.target) &&
-                compiler.options.target.includes("node"));
-        if (isServer) {
-            const context = compiler.context;
-            compiler.hooks.make.tapAsync("EvWebpackPlugin", (compilation, callback) => {
-                // Scan all .ts/.tsx files under src/ for "use server" directive
-                glob("./src/**/*.{ts,tsx}", { cwd: context }, (err, files) => {
-                    if (err) {
-                        callback(err);
-                        return;
-                    }
-                    const serverFiles = files.filter((f) => hasUseServerDirective(path.resolve(context, f)));
-                    if (serverFiles.length === 0) {
-                        callback();
-                        return;
-                    }
-                    const webpack = compiler.webpack;
-                    let pending = serverFiles.length;
-                    for (const file of serverFiles) {
-                        const absolutePath = path.resolve(context, file);
-                        const dep = webpack.EntryPlugin.createDependency(absolutePath, {
-                            name: undefined,
-                        });
-                        compilation.addEntry(context, dep, { name: undefined }, (addErr) => {
-                            if (addErr) {
-                                callback(addErr);
-                                return;
-                            }
-                            pending--;
-                            if (pending === 0) {
-                                callback();
+        // Check if the current compiler is already the Node Child Compiler
+        const isServer = compiler.options.name === "evServer" ||
+            compiler.options.target === "node";
+        if (!isServer) {
+            // We are in the Client compiler.
+            compiler.hooks.make.tapAsync("EvWebpackPlugin", async (compilation, callback) => {
+                compilation.hooks.finishModules.tapAsync("EvWebpackPlugin", (modules, finishCallback) => {
+                    const serverModulePaths = [];
+                    for (const module of modules) {
+                        const resource = "resource" in module ? module.resource : null;
+                        if (!resource || typeof resource !== "string")
+                            continue;
+                        if (resource.includes("node_modules") ||
+                            !/\.(ts|tsx|js|jsx)$/.test(resource)) {
+                            continue;
+                        }
+                        try {
+                            const content = fs.readFileSync(resource, "utf-8");
+                            if (detectUseServer(content)) {
+                                serverModulePaths.push(resource);
                             }
-                        });
+                        }
+                        catch (_err) {
+                            // Ignore read errors for dynamically generated Webpack modules
+                        }
                     }
+                    if (serverModulePaths.length === 0) {
+                        return finishCallback();
+                    }
+                    // Generate server entry using build-tools (bundler-agnostic)
+                    const serverEntryContent = generateServerEntry(this.options.server, serverModulePaths);
+                    // Use a Data URI as a virtual entry point
+                    const serverEntryPath = `data:text/javascript,${encodeURIComponent(serverEntryContent)}`;
+                    // Spawn the Node Server child compiler (webpack-specific)
+                    const outputOptions = {
+                        filename: "../server/index.js",
+                        library: { type: "commonjs", name: "evServer" },
+                        chunkFormat: "commonjs",
+                    };
+                    const childCompiler = compilation.createChildCompiler("evServer", outputOptions, [
+                        new compiler.webpack.node.NodeTemplatePlugin({
+                            asyncChunkLoading: false,
+                        }),
+                        new compiler.webpack.node.NodeTargetPlugin(),
+                        new compiler.webpack.ExternalsPlugin("commonjs", [
+                            ({ request }, cb) => {
+                                if (request &&
+                                    typeof request === "string" &&
+                                    (request.startsWith("node:") ||
+                                        [
+                                            "http",
+                                            "https",
+                                            "http2",
+                                            "fs",
+                                            "path",
+                                            "crypto",
+                                            "stream",
+                                            "os",
+                                            "assert",
+                                            "util",
+                                            "events",
+                                            "url",
+                                            "buffer",
+                                            "zlib",
+                                            "child_process",
+                                            "net",
+                                            "tls",
+                                            "querystring",
+                                            "worker_threads",
+                                        ].includes(request))) {
+                                    return cb(null, request);
+                                }
+                                cb();
+                            },
+                        ]),
+                        new compiler.webpack.EntryPlugin(compiler.context, serverEntryPath, { name: "main" }),
+                    ]);
+                    childCompiler._ev_manifest_collector = collector;
+                    childCompiler.runAsChild((err, _entries, childCompilation) => {
+                        if (err)
+                            return finishCallback(err);
+                        if (childCompilation?.errors &&
+                            childCompilation.errors.length > 0) {
+                            return finishCallback(childCompilation.errors[0]);
+                        }
+                        finishCallback();
+                    });
                 });
+                callback();
             });
         }
-        // Emit manifest
-        compiler.hooks.emit.tap("EvWebpackPlugin", (compilation) => {
-            const manifest = collector.getManifest();
-            if (Object.keys(manifest.serverFunctions).length === 0) {
-                return;
-            }
-            const content = JSON.stringify(manifest, null, 2);
-            compilation.assets["manifest.json"] = {
-                source: () => content,
-                size: () => content.length,
-            };
+        // Emit manifest using modern processAssets hook
+        compiler.hooks.thisCompilation.tap("EvWebpackPlugin", (compilation) => {
+            compilation.hooks.processAssets.tap({
+                name: "EvWebpackPlugin",
+                stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+            }, () => {
+                const manifest = collector.getManifest();
+                if (Object.keys(manifest.serverFns).length === 0) {
+                    return;
+                }
+                const content = JSON.stringify(manifest, null, 2);
+                compilation.emitAsset("../server/manifest.json", new compiler.webpack.sources.RawSource(content));
+            });
         });
     }
 }

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/esm/server-fn-loader.d.ts

@@ -1,10 +1,23 @@
+import type { Compiler } from "webpack";
 interface LoaderContext {
     getOptions(): {
         isServer?: boolean;
     };
     resourcePath: string;
     rootContext: string;
+    _compiler?: Compiler & {
+        _ev_manifest_collector?: {
+            addServerFn(id: string, meta: {
+                moduleId: string;
+                export: string;
+            }): void;
+        };
+    };
 }
+/**
+ * Webpack loader for "use server" files.
+ * Thin wrapper that delegates to @evjs/build-tools for the actual transformation.
+ */
 export default function serverFnLoader(this: LoaderContext, source: string): Promise<string>;
 export {};
 //# sourceMappingURL=server-fn-loader.d.ts.map

package/esm/server-fn-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-fn-loader.d.ts","sourceRoot":"","sources":["../src/server-fn-loader.ts"],"names":[],"mappings":"AAGA,UAAU,aAAa;IACrB,UAAU,IAAI;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAuBD,wBAA8B,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiFjG"}
+{"version":3,"file":"server-fn-loader.d.ts","sourceRoot":"","sources":["../src/server-fn-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,UAAU,aAAa;IACrB,UAAU,IAAI;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,QAAQ,GAAG;QACrB,sBAAsB,CAAC,EAAE;YACvB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBAAE,QAAQ,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,IAAI,CAAC;SAC3E,CAAC;KACH,CAAC;CACH;AAED;;;GAGG;AACH,wBAA8B,cAAc,CAC1C,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAmBjB"}

package/esm/server-fn-loader.js

@@ -1,97 +1,24 @@
-import { createHash } from "node:crypto";
-import { parse } from "@swc/core";
-import path from "node:path";
+import { transformServerFile } from "@evjs/build-tools";
 /**
- * Derive a stable function ID from the file path and export name.
+ * Webpack loader for "use server" files.
+ * Thin wrapper that delegates to @evjs/build-tools for the actual transformation.
  */
-function makeFnId(rootContext, resourcePath, exportName) {
-    const relativePath = path.relative(rootContext, resourcePath);
-    return createHash("sha256")
-        .update(`${relativePath}:${exportName}`)
-        .digest("hex")
-        .slice(0, 16);
-}
-/**
- * Check whether the source starts with the "use server" directive.
- */
-function hasUseServerDirective(source) {
-    const trimmed = source.replace(/^(\s|\/\/[^\n]*\n|\/\*[\s\S]*?\*\/)*/, "");
-    return /^["']use server["'];?\s/.test(trimmed);
-}
 export default async function serverFnLoader(source) {
-    if (!hasUseServerDirective(source)) {
-        return source;
-    }
-    const { isServer = false } = this.getOptions();
-    // Parse the source into an AST
-    const program = await parse(source, {
-        syntax: "typescript",
-        tsx: true,
-        comments: false,
-        script: false,
-    });
-    const exportNames = [];
-    // Iterate through module items to find exports
-    for (const item of program.body) {
-        if (item.type === "ExportDeclaration") {
-            const decl = item.declaration;
-            if (decl.type === "FunctionDeclaration") {
-                if (decl.identifier.value)
-                    exportNames.push(decl.identifier.value);
-            }
-            else if (decl.type === "VariableDeclaration") {
-                for (const v of decl.declarations) {
-                    if (v.id.type === "Identifier") {
-                        exportNames.push(v.id.value);
-                    }
-                }
-            }
-        }
-        else if (item.type === "ExportNamedDeclaration") {
-            for (const specifier of item.specifiers) {
-                if (specifier.type === "ExportSpecifier") {
-                    if (specifier.exported?.type === "Identifier") {
-                        exportNames.push(specifier.exported.value);
-                    }
-                    else if (specifier.orig.type === "Identifier") {
-                        exportNames.push(specifier.orig.value);
-                    }
-                }
-            }
-        }
-    }
-    if (exportNames.length === 0) {
-        return source;
+    const explicitOptions = this.getOptions() || {};
+    let isServer = explicitOptions.isServer;
+    if (typeof isServer === "undefined") {
+        const compilerName = this._compiler?.name;
+        const target = this._compiler?.options?.target;
+        isServer = compilerName === "evServer" || target === "node";
     }
     const manifestCollector = this._compiler?._ev_manifest_collector;
-    if (isServer) {
-        // Server build: keep original + register
-        const registrations = exportNames
-            .map((name) => {
-            const fnId = makeFnId(this.rootContext, this.resourcePath, name);
-            if (manifestCollector) {
-                const relativePath = path.relative(this.rootContext, this.resourcePath);
-                const moduleId = createHash("sha256")
-                    .update(relativePath)
-                    .digest("hex")
-                    .slice(0, 16);
-                manifestCollector.addServerFn(fnId, {
-                    moduleId,
-                    export: name,
-                });
-            }
-            return `registerServerFn("${fnId}", ${name});`;
-        })
-            .join("\n");
-        return `import { registerServerFn } from "@evjs/runtime/server";\n${source}\n${registrations}\n`;
-    }
-    // Client build: replace with RPC stubs
-    const stubCode = exportNames
-        .map((name) => {
-        const fnId = makeFnId(this.rootContext, this.resourcePath, name);
-        return `export function ${name}(...args) {\n  return __ev_rpc("${fnId}", args);\n}`;
-    })
-        .join("\n\n");
-    return `import { __ev_rpc } from "@evjs/runtime/client";\n\n${stubCode}\n`;
+    return transformServerFile(source, {
+        resourcePath: this.resourcePath,
+        rootContext: this.rootContext,
+        isServer: !!isServer,
+        onServerFn: manifestCollector
+            ? (fnId, meta) => manifestCollector.addServerFn(fnId, meta)
+            : undefined,
+    });
 }
 //# sourceMappingURL=server-fn-loader.js.map

package/esm/server-fn-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-fn-loader.js","sourceRoot":"","sources":["../src/server-fn-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-fn-loader.js","sourceRoot":"","sources":["../src/server-fn-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAcxD;;;GAGG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAE1C,MAAc;IAEd,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;IAChD,IAAI,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;IACxC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC;QAC/C,QAAQ,GAAG,YAAY,KAAK,UAAU,IAAI,MAAM,KAAK,MAAM,CAAC;IAC9D,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,EAAE,sBAAsB,CAAC;IAEjE,OAAO,mBAAmB,CAAC,MAAM,EAAE;QACjC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,UAAU,EAAE,iBAAiB;YAC3B,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC;YAC3D,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evjs/webpack-plugin",
-  "version": "0.0.1-alpha.5",
+  "version": "0.0.1-alpha.7",
   "description": "Webpack plugin and loaders for the ev framework",
   "type": "module",
   "publishConfig": {
@@ -35,8 +35,8 @@
   "author": "xusd320",
   "license": "MIT",
   "dependencies": {
-    "@evjs/manifest": "0.0.1-alpha.5",
-    "@swc/core": "^1.15.18"
+    "@evjs/build-tools": "0.0.1-alpha.7",
+    "@evjs/manifest": "0.0.1-alpha.7"
   },
   "devDependencies": {
     "typescript": "^5.7.3",

package/esm/version.d.ts

@@ -1,2 +0,0 @@
-export declare const VERSION = "0.0.1-alpha.5";
-//# sourceMappingURL=version.d.ts.map

package/esm/version.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,kBAAkB,CAAC"}

package/esm/version.js

@@ -1,2 +0,0 @@
-export const VERSION = "0.0.1-alpha.5";
-//# sourceMappingURL=version.js.map

package/esm/version.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC"}