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

package/dist/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAgBlD,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,MAAM,CA6hBpE;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAiBlD,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,MAAM,CA0hBpE;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/api/index.js

@@ -23,7 +23,7 @@
  */
 import { _withAfterNodeMiddleware } from "@farm.js/core/after";
 import { _runWithAPIRequestRuntime, createFarmRequestBodyErrorResponse, readNodeRequestBody, resolveFarmServerConfig, } from "@farm.js/core/internal/production-runtime";
-import { getAllowedAPIRouteMethods, invokeAPIRouteEndpoint, matchAPIRouteAtBasePath, resolveAPIRouteEndpoint, } from "@farm.js/core/api/runtime";
+import { API_ROUTE_METHODS, getAllowedAPIRouteMethods, invokeAPIRouteEndpoint, matchAPIRouteAtBasePath, resolveAPIRouteEndpoint, } from "@farm.js/core/api/runtime";
 import { sendWebResponse } from "@farm.js/core/server";
 /**
  * Farm.js API Routes Plugin
@@ -204,10 +204,9 @@ export default function farmApi(options = {}) {
                         const relativePath = path.relative(apiDir, path.dirname(filePath));
                         const routePath = "/api/" + (relativePath === "." ? "" : relativePath.replace(/\\/g, "/"));
                         const routeModule = await server.ssrLoadModule(filePath);
-                        const methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
                         const endpoints = {};
                         const availableMethods = [];
-                        for (const method of methods) {
+                        for (const method of API_ROUTE_METHODS) {
                             if (routeModule[method]) {
                                 availableMethods.push(method);
                                 endpoints[method] = routeModule[method];
@@ -440,10 +439,9 @@ export default function farmApi(options = {}) {
                     try {
                         // Reload the module
                         const routeModule = await server.ssrLoadModule(file);
-                        const methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
                         const endpoints = {};
                         const availableMethods = [];
-                        for (const method of methods) {
+                        for (const method of API_ROUTE_METHODS) {
                             if (routeModule[method]) {
                                 availableMethods.push(method);
                                 endpoints[method] = routeModule[method];
@@ -474,10 +472,9 @@ export default function farmApi(options = {}) {
                         const relativePath = path.relative(apiDir, path.dirname(file));
                         const routePath = "/api/" + (relativePath === "." ? "" : relativePath.replace(/\\/g, "/"));
                         const routeModule = await server.ssrLoadModule(file);
-                        const methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
                         const endpoints = {};
                         const availableMethods = [];
-                        for (const method of methods) {
+                        for (const method of API_ROUTE_METHODS) {
                             if (routeModule[method]) {
                                 availableMethods.push(method);
                                 endpoints[method] = routeModule[method];

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/middleware/matching.d.ts

@@ -16,6 +16,12 @@ export declare function parseCookies(cookieHeader?: string): Record<string, stri
  * Matching is by path segment, not raw string prefix: middleware at `/admin`
  * covers `/admin` and everything under `/admin/`, but not sibling routes like
  * `/administrator` or `/admin-public` that merely share a textual prefix.
+ *
+ * The request is compared as the router sees it: each segment decoded once and
+ * empty segments dropped. Comparing the raw pathname let `/api/%61dmin/users`,
+ * `/api//admin/users` and `//api/admin/users` skip middleware at `/api/admin`
+ * while the API router, which decodes segments and ignores empty ones, still
+ * served `/api/admin/users`.
  */
 export declare function middlewareMatchesPath(pathname: string, middlewarePath: string): boolean;
 /**

package/dist/middleware/matching.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matching.d.ts","sourceRoot":"","sources":["../../src/middleware/matching.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1E;AAUD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAIvF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAkChG"}
+{"version":3,"file":"matching.d.ts","sourceRoot":"","sources":["../../src/middleware/matching.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1E;AAUD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAMvF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAkChG"}

package/dist/middleware/matching.js

@@ -1,3 +1,4 @@
+import { canonicalizeRequestPathSegments } from "@farm.js/core/middleware";
 /**
  * Parse cookies from a Cookie header.
  *
@@ -34,13 +35,21 @@ function decodeCookieValue(value) {
  * Matching is by path segment, not raw string prefix: middleware at `/admin`
  * covers `/admin` and everything under `/admin/`, but not sibling routes like
  * `/administrator` or `/admin-public` that merely share a textual prefix.
+ *
+ * The request is compared as the router sees it: each segment decoded once and
+ * empty segments dropped. Comparing the raw pathname let `/api/%61dmin/users`,
+ * `/api//admin/users` and `//api/admin/users` skip middleware at `/api/admin`
+ * while the API router, which decodes segments and ignores empty ones, still
+ * served `/api/admin/users`.
  */
 export function middlewareMatchesPath(pathname, middlewarePath) {
-    if (middlewarePath === "/")
-        return true;
-    if (pathname === middlewarePath)
+    const middlewareSegments = middlewarePath.split("/").filter(Boolean);
+    if (middlewareSegments.length === 0)
         return true;
-    return pathname.startsWith(`${middlewarePath}/`);
+    const requestSegments = canonicalizeRequestPathSegments(pathname);
+    if (requestSegments.length < middlewareSegments.length)
+        return false;
+    return middlewareSegments.every((segment, index) => requestSegments[index] === segment);
 }
 /**
  * Serialize a cookie.

package/dist/observability/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;AAEtE,MAAM,MAAM,uBAAuB,GAC/B,mBAAmB,GACnB,cAAc,GACd,kBAAkB,GAClB,eAAe,GACf,cAAc,GACd,aAAa,CAAC;AAElB,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,uBAAuB,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,MAAM,CAAC,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,CAAC,EAAE;QACN,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,IAAI,EAAE,CACJ,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,6BAA6B,KACnC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,6BAA6B,KAEpC,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,GAAG,YAAY,GAAG,UAAU,CAAC,CAAC,GACtE,IAAI,GACJ,SAAS,GACT,OAAO,CACL,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,GAAG,YAAY,GAAG,UAAU,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAC1F,CAAC;CACP;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,mBAAmB,CAAC;IAC5B,QAAQ,EAAE,qBAAqB,CAAC;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,4BAA4B,KAClC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,MAAM,MAAM,6BAA6B,GAAG,MAAM,CAAC;AAEnD,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,4BAA4B,CAAC;CACvC;AAED,MAAM,WAAW,sCAAuC,SAAQ,8BAA8B;IAC5F,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mCAAoC,SAAQ,8BAA8B;IACzF,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,+BAA+B;IAC9C,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,4BAA4B,CAAC;CACvC;AAED,MAAM,WAAW,8BAA8B;IAC7C,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,4BAA4B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,4BAA4B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,4BAA4B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,+BAA+B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnF,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,sCAAsC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzF,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,mCAAmC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpF;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,6BAA6B,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAE9C;;OAEG;IACH,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAE3C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,4BAA4B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7E;;OAEG;IACH,MAAM,CAAC,EAAE,CACP,OAAO,EAAE,4BAA4B,KAEnC,sBAAsB,GACtB,IAAI,GACJ,SAAS,GACT,OAAO,CAAC,sBAAsB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IAEvD;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,4BAA4B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnF;AAED,MAAM,WAAW,6BAA6B;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC5B,mBAAmB,CAAC,EAAE,CACpB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,6BAA6B,KACnC,qBAAqB,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACnG;AAED,MAAM,WAAW,6BAA6B;IAC5C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,6BAA6B,CAAC;IAC1C,SAAS,CAAC,EAAE,6BAA6B,CAAC;IAC1C,QAAQ,CAAC,EAAE,4BAA4B,CAAC;IAExC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AASD,UAAU,mBAAmB;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACvF,aAAa,CAAC,EAAE,CACd,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,OAAO,CAAC,EAAE,OAAO,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,eAAe,CAAC,EAAE,CAChB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EACzC,OAAO,CAAC,EAAE,OAAO,KACd,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EACzD,OAAO,CAAC,EAAE,OAAO,KACd,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChG,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACrF,WAAW,CAAC,EAAE,CACZ,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAC1D,OAAO,CAAC,EAAE,OAAO,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,eAAe,CAAC,EAAE,CAChB,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7D,OAAO,CAAC,EAAE,OAAO,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACrE;AAkBD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,0BAA+B,GAAG,mBAAmB,CA8ajG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"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"}

package/dist/observability/index.js

@@ -301,7 +301,10 @@ export function observabilityPlugin(options = {}) {
                 console.log("[obs] ready");
         },
         beforeRequest(req) {
-            const pathname = req.url || "/";
+            // `req.url` carries the query string, and a pathname feeds incident
+            // titles and dedupe fingerprints: a reset `?token=` would reach every
+            // pipeline action, and each distinct query would open a new incident.
+            const pathname = (req.url || "/").split("?", 1)[0] || "/";
             const method = req.method || "GET";
             const requestId = `req_${now()}_${(signalCounter++).toString(36)}`;
             requestStarts.set(req, {
@@ -342,8 +345,10 @@ export function observabilityPlugin(options = {}) {
             if (!annotateHtml)
                 return html;
             const marker = `<!-- observability:path=${render.pathname} route=${render.routePattern ?? "unmatched"} -->`;
+            // A replacer function: as a replacement string, $` and $' in the request
+            // path would expand into copies of the page's own HTML.
             return html.includes("</body>")
-                ? html.replace("</body>", `${marker}\n</body>`)
+                ? html.replace("</body>", () => `${marker}\n</body>`)
                 : `${html}\n${marker}`;
         },
         async onError(error) {

package/dist/rsc/entries/rsc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAk8B1D"}
+{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA09B1D"}

package/dist/rsc/entries/rsc.js

@@ -23,9 +23,14 @@ export function generateRscEntry(ctx) {
         return { ...root, sourceGlob };
     });
     const debugLog = `// Debug disabled`;
+    const middlewareConfigImports = (ctx.middlewareConfigPaths ?? [])
+        .map((configPath, index) => `import * as FarmMiddlewareConfigModule${index} from ${JSON.stringify(configPath.replace(/\\/g, "/"))};`)
+        .join("\n");
+    const middlewareConfigValues = (ctx.middlewareConfigPaths ?? []).map((_configPath, index) => `(FarmMiddlewareConfigModule${index}.default || FarmMiddlewareConfigModule${index})`);
     let code = `
 import React from 'react';
 import ServerErrorFallback from '/.farm/rsc-entries/error-fallback.tsx';
+${middlewareConfigImports}
 import { registerAPIRouteShape } from '@farm.js/core/api/runtime';
 import {
   renderToReadableStream,
@@ -289,12 +294,21 @@ async function handleAPIRequest(request) {
     });
   }
 }
+const farmRuntimeConfigs = [${middlewareConfigValues.join(", ")}].filter(Boolean);
+const farmConfigMiddleware = farmRuntimeConfigs.flatMap((config) => {
+  const middleware = config.middleware;
+  if (!middleware) return [];
+  return Array.isArray(middleware) ? middleware : [middleware];
+});
 const farmMiddlewareRunner = createProductionMiddlewareRunner({
+  config: farmConfigMiddleware,
   modules: Object.entries(middlewares).map(([filePath, module]) => ({
     path: middlewarePathToRoute(filePath),
     filePath,
     module,
   })),
+  i18n: ${JSON.stringify(ctx.i18n) ?? "undefined"},
+  server: ${JSON.stringify(ctx.server) ?? "undefined"},
 });
 
 debug('Discovered pages:', Object.keys(pages));
@@ -319,8 +333,10 @@ function middlewarePathToRoute(filePath) {
 /**
  * Execute middleware chain for a request
  */
-async function executeMiddleware(request) {
-  return farmMiddlewareRunner(request);
+async function executeMiddleware(request, context) {
+  // The Request was rebuilt by the Nitro handler and has no socket; the
+  // handler passes the connection's address alongside it.
+  return farmMiddlewareRunner(request, { clientAddress: context?.clientAddress });
 }
 
 /**
@@ -455,7 +471,7 @@ function getMatchingBoundary(pageFilePath, modules, kind) {
  * Main request handler - entry point for both dev and production (Nitro).
  * Exported as { fetch: handler } for the RSC/Nitro contract (see vite-plugin-rsc-deploy-example).
  */
-async function handleFarmRequest(request) {
+async function handleFarmRequest(request, context) {
   let url = new URL(request.url);
   let matchedPage = null;
   let errorData = new Map();
@@ -493,7 +509,7 @@ async function handleFarmRequest(request) {
         : ""}
 
   // Execute middleware first
-  const middlewareResult = await executeMiddleware(request);
+  const middlewareResult = await executeMiddleware(request, context);
   
   // If middleware handled the request (e.g., redirect, auth), return the response
   if (middlewareResult.response) {
@@ -935,7 +951,7 @@ async function handler(request, context) {
     dispatch: async (localRequest) =>
       (await handleAPIRequest(localRequest)) ?? Response.json({ error: 'Not Found' }, { status: 404 }),
   }, () => _runWithCurrentRequest(request, () =>
-    _runWithAfterRequest(request, () => handleFarmRequest(request), context)
+    _runWithAfterRequest(request, () => handleFarmRequest(request, context), context)
   ));
 }
 

package/dist/rsc/index.d.ts

@@ -25,6 +25,7 @@ import { type Plugin, type UserConfig } from "vite";
 import type { FarmRscPluginOptions, EntryContext } from "./types.js";
 import type { FarmServerActionsConfig } from "@farm.js/core/server-action-security";
 import type { FarmAPIConfig } from "@farm.js/core/api";
+import type { FarmMiddlewareConfig } from "@farm.js/core/middleware";
 import type { FarmServerConfig } from "@farm.js/core/internal/production-runtime";
 import type { FarmLayerEntry, ResolvedFarmLayer } from "@farm.js/core/server";
 export type { FarmRscPluginOptions, EntryContext };
@@ -40,6 +41,7 @@ export interface FarmRscConfig {
     basePath?: string;
     api?: FarmAPIConfig;
     server?: FarmServerConfig;
+    middleware?: FarmMiddlewareConfig;
     port?: number;
     experimental?: {
         /**

package/dist/rsc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAIL,KAAK,MAAM,EACX,KAAK,UAAU,EAChB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAwD9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAuDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAsvC5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAIL,KAAK,MAAM,EACX,KAAK,UAAU,EAChB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA2D9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAuDnE;AAuXD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CA8yC5E"}

package/dist/rsc/index.js

@@ -35,6 +35,7 @@ import { transformAutomaticOptimizedBoundaries } from "./automatic-optimized-bou
 import { resolveRscBuildOutputPath } from "./build-paths.js";
 import { assertRscPackageCompatibility } from "./compatibility.js";
 import { sendRscDevelopmentResponse } from "./dev-response.js";
+import { loadRscMiddlewareConfigModule } from "./middleware-config-module.js";
 import fs from "fs/promises";
 import path from "path";
 import { devServableFileExists } from "../dev-static.js";
@@ -46,7 +47,7 @@ const { farmApiPlugin, farmMiddlewarePlugin } = require_("@farm.js/core");
 const { resolveServerActionsConfig, validateServerActionRequest, createServerActionRequestErrorResponse, } = require_("@farm.js/core/server-action-security");
 const { normalizeFarmDeploymentId } = require_("@farm.js/core/deployment");
 const { getFarmLayerAliases, getFarmSourceRoots, resolveFarmLayers } = require_("@farm.js/core/server");
-const { searchParamsToObject, readNodeRequestBody, resolveFarmServerConfig, createFarmRequestBodyErrorResponse, } = require_("@farm.js/core/internal/production-runtime");
+const { searchParamsToObject, readNodeRequestBody, resolveFarmServerConfig, resolveFarmI18nConfig, createFarmRequestBodyErrorResponse, } = require_("@farm.js/core/internal/production-runtime");
 const { isFarmAPIPathname } = require_("@farm.js/core/api/runtime");
 const { resolveFarmAPIConfig, resolveFarmAPIServerBasePath } = require_("@farm.js/core/api");
 const { getResolvedEnv } = require_("@farm.js/core/env");
@@ -175,7 +176,58 @@ const VIRTUAL_CLIENT_ENTRY = "virtual:@farm.js/rsc/entry-client";
 const VIRTUAL_HYDRATE_ENTRY = "virtual:@farm.js/rsc/hydrate";
 const OPTIMIZED_BOUNDARY_ADAPTER = "@farm.js/plugin/rsc/optimized-boundary";
 const STRATA_PACKAGE = "@farming-labs/strata";
+const RSC_MIDDLEWARE_CONFIG_QUERY = "?farm-rsc-middleware";
 const FARM_CORE_PACKAGE_ROOT = path.resolve(path.dirname(require_.resolve("@farm.js/core")), "..");
+const FARM_CONFIG_FILENAMES = [
+    "farm.config.ts",
+    "farm.config.tsx",
+    "farm.config.mts",
+    "farm.config.cts",
+    "farm.config.js",
+    "farm.config.jsx",
+    "farm.config.mjs",
+    "farm.config.cjs",
+    "config.ts",
+    "config.tsx",
+    "config.mts",
+    "config.cts",
+    "config.js",
+    "config.jsx",
+    "config.mjs",
+    "config.cjs",
+];
+function hasFarmMiddlewareConfig(config) {
+    if (!config)
+        return false;
+    if (Array.isArray(config))
+        return config.length > 0;
+    const entry = config;
+    return Boolean(entry.matcher ||
+        entry.exclude ||
+        entry.runtime ||
+        entry.handler ||
+        (Array.isArray(entry.handlers) && entry.handlers.length > 0));
+}
+async function findFarmConfigPath(root) {
+    for (const fileName of FARM_CONFIG_FILENAMES) {
+        const candidate = path.join(root, fileName);
+        try {
+            if ((await fs.stat(candidate)).isFile())
+                return candidate;
+        }
+        catch {
+            // Continue checking supported config names.
+        }
+    }
+    return null;
+}
+async function resolveMiddlewareConfigPaths(root, layers) {
+    const paths = (layers ?? []).flatMap((layer) => layer.configFile ? [path.resolve(layer.configFile)] : []);
+    const projectConfigPath = await findFarmConfigPath(root);
+    if (projectConfigPath)
+        paths.push(projectConfigPath);
+    return [...new Set(paths)];
+}
 function isOptimizedBoundaryModule(id) {
     return (id === OPTIMIZED_BOUNDARY_ADAPTER ||
         id === STRATA_PACKAGE ||
@@ -391,6 +443,7 @@ export default function farmRsc(options = {}) {
     // Context passed to entry generators
     let entryContext;
     let rscBuildRoot;
+    const middlewareConfigModules = new Map();
     // Store for debugging
     const debug = options.debug ?? false;
     const automaticDeploymentId = `build-${Date.now()}`;
@@ -480,6 +533,18 @@ export default function farmRsc(options = {}) {
     };
     return [
         farmEnvironmentFunctionsPlugin(),
+        {
+            name: "@farm.js/plugin/rsc:middleware-config",
+            enforce: "pre",
+            resolveId(id) {
+                if (!id.endsWith(RSC_MIDDLEWARE_CONFIG_QUERY))
+                    return null;
+                return id.replace(/\\/g, "/");
+            },
+            load(id) {
+                return middlewareConfigModules.get(id.replace(/\\/g, "/")) ?? null;
+            },
+        },
         {
             name: "@farm.js/plugin/rsc:core-runtime",
             // Run after Vite/esbuild has lowered TS/JSX. es-module-lexer deliberately
@@ -539,6 +604,31 @@ export default function farmRsc(options = {}) {
                     });
                     Object.assign(c, layerResolution.config);
                 }
+                middlewareConfigModules.clear();
+                const middlewareConfigPaths = [];
+                if (hasFarmMiddlewareConfig(c.middleware)) {
+                    const configPaths = await resolveMiddlewareConfigPaths(root, c.layers);
+                    if (configPaths.length === 0) {
+                        throw new Error("[Farm.js] RSC config middleware requires an importable farm.config file. " +
+                            "Move the middleware to farm.config.ts or src/app/middleware.ts.");
+                    }
+                    for (const configPath of configPaths) {
+                        const extracted = await loadRscMiddlewareConfigModule(configPath);
+                        if (extracted.kind === "unsupported") {
+                            throw new Error(`[Farm.js] Cannot extract RSC config middleware from ${configPath}: ${extracted.reason}. ` +
+                                "Declare middleware directly in defineConfig({ middleware: ... }) or move it to src/app/middleware.ts.");
+                        }
+                        if (extracted.kind === "absent")
+                            continue;
+                        const moduleId = `${configPath.replace(/\\/g, "/")}${RSC_MIDDLEWARE_CONFIG_QUERY}`;
+                        middlewareConfigModules.set(moduleId, extracted.code);
+                        middlewareConfigPaths.push(moduleId);
+                    }
+                    if (middlewareConfigPaths.length === 0) {
+                        throw new Error("[Farm.js] RSC config middleware could not be traced to an explicit middleware property. " +
+                            "Declare middleware directly in defineConfig({ middleware: ... }) or move it to src/app/middleware.ts.");
+                    }
+                }
                 // Read user's directory configuration
                 const api = await resolveFarmAPIConfig(c.api, {
                     root,
@@ -596,6 +686,15 @@ export default function farmRsc(options = {}) {
                         allowedOrigins: options.serverActions?.allowedOrigins ?? c.serverActions?.allowedOrigins,
                     }),
                     deploymentId,
+                    // Resolved the same way core resolves it for the config, so RSC and
+                    // non-RSC apps match middleware against the same pathname.
+                    i18n: resolveFarmI18nConfig(c.i18n, {
+                        root,
+                        mode: env.command === "serve" ? "development" : "production",
+                        basePath: c.basePath ?? "/",
+                    }),
+                    server: { trustProxy: resolveFarmServerConfig(c.server).trustProxy },
+                    middlewareConfigPaths,
                     debug,
                     development: env.command === "serve",
                     clientCachePersistence: generateClientCachePersistenceCode(resolveFarmClientCacheAdapterEntry(root, c.cache)),

package/dist/rsc/middleware-config-module.d.ts

@@ -0,0 +1,19 @@
+type AstNode = {
+    type: string;
+    start: number;
+    end: number;
+    [key: string]: unknown;
+};
+type ExtractionResult = {
+    kind: "module";
+    code: string;
+} | {
+    kind: "absent";
+} | {
+    kind: "unsupported";
+    reason: string;
+};
+export declare function extractRscMiddlewareConfigModule(source: string, program: AstNode): ExtractionResult;
+export declare function loadRscMiddlewareConfigModule(configPath: string): Promise<ExtractionResult>;
+export {};
+//# sourceMappingURL=middleware-config-module.d.ts.map

package/dist/rsc/middleware-config-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware-config-module.d.ts","sourceRoot":"","sources":["../../src/rsc/middleware-config-module.ts"],"names":[],"mappings":"AAQA,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AASF,KAAK,gBAAgB,GACjB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA6N5C,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,gBAAgB,CA4IlB;AAiBD,wBAAsB,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAejG"}

package/dist/rsc/middleware-config-module.js

@@ -0,0 +1,355 @@
+import path from "node:path";
+function isNode(value) {
+    return Boolean(value &&
+        typeof value === "object" &&
+        typeof value.type === "string" &&
+        typeof value.start === "number" &&
+        typeof value.end === "number");
+}
+function bindingNames(pattern, names = []) {
+    if (!pattern)
+        return names;
+    if (pattern.type === "Identifier") {
+        names.push(pattern.name);
+        return names;
+    }
+    if (pattern.type === "RestElement") {
+        return bindingNames(pattern.argument, names);
+    }
+    if (pattern.type === "AssignmentPattern") {
+        return bindingNames(pattern.left, names);
+    }
+    if (pattern.type === "ArrayPattern") {
+        for (const element of pattern.elements ?? []) {
+            bindingNames(element, names);
+        }
+        return names;
+    }
+    if (pattern.type === "ObjectPattern") {
+        for (const property of pattern.properties ?? []) {
+            bindingNames(property.type === "RestElement"
+                ? property.argument
+                : property.value, names);
+        }
+    }
+    return names;
+}
+function isReferenceIdentifier(node, parent, key) {
+    if (!parent)
+        return true;
+    if ((parent.type === "MemberExpression" || parent.type === "OptionalMemberExpression") &&
+        key === "property" &&
+        parent.computed !== true) {
+        return false;
+    }
+    if ((parent.type === "Property" ||
+        parent.type === "PropertyDefinition" ||
+        parent.type === "MethodDefinition") &&
+        key === "key" &&
+        parent.computed !== true) {
+        return parent.shorthand === true;
+    }
+    if (parent.type === "VariableDeclarator")
+        return key !== "id";
+    if (parent.type === "FunctionDeclaration" ||
+        parent.type === "FunctionExpression" ||
+        parent.type === "ArrowFunctionExpression") {
+        return key !== "id" && key !== "params";
+    }
+    if (parent.type === "ClassDeclaration" || parent.type === "ClassExpression") {
+        return key !== "id";
+    }
+    if (parent.type === "CatchClause")
+        return key !== "param";
+    if (parent.type === "RestElement")
+        return false;
+    if (parent.type === "AssignmentPattern")
+        return key !== "left";
+    return ![
+        "ArrayPattern",
+        "BreakStatement",
+        "ContinueStatement",
+        "ExportSpecifier",
+        "ImportDefaultSpecifier",
+        "ImportNamespaceSpecifier",
+        "ImportSpecifier",
+        "LabeledStatement",
+    ].includes(parent.type);
+}
+function scopeBindings(node) {
+    const names = new Set();
+    if (node.type === "FunctionDeclaration" ||
+        node.type === "FunctionExpression" ||
+        node.type === "ArrowFunctionExpression") {
+        if (isNode(node.id))
+            bindingNames(node.id).forEach((name) => names.add(name));
+        for (const parameter of node.params ?? []) {
+            bindingNames(parameter).forEach((name) => names.add(name));
+        }
+    }
+    else if (node.type === "CatchClause" && isNode(node.param)) {
+        bindingNames(node.param).forEach((name) => names.add(name));
+    }
+    else if (node.type === "BlockStatement") {
+        for (const statement of node.body ?? []) {
+            const declaration = statement.type === "ExportNamedDeclaration" && isNode(statement.declaration)
+                ? statement.declaration
+                : statement;
+            if (declaration.type === "VariableDeclaration" && declaration.kind !== "var") {
+                for (const declarator of declaration.declarations ?? []) {
+                    bindingNames(declarator.id).forEach((name) => names.add(name));
+                }
+            }
+            else if ((declaration.type === "FunctionDeclaration" || declaration.type === "ClassDeclaration") &&
+                isNode(declaration.id)) {
+                names.add(declaration.id.name);
+            }
+        }
+    }
+    return names;
+}
+function referencedTopLevelNames(node, candidates) {
+    const references = new Set();
+    const visit = (value, parent, key, scopes) => {
+        if (Array.isArray(value)) {
+            for (const child of value)
+                visit(child, parent, key, scopes);
+            return;
+        }
+        if (!isNode(value))
+            return;
+        const nodeScopes = [
+            ...scopes,
+            ...([
+                "ArrowFunctionExpression",
+                "BlockStatement",
+                "CatchClause",
+                "FunctionDeclaration",
+                "FunctionExpression",
+            ].includes(value.type)
+                ? [scopeBindings(value)]
+                : []),
+        ];
+        if (value.type === "Identifier") {
+            const name = value.name;
+            const shadowed = nodeScopes.some((scope) => scope.has(name));
+            if (candidates.has(name) && !shadowed && isReferenceIdentifier(value, parent, key)) {
+                references.add(name);
+            }
+            return;
+        }
+        for (const [childKey, child] of Object.entries(value)) {
+            if (childKey === "start" || childKey === "end" || childKey === "loc")
+                continue;
+            visit(child, value, childKey, nodeScopes);
+        }
+    };
+    visit(node, null, "", []);
+    return references;
+}
+function importBindingCode(statement, specifier, _source) {
+    const moduleSource = JSON.stringify(statement.source.value);
+    const local = specifier.local.name;
+    if (specifier.type === "ImportDefaultSpecifier") {
+        return `import ${local} from ${moduleSource};`;
+    }
+    if (specifier.type === "ImportNamespaceSpecifier") {
+        return `import * as ${local} from ${moduleSource};`;
+    }
+    const imported = specifier.imported;
+    const importedName = imported.type === "Identifier" ? imported.name : JSON.stringify(imported.value);
+    return `import { ${importedName}${importedName === local ? "" : ` as ${local}`} } from ${moduleSource};`;
+}
+function propertyName(property) {
+    if (property.computed === true)
+        return null;
+    const key = property.key;
+    if (key.type === "Identifier")
+        return key.name;
+    if (key.type === "Literal" && typeof key.value === "string")
+        return key.value;
+    return null;
+}
+function resolveConfigObject(node, variableInitializers, configHelpers, seen = new Set()) {
+    if (node.type === "ObjectExpression")
+        return node;
+    if (node.type === "CallExpression") {
+        const callee = node.callee;
+        const args = node.arguments ?? [];
+        if (callee.type === "Identifier" &&
+            configHelpers.has(callee.name) &&
+            args.length === 1) {
+            return resolveConfigObject(args[0], variableInitializers, configHelpers, seen);
+        }
+        return null;
+    }
+    if (node.type === "Identifier") {
+        const name = node.name;
+        if (seen.has(name))
+            return null;
+        const initializer = variableInitializers.get(name);
+        if (!initializer)
+            return null;
+        seen.add(name);
+        return resolveConfigObject(initializer, variableInitializers, configHelpers, seen);
+    }
+    return null;
+}
+export function extractRscMiddlewareConfigModule(source, program) {
+    const body = program.body ?? [];
+    const bindings = new Map();
+    const variableInitializers = new Map();
+    const configHelpers = new Set(["defineConfig", "defineFarmConfig"]);
+    let defaultExport = null;
+    let order = 0;
+    for (const statement of body) {
+        if (statement.type === "ImportDeclaration") {
+            const moduleName = statement.source.value;
+            for (const specifier of statement.specifiers ?? []) {
+                const local = specifier.local.name;
+                if (moduleName === "@farm.js/core" || moduleName === "@farm.js/core/config") {
+                    const imported = specifier.imported;
+                    const importedName = imported?.type === "Identifier" ? imported.name : undefined;
+                    if (importedName === "defineConfig" || importedName === "defineFarmConfig") {
+                        configHelpers.add(local);
+                    }
+                }
+                bindings.set(local, {
+                    names: [local],
+                    order: order++,
+                    render: () => importBindingCode(statement, specifier, source),
+                    references: null,
+                });
+            }
+            continue;
+        }
+        if (statement.type === "ExportDefaultDeclaration") {
+            defaultExport = statement.declaration;
+            continue;
+        }
+        if (statement.type === "ExportNamedDeclaration") {
+            for (const specifier of statement.specifiers ?? []) {
+                const exported = specifier.exported;
+                if ((exported.type === "Identifier" && exported.name === "default") ||
+                    (exported.type === "Literal" && exported.value === "default")) {
+                    defaultExport = specifier.local;
+                }
+            }
+        }
+        const declaration = statement.type === "ExportNamedDeclaration" && isNode(statement.declaration)
+            ? statement.declaration
+            : statement;
+        if (declaration.type === "VariableDeclaration") {
+            for (const declarator of declaration.declarations ?? []) {
+                const names = bindingNames(declarator.id);
+                const initializer = isNode(declarator.init) ? declarator.init : null;
+                if (names.length === 1 && initializer)
+                    variableInitializers.set(names[0], initializer);
+                const binding = {
+                    names,
+                    order: order++,
+                    render: () => `${declaration.kind} ${source.slice(declarator.start, declarator.end)};`,
+                    references: declarator,
+                };
+                for (const name of names)
+                    bindings.set(name, binding);
+            }
+            continue;
+        }
+        if ((declaration.type === "FunctionDeclaration" || declaration.type === "ClassDeclaration") &&
+            isNode(declaration.id)) {
+            const name = declaration.id.name;
+            bindings.set(name, {
+                names: [name],
+                order: order++,
+                render: () => source.slice(declaration.start, declaration.end),
+                references: declaration,
+            });
+        }
+    }
+    if (!defaultExport) {
+        return { kind: "unsupported", reason: "the config has no default export" };
+    }
+    const configObject = resolveConfigObject(defaultExport, variableInitializers, configHelpers);
+    if (!configObject) {
+        return {
+            kind: "unsupported",
+            reason: "the default export is not a statically traceable defineConfig object",
+        };
+    }
+    const properties = configObject.properties ?? [];
+    let middlewareProperty = null;
+    let middlewareIndex = -1;
+    for (const [index, property] of properties.entries()) {
+        if (property.type === "Property" && propertyName(property) === "middleware") {
+            middlewareProperty = property;
+            middlewareIndex = index;
+        }
+    }
+    if (!middlewareProperty) {
+        if (properties.some((property) => property.type === "SpreadElement")) {
+            return {
+                kind: "unsupported",
+                reason: "middleware may be supplied through a config spread",
+            };
+        }
+        return { kind: "absent" };
+    }
+    if (properties.slice(middlewareIndex + 1).some((property) => property.type === "SpreadElement")) {
+        return {
+            kind: "unsupported",
+            reason: "a config spread after middleware may override it",
+        };
+    }
+    const middlewareValue = middlewareProperty.value;
+    const candidateNames = new Set(bindings.keys());
+    const selectedBindings = new Set();
+    const pending = [...referencedTopLevelNames(middlewareValue, candidateNames)];
+    while (pending.length > 0) {
+        const name = pending.pop();
+        const binding = bindings.get(name);
+        if (!binding || selectedBindings.has(binding))
+            continue;
+        selectedBindings.add(binding);
+        if (binding.references) {
+            for (const reference of referencedTopLevelNames(binding.references, candidateNames)) {
+                pending.push(reference);
+            }
+        }
+    }
+    const declarations = [...selectedBindings]
+        .sort((a, b) => a.order - b.order)
+        .map((binding) => binding.render());
+    const middlewareSource = source.slice(middlewareValue.start, middlewareValue.end);
+    return {
+        kind: "module",
+        code: `${declarations.join("\n")}${declarations.length ? "\n" : ""}export default { middleware: ${middlewareSource} };\n`,
+    };
+}
+function esbuildLoader(file) {
+    switch (path.extname(file)) {
+        case ".ts":
+        case ".mts":
+        case ".cts":
+            return "ts";
+        case ".tsx":
+            return "tsx";
+        case ".jsx":
+            return "jsx";
+        default:
+            return "js";
+    }
+}
+export async function loadRscMiddlewareConfigModule(configPath) {
+    const [{ readFile }, { parseAst, transformWithEsbuild }] = await Promise.all([
+        import("node:fs/promises"),
+        import("vite"),
+    ]);
+    const source = await readFile(configPath, "utf8");
+    const transformed = await transformWithEsbuild(source, configPath, {
+        format: "esm",
+        jsx: "automatic",
+        loader: esbuildLoader(configPath),
+    });
+    return extractRscMiddlewareConfigModule(transformed.code, parseAst(transformed.code));
+}

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;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"}
+{"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;AAwFD,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

@@ -249,9 +249,22 @@ function createRscRequest(event) {
   return new Request(request, { signal: controller.signal });
 }
 
+// The peer address the server adapter already knows; the rebuilt Request has
+// no socket. Mirrors h3's getRequestIP without the forwarded header, which only
+// trustProxy may honor.
+function resolveClientAddress(event) {
+  try {
+    return event.req?.context?.clientAddress || event.req?.ip ||
+      event.node?.req?.socket?.remoteAddress || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 export default defineEventHandler(async (event) => {
   const response = await handler(createRscRequest(event), {
     waitUntil: (promise) => event.waitUntil(promise),
+    clientAddress: resolveClientAddress(event),
   });
   // H3's prepared headers override Response headers. Keep both the runtime's
   // fields (e.g. Accept-Encoding from static middleware) and the app's fields.

package/dist/rsc/types.d.ts

@@ -1,3 +1,4 @@
+import type { ResolvedFarmI18nConfig } from "@farm.js/core/i18n";
 import type { FarmServerActionsConfig, ResolvedFarmServerActionsConfig } from "@farm.js/core/server-action-security";
 /**
  * Configuration options for the Farm.js RSC plugin.
@@ -72,6 +73,25 @@ export interface EntryContext {
     serverActions: ResolvedFarmServerActionsConfig;
     /** Resolved build identifier embedded into the server and browser entries. */
     deploymentId: string;
+    /**
+     * Resolved i18n configuration. Middleware path matching runs against the
+     * locale-stripped pathname, so without this a `/de/dashboard` request never
+     * matches a `/dashboard` middleware.
+     */
+    i18n?: ResolvedFarmI18nConfig;
+    /**
+     * Server settings the request path needs. `trustProxy` decides whether
+     * forwarded headers are believed when middleware reads the client address.
+     */
+    server?: {
+        trustProxy: boolean;
+    };
+    /**
+     * Ordered config modules that can contribute live middleware handlers.
+     * Layer configs come first and the application config comes last, matching
+     * Farm's normal config merge order.
+     */
+    middlewareConfigPaths?: string[];
     /** Whether debug mode is enabled */
     debug: boolean;
     /** True only for the Vite serve command, never for a production build. */

package/dist/rsc/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/rsc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,yDAAyD;IACzD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,2CAA2C;QAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IAEjB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,uFAAuF;IACvF,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IAEH,yCAAyC;IACzC,cAAc,EAAE,OAAO,CAAC;IAExB,wDAAwD;IACxD,aAAa,EAAE,+BAA+B,CAAC;IAE/C,8EAA8E;IAC9E,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,KAAK,EAAE,OAAO,CAAC;IAEf,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,8EAA8E;IAC9E,sBAAsB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5D;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAE/B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,0DAA0D;IAC1D,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC;IAEzB,wFAAwF;IACxF,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAEjC,yEAAyE;IACzE,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QACZ,EAAE,EAAE,OAAO,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;KACf,CAAC;IAEF,6CAA6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB,QAAQ,CAAC,OAAO,EAAE;YAChB,qCAAqC;YACrC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAEhC,6CAA6C;YAC7C,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhE,kDAAkD;YAClD,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC5D,CAAC;KACH;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/rsc/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.106",
+  "version": "0.1.0-beta.108",
   "description": "Official plugins for Farm.js framework",
   "license": "MIT",
   "author": "Farm.js Team",
@@ -62,7 +62,7 @@
     "nitro": "3.0.260903-beta",
     "picocolors": "^1.0.0",
     "rsc-html-stream": "^0.0.4",
-    "@farm.js/core": "0.1.0-beta.106"
+    "@farm.js/core": "0.1.0-beta.108"
   },
   "devDependencies": {
     "@types/node": "^20.19.21",
@@ -83,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.106"
+    "@farm.js/core": "0.1.0-beta.108"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {