@farm.js/plugin 0.1.0-beta.105 → 0.1.0-beta.106

package/dist/index.d.ts

@@ -39,5 +39,5 @@
  * })
  * ```
  */
-export declare const version = "0.1.0-beta.104";
+export declare const version = "0.1.0-beta.106";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -39,7 +39,7 @@
  * })
  * ```
  */
-export const version = "0.1.0-beta.104";
+export const version = "0.1.0-beta.106";
 // Note: Import plugins from their respective subpaths:
 // - @farm.js/plugin/rsc
 // - @farm.js/plugin/middleware

package/dist/rsc/nitro-build.d.ts

@@ -8,6 +8,8 @@
  * self-contained even when the application does not install it directly.
  */
 export declare function registerRscNitroRuntimePackage(root: string, packageName: string, packageRoot: string): void;
+/** @internal */
+export declare function rewriteRscEntryImports(serverDir: string, serverDistDir: string): void;
 /**
  * Wait for the RSC plugin to write the assets manifest to dist/rsc (it may run after closeBundle(ssr)).
  * Polls until the file exists and size > MIN_MANIFEST_BYTES or timeout.

package/dist/rsc/nitro-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA0ED,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+MhF"}
+{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAcD,gBAAgB;AAChB,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CA8BrF;AA4ED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA2ED,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyLhF"}

package/dist/rsc/nitro-build.js

@@ -39,6 +39,35 @@ function copyDir(src, dest, ignoredNames = new Set()) {
             copyFileSync(srcPath, destPath);
     }
 }
+/** @internal */
+export function rewriteRscEntryImports(serverDir, serverDistDir) {
+    const entryChunkPaths = [];
+    const findEntryChunks = (dir) => {
+        if (!existsSync(dir))
+            return;
+        for (const name of readdirSync(dir)) {
+            const candidate = path.join(dir, name);
+            if (statSync(candidate).isDirectory())
+                findEntryChunks(candidate);
+            else if (name === "rsc-entry.mjs")
+                entryChunkPaths.push(candidate);
+        }
+    };
+    for (const chunksDir of ["chunks", "_chunks", "_build"]) {
+        findEntryChunks(path.join(serverDir, chunksDir));
+    }
+    for (const entryChunkPath of entryChunkPaths) {
+        let code = readFileSync(entryChunkPath, "utf-8");
+        const relativeImport = (target) => {
+            const relative = path.relative(path.dirname(entryChunkPath), target).replace(/\\/g, "/");
+            return relative.startsWith(".") ? relative : `./${relative}`;
+        };
+        // Match any path that ends with dist/rsc/index.js or dist/ssr/index.js (minified, no spaces)
+        code = code.replace(/(["'`])[^"'`]*?dist\/rsc\/index\.js\1/g, JSON.stringify(relativeImport(path.join(serverDistDir, "rsc", "index.js"))));
+        code = code.replace(/(["'`])[^"'`]*?dist\/ssr\/index\.js\1/g, JSON.stringify(relativeImport(path.join(serverDistDir, "ssr", "index.js"))));
+        writeFileSync(entryChunkPath, code, "utf-8");
+    }
+}
 function detectBundledRscRuntimes(rendererPath) {
     const packages = new Map();
     const rendererDir = path.dirname(path.resolve(rendererPath));
@@ -194,7 +223,8 @@ const handler = getFetchHandler(entryExports);
 
 function createRscRequest(event) {
   const node = event.node;
-  if (!node?.req || !node?.res) return event.req;
+  const request = event.req?._request || event.req;
+  if (!node?.req || !node?.res) return request;
 
   const controller = new AbortController();
   const cleanup = () => {
@@ -216,7 +246,7 @@ function createRscRequest(event) {
   node.res.once("finish", cleanup);
   if (node.req.aborted) abort();
 
-  return new Request(event.req, { signal: controller.signal });
+  return new Request(request, { signal: controller.signal });
 }
 
 export default defineEventHandler(async (event) => {
@@ -241,7 +271,7 @@ export default defineEventHandler(async (event) => {
 }
 export async function buildRscNitro(options) {
     const { rendererPath, publicDir, ssrPath, assetsDir, root, outputDir = path.join(root, ".output"), preset = "vercel", } = options;
-    const { build, copyPublicAssets, createNitro, prepare } = await import("nitro");
+    const { build, copyPublicAssets, createNitro, prepare } = await import("nitro/builder");
     console.log(`[FARM] Building RSC server with Nitro (preset: ${preset})...`);
     const buildDir = path.join(root, ".nitro");
     const serverDir = path.join(outputDir, "server");
@@ -263,23 +293,28 @@ export async function buildRscNitro(options) {
     }
     const config = {
         preset,
+        // The RSC plugin supports Vite 6+, while Nitro's beta Vite builder follows
+        // its own Vite 8 peer range. The prebuilt renderer works with Rolldown and
+        // keeps the app's Vite version out of Nitro's production build contract.
+        builder: "rolldown",
         rootDir: root,
-        srcDir: root,
+        serverDir: root,
         buildDir,
         dev: false,
+        alias: {
+            h3: runtimeRequire.resolve("h3"),
+        },
         output: {
             dir: outputDir,
             serverDir,
             publicDir: publicOutDir,
         },
         publicAssets,
-        renderer: { entry: entryPath },
+        renderer: { handler: entryPath },
         // The prebuilt RSC/SSR bundles are copied after Nitro finishes, so Nitro's
         // module graph cannot otherwise see their bare package imports. Trace both
         // entry points explicitly to keep node-server output self-contained.
-        externals: {
-            traceInclude: [rendererPath, ...(ssrPath ? [ssrPath] : [])],
-        },
+        traceDeps: [rendererPath, ...(ssrPath ? [ssrPath] : [])],
         // Externalize rsc/ssr so we don't bundle (they reference Vite-generated manifest). We copy dist into server output after build.
         rollupConfig: {
             external: (id) => {
@@ -316,33 +351,9 @@ export async function buildRscNitro(options) {
         mkdirSync(rscDestDir, { recursive: true });
         writeFileSync(manifestDest, "export default { serverResources: {}, clientReferenceDeps: {} };", "utf-8");
     }
-    // Nitro may group the entry under chunks/build or chunks/_ depending on the
-    // selected builder. Find it by name and make copied-dist imports relative to
-    // the emitted chunk so the output survives being moved away from the project.
-    const entryChunkPaths = [];
-    const findEntryChunks = (dir) => {
-        if (!existsSync(dir))
-            return;
-        for (const name of readdirSync(dir)) {
-            const candidate = path.join(dir, name);
-            if (statSync(candidate).isDirectory())
-                findEntryChunks(candidate);
-            else if (name === "rsc-entry.mjs")
-                entryChunkPaths.push(candidate);
-        }
-    };
-    findEntryChunks(path.join(serverDir, "chunks"));
-    for (const entryChunkPath of entryChunkPaths) {
-        let code = readFileSync(entryChunkPath, "utf-8");
-        const relativeImport = (target) => {
-            const relative = path.relative(path.dirname(entryChunkPath), target).replace(/\\/g, "/");
-            return relative.startsWith(".") ? relative : `./${relative}`;
-        };
-        // Match any path that ends with dist/rsc/index.js or dist/ssr/index.js (minified, no spaces)
-        code = code.replace(/(["'`])[^"'`]*?dist\/rsc\/index\.js\1/g, JSON.stringify(relativeImport(path.join(serverDistDir, "rsc", "index.js"))));
-        code = code.replace(/(["'`])[^"'`]*?dist\/ssr\/index\.js\1/g, JSON.stringify(relativeImport(path.join(serverDistDir, "ssr", "index.js"))));
-        writeFileSync(entryChunkPath, code, "utf-8");
-    }
+    // Nitro may group the entry differently by builder. Make copied-dist imports
+    // relative to the emitted chunk so output survives moving away from the project.
+    rewriteRscEntryImports(serverDir, serverDistDir);
     // Patch SSR bundle: inject production client CSS href and bootstrap script so HTML has styles and hydration works
     const ssrIndexPath = path.join(serverDistDir, "ssr", "index.js");
     const manifestPath = path.join(serverDistDir, "rsc", MANIFEST_FILENAME);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.105",
+  "version": "0.1.0-beta.106",
   "description": "Official plugins for Farm.js framework",
   "license": "MIT",
   "author": "Farm.js Team",
@@ -58,10 +58,11 @@
     "@farming-labs/strata": "0.1.2",
     "better-call": "^1.0.19",
     "es-module-lexer": "2.0.0",
-    "nitro": "3.0.1-alpha.0",
+    "h3": "2.0.1-rc.32",
+    "nitro": "3.0.260903-beta",
     "picocolors": "^1.0.0",
     "rsc-html-stream": "^0.0.4",
-    "@farm.js/core": "0.1.0-beta.105"
+    "@farm.js/core": "0.1.0-beta.106"
   },
   "devDependencies": {
     "@types/node": "^20.19.21",
@@ -82,7 +83,7 @@
     "react-dom": "19.2.8",
     "react-server-dom-webpack": "19.2.8",
     "vite": ">=6.0.0",
-    "@farm.js/core": "0.1.0-beta.105"
+    "@farm.js/core": "0.1.0-beta.106"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {