veryfront 0.1.1047 → 0.1.1049

package/esm/src/server/build-app-route-renderer.js

@@ -1,8 +1,7 @@
 /**
  * App Route HTML Rendering for Build
  */
-import { serverLogger as logger } from "../utils/index.js";
-import { join } from "../platform/compat/path/index.js";
+import { dirname, isAbsolute, join, normalize, relative } from "../platform/compat/path/index.js";
 import { getProjectReact, renderToStringAdapter } from "../react/index.js";
 import { loadComponentFromSource } from "../modules/react-loader/index.js";
 import { COMPILATION_ERROR } from "../errors/index.js";
@@ -10,62 +9,85 @@ import { generateHydrationData, getProdScripts } from "../html/index.js";
 import { buildImportMapJson } from "../html/utils.js";
 import { getPreviewStylesheetLink } from "../html/dev-scripts.js";
 import { shouldUnwrapAppRouterDocumentLayout, unwrapAppRouterDocumentLayout, } from "../rendering/layouts/utils/component-loader.js";
+import { resolveProjectReactVersion } from "../transforms/esm/package-registry.js";
+import { isNotFoundError } from "../platform/compat/fs.js";
+import { determineClientModuleStrategy } from "../rendering/rsc/client-module-strategy.js";
+import { CLIENT_PAGE_ISLAND_ID, hasUseClientDirective, planClientPageIsland, } from "../rendering/rsc/page-island.js";
+import { LAYOUT_EXTENSIONS } from "../rendering/layouts/types.js";
+const APP_ROUTE_LAYOUT_EXTENSIONS = LAYOUT_EXTENSIONS.filter((extension) => extension !== "md" && extension !== "mdx");
 async function fileExists(adapter, filePath) {
     try {
         const st = await adapter.fs.stat(filePath);
         return st.isFile;
     }
-    catch (_) {
-        /* expected: file may not exist */
-        return false;
+    catch (error) {
+        if (isNotFoundError(error))
+            return false;
+        throw error;
     }
 }
-async function loadComponent(adapter, filePath, projectDir, contentSourceId) {
+async function loadComponent(adapter, filePath, projectDir, contentSourceId, reactVersion) {
     const src = await adapter.fs.readFile(filePath);
     return loadComponentFromSource(src, filePath, projectDir, adapter, {
         projectId: projectDir,
         dev: false,
         moduleServerUrl: "",
         contentSourceId,
+        reactVersion,
     });
 }
 function routePathToSlug(routePath) {
     return routePath === "/" ? "" : routePath.replace(/^\/+/, "");
 }
-function hasUseClientDirective(source) {
-    return /^\s*['"]use client['"];?\s*$/m.test(source);
-}
-function getLayoutsForRoute(appRoot, routePath) {
-    const segments = routePath === "/" ? [] : routePath.split("/").filter(Boolean);
-    const layouts = [];
-    let current = appRoot;
-    layouts.push(join(current, "layout.tsx"));
-    for (const seg of segments) {
-        current = join(current, seg);
-        layouts.push(join(current, "layout.tsx"));
+function getLayoutDirectoriesForPage(appRoot, pageFile) {
+    const normalizedAppRoot = normalize(appRoot);
+    const pageDirectory = normalize(dirname(pageFile));
+    const relativePageDirectory = relative(normalizedAppRoot, pageDirectory).replaceAll("\\", "/");
+    if (relativePageDirectory === ".." ||
+        relativePageDirectory.startsWith("../") ||
+        isAbsolute(relativePageDirectory)) {
+        return [normalizedAppRoot];
+    }
+    const directories = [];
+    let current = pageDirectory;
+    while (true) {
+        directories.push(current);
+        if (current === normalizedAppRoot)
+            break;
+        const parent = dirname(current);
+        if (parent === current)
+            return [normalizedAppRoot];
+        current = parent;
     }
-    return layouts;
+    return directories.reverse();
 }
 /**
  * Render an App Router route to HTML
  */
 export async function renderAppRouteToHTML(args) {
-    const { adapter, projectDir, routePath, pageFile, contentSourceId, releaseAssetManifest, stylesheetHref, includePreviewStylesheet, } = args;
-    const appRoot = join(projectDir, "app");
-    const layoutCandidates = getLayoutsForRoute(appRoot, routePath);
+    const { adapter, projectDir, routePath, pageFile, contentSourceId, reactVersion: explicitReactVersion, config, releaseAssetManifest, stylesheetHref, includePreviewStylesheet, } = args;
+    const appRoot = join(projectDir, config?.directories?.app ?? "app");
+    const reactVersion = explicitReactVersion ??
+        await resolveProjectReactVersion({ projectDir, config });
     const layouts = [];
-    for (const layoutPath of layoutCandidates) {
-        if (await fileExists(adapter, layoutPath))
+    for (const directory of getLayoutDirectoriesForPage(appRoot, pageFile)) {
+        for (const extension of APP_ROUTE_LAYOUT_EXTENSIONS) {
+            const layoutPath = join(directory, `layout.${extension}`);
+            if (!(await fileExists(adapter, layoutPath)))
+                continue;
             layouts.push(layoutPath);
+            break;
+        }
     }
-    // Get React from the project's node_modules to ensure element symbols match
-    const React = await getProjectReact();
+    // Use the resolved project version so component and renderer modules share one React instance.
+    const React = await getProjectReact(reactVersion);
     const pageSource = await adapter.fs.readFile(pageFile);
     const Page = await loadComponentFromSource(pageSource, pageFile, projectDir, adapter, {
         projectId: projectDir,
         dev: false,
         moduleServerUrl: "",
         contentSourceId,
+        reactVersion,
     });
     if (typeof Page !== "function") {
         throw COMPILATION_ERROR.create({
@@ -73,39 +95,77 @@ export async function renderAppRouteToHTML(args) {
             context: { pageFile, type: typeof Page },
         });
     }
+    const hydrationStrategy = determineClientModuleStrategy({
+        isLocalProject: false,
+        environment: "production",
+    });
+    const layoutDescriptors = layouts.map((path) => ({ kind: "tsx", path }));
+    const clientPageIsland = await planClientPageIsland({
+        pageSource,
+        pagePath: pageFile,
+        projectDir,
+        appDir: config?.directories?.app ?? "app",
+        layouts: layoutDescriptors,
+        fs: adapter.fs,
+        strategy: hydrationStrategy,
+    });
     let element = React.createElement(Page);
+    const loadedLayouts = new Array(layouts.length);
     for (let i = layouts.length - 1; i >= 0; i--) {
         const layoutPath = layouts[i];
         if (!layoutPath)
             continue;
-        try {
-            const Layout = await loadComponent(adapter, layoutPath, projectDir, contentSourceId);
-            if (typeof Layout !== "function")
-                continue;
-            const LayoutToApply = shouldUnwrapAppRouterDocumentLayout(layoutPath, projectDir)
-                ? unwrapAppRouterDocumentLayout(React, Layout)
-                : Layout;
-            element = React.createElement(LayoutToApply, { children: element });
+        const Layout = await loadComponent(adapter, layoutPath, projectDir, contentSourceId, reactVersion);
+        if (typeof Layout !== "function") {
+            throw COMPILATION_ERROR.create({
+                detail: "Invalid layout component",
+                context: { layoutPath, type: typeof Layout },
+            });
         }
-        catch (error) {
-            logger.debug("[BuildAppRouteRenderer] Layout loading failed, continuing without layout", error);
+        const LayoutToApply = shouldUnwrapAppRouterDocumentLayout(layoutPath, projectDir, config?.directories?.app)
+            ? unwrapAppRouterDocumentLayout(React, Layout)
+            : Layout;
+        loadedLayouts[i] = LayoutToApply;
+    }
+    const clientLayoutStart = clientPageIsland?.serverLayouts.length ?? 0;
+    const firstLayoutToApply = clientPageIsland ? clientLayoutStart : 0;
+    for (let i = loadedLayouts.length - 1; i >= firstLayoutToApply; i--) {
+        const Layout = loadedLayouts[i];
+        if (Layout)
+            element = React.createElement(Layout, { children: element });
+    }
+    if (clientPageIsland) {
+        element = React.createElement("div", { id: CLIENT_PAGE_ISLAND_ID }, element);
+        for (let i = clientLayoutStart - 1; i >= 0; i--) {
+            const Layout = loadedLayouts[i];
+            if (Layout)
+                element = React.createElement(Layout, { children: element });
         }
     }
-    const htmlInner = await renderToStringAdapter(element);
+    const htmlInner = await renderToStringAdapter(element, { reactVersion });
     const title = "Veryfront App";
     const slug = routePathToSlug(routePath);
-    const importMapJson = await buildImportMapJson({ projectDir, releaseAssetManifest });
-    const hydrationData = hasUseClientDirective(pageSource)
+    const importMapJson = await buildImportMapJson({
+        projectDir,
+        config: {
+            ...config,
+            react: { ...config?.react, version: reactVersion },
+        },
+        releaseAssetManifest,
+    });
+    const hydrationData = clientPageIsland || hasUseClientDirective(pageSource)
         ? generateHydrationData(slug, {}, {}, {
             mode: "production",
             environment: "production",
+            config,
             projectDir,
             pagePath: pageFile,
             pageType: "tsx",
             releaseAssetManifest,
             isLocalProject: false,
             forceProductionScripts: true,
-            nestedLayouts: layouts.map((layoutPath) => ({ kind: "tsx", path: layoutPath })),
+            nestedLayouts: clientPageIsland?.clientLayouts ?? layoutDescriptors,
+            isolatedClientPage: Boolean(clientPageIsland),
         }, { pretty: false })
         : null;
     const hydrationDataScript = hydrationData

package/esm/src/server/build-routes.d.ts

@@ -3,9 +3,9 @@
  */
 import type { RuntimeAdapter } from "../platform/adapters/base.js";
 import type { AppRouteInfo, RouteInfo } from "./build-types.js";
-export declare function collectPagesRoutes(adapter: RuntimeAdapter, projectDir: string, include?: string[], exclude?: string[]): Promise<RouteInfo[]>;
+export declare function collectPagesRoutes(adapter: RuntimeAdapter, projectDir: string, include?: string[], exclude?: string[], pagesDirectory?: string): Promise<RouteInfo[]>;
 /**
  * Collect App Router literal routes (static analyzable)
  */
-export declare function collectAppRoutes(adapter: RuntimeAdapter, projectDir: string, include?: string[], exclude?: string[]): Promise<AppRouteInfo[]>;
+export declare function collectAppRoutes(adapter: RuntimeAdapter, projectDir: string, include?: string[], exclude?: string[], appDirectory?: string): Promise<AppRouteInfo[]>;
 //# sourceMappingURL=build-routes.d.ts.map

package/esm/src/server/build-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-routes.d.ts","sourceRoot":"","sources":["../../../src/src/server/build-routes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAsBhE,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC,CAsBtB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC,CAwBzB"}
+{"version":3,"file":"build-routes.d.ts","sourceRoot":"","sources":["../../../src/src/server/build-routes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAsBhE,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,cAAc,SAAU,GACvB,OAAO,CAAC,SAAS,EAAE,CAAC,CAuBtB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,YAAY,SAAQ,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBzB"}

package/esm/src/server/build-routes.js

@@ -6,12 +6,12 @@ import { isNotFoundError } from "../platform/compat/fs.js";
 import { join, relative } from "../platform/compat/path/index.js";
 import { discoverFiles } from "../utils/file-discovery.js";
 import { isDynamicSegment } from "../utils/route-path-utils.js";
-const PAGE_EXTENSIONS = [".mdx", ".md", ".tsx", ".jsx", ".ts"];
+const PAGE_EXTENSIONS = [".mdx", ".md", ".tsx", ".jsx", ".ts", ".js"];
 const PAGE_CANDIDATES = ["page.mdx", "page.md", "page.tsx", "page.jsx", "page.ts", "page.js"];
 function convertToSlug(relativePath) {
     return (relativePath
         .replace(/\\/g, "/")
-        .replace(/\.(mdx|md|tsx|jsx|ts)$/, "")
+        .replace(/\.(mdx|md|tsx|jsx|ts|js)$/, "")
         .replace(/\/index$/, "") || "index");
 }
 function shouldIncludeRoute(path, include, exclude) {
@@ -21,50 +21,44 @@ function shouldIncludeRoute(path, include, exclude) {
         return false;
     return true;
 }
-export async function collectPagesRoutes(adapter, projectDir, include, exclude) {
+export async function collectPagesRoutes(adapter, projectDir, include, exclude, pagesDirectory = "pages") {
     const routes = [];
+    const pagesDir = join(projectDir, pagesDirectory);
     try {
-        const pagesDir = join(projectDir, "pages");
         await adapter.fs.stat(pagesDir);
-        for await (const file of discoverFiles({ baseDir: pagesDir, extensions: PAGE_EXTENSIONS, adapter })) {
-            const relativePath = relative(pagesDir, file.path);
-            const slug = convertToSlug(relativePath);
-            const pathForRoute = `/${slug === "index" ? "" : slug}`;
-            if (!shouldIncludeRoute(pathForRoute, include, exclude))
-                continue;
-            routes.push({ path: pathForRoute, file: file.path, slug });
-        }
     }
-    catch (e) {
-        logger.debug("No pages directory found, continuing with empty routes", e);
+    catch (error) {
+        if (isNotFoundError(error))
+            return routes;
+        throw error;
+    }
+    for await (const file of discoverFiles({ baseDir: pagesDir, extensions: PAGE_EXTENSIONS, adapter })) {
+        const relativePath = relative(pagesDir, file.path);
+        const slug = convertToSlug(relativePath);
+        const pathForRoute = `/${slug === "index" ? "" : slug}`;
+        if (!shouldIncludeRoute(pathForRoute, include, exclude))
+            continue;
+        routes.push({ path: pathForRoute, file: file.path, slug });
     }
     return routes;
 }
 /**
  * Collect App Router literal routes (static analyzable)
  */
-export async function collectAppRoutes(adapter, projectDir, include, exclude) {
+export async function collectAppRoutes(adapter, projectDir, include, exclude, appDirectory = "app") {
+    const collected = [];
+    const appRoot = join(projectDir, appDirectory);
     try {
-        const collected = [];
-        const appRoot = join(projectDir, "app");
         await adapter.fs.stat(appRoot);
-        await walkAppSSG(adapter, appRoot, [], [appRoot], collected);
-        logger.debug(`Found ${collected.length} App Router static routes`);
-        return collected.filter((r) => shouldIncludeRoute(r.path, include, exclude));
     }
-    catch (e) {
-        // A missing app/ directory is the legitimately-expected empty case.
-        if (isNotFoundError(e)) {
-            logger.debug("No app directory found for SSG", e);
-            return [];
-        }
-        // Anything else (permission error, adapter failure, a bug thrown mid-traversal)
-        // must fail loudly so a broken SSG build doesn't silently emit zero routes.
-        logger.error("Failed to collect App Router routes for SSG", {
-            error: e instanceof Error ? e.message : String(e),
-        });
-        throw e;
+    catch (error) {
+        if (isNotFoundError(error))
+            return collected;
+        throw error;
     }
+    await walkAppSSG(adapter, appRoot, [], [appRoot], collected);
+    logger.debug(`Found ${collected.length} App Router static routes`);
+    return collected.filter((r) => shouldIncludeRoute(r.path, include, exclude));
 }
 function isForceDynamic(source) {
     // Regex-based heuristic: matches the common `export const dynamic = "force-dynamic"`
@@ -78,31 +72,28 @@ async function walkAppSSG(adapter, dir, segs, segDirs, collected) {
     if (isDynamicSegment(baseName))
         return;
     for (const filePath of PAGE_CANDIDATES.map((n) => join(dir, n))) {
+        let isFile = false;
         try {
-            const st = await adapter.fs.stat(filePath);
-            if (!st.isFile)
-                continue;
-            const src = (await adapter.fs.readFile(filePath).catch((error) => {
-                logger.warn("Failed to read route file for SSG analysis", {
-                    filePath,
-                    error: error instanceof Error ? error.message : String(error),
-                });
-                return "";
-            })) ?? "";
-            if (isForceDynamic(src))
-                break;
-            const path = `/${segs.join("/")}`;
-            collected.push({
-                path: path === "/" ? "/" : path,
-                pageFile: filePath,
-                segments: [...segs],
-                segmentDirs: [...segDirs],
-            });
-            break;
+            isFile = (await adapter.fs.stat(filePath)).isFile;
         }
-        catch (_) {
-            /* expected: file may not exist for this candidate */
+        catch (error) {
+            if (isNotFoundError(error))
+                continue;
+            throw error;
         }
+        if (!isFile)
+            continue;
+        const src = await adapter.fs.readFile(filePath);
+        if (isForceDynamic(src))
+            break;
+        const path = `/${segs.join("/")}`;
+        collected.push({
+            path: path === "/" ? "/" : path,
+            pageFile: filePath,
+            segments: [...segs],
+            segmentDirs: [...segDirs],
+        });
+        break;
     }
     for await (const entry of adapter.fs.readDir(dir)) {
         if (!entry.isDirectory)

package/esm/src/server/dev-server/request-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-handler.d.ts","sourceRoot":"","sources":["../../../../src/src/server/dev-server/request-handler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAY7D,qBAAa,cAAc;IAIvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB,CAAC;IAC3B,OAAO,CAAC,gBAAgB,CAAC;IACzB,OAAO,CAAC,aAAa,CAAC;IAVxB,OAAO,CAAC,cAAc,CAAC,CAAsC;gBAGnD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,OAAO,EACtB,OAAO,EAAE,MAAM,OAAO,EACtB,MAAM,CAAC,EAAE,eAAe,YAAA,EACxB,kBAAkB,CAAC,EAAE,MAAM,YAAA,EAC3B,gBAAgB,CAAC,EAAE,MAAM,YAAA,EACzB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAA;IAG1C,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IA0BpD,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,iBAAiB;YAiBX,uBAAuB;IASrC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,oBAAoB;YAYd,wBAAwB;IAiBtC,wBAAwB,IAAI,IAAI;IAehC,OAAO,CAAC,iBAAiB;CAqB1B"}
+{"version":3,"file":"request-handler.d.ts","sourceRoot":"","sources":["../../../../src/src/server/dev-server/request-handler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAa7D,qBAAa,cAAc;IAIvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB,CAAC;IAC3B,OAAO,CAAC,gBAAgB,CAAC;IACzB,OAAO,CAAC,aAAa,CAAC;IAVxB,OAAO,CAAC,cAAc,CAAC,CAAsC;gBAGnD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,OAAO,EACtB,OAAO,EAAE,MAAM,OAAO,EACtB,MAAM,CAAC,EAAE,eAAe,YAAA,EACxB,kBAAkB,CAAC,EAAE,MAAM,YAAA,EAC3B,gBAAgB,CAAC,EAAE,MAAM,YAAA,EACzB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAA;IAG1C,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IA0BpD,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,iBAAiB;YAiBX,uBAAuB;IASrC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,oBAAoB;YAYd,wBAAwB;IAiBtC,wBAAwB,IAAI,IAAI;IAgBhC,OAAO,CAAC,iBAAiB;CAqB1B"}

package/esm/src/server/dev-server/request-handler.js

@@ -7,6 +7,7 @@ import { clearLayoutDiscoveryCache } from "../../rendering/layouts/index.js";
 import { clearRendererCacheForProject } from "../../rendering/renderer.js";
 import { getErrorCollector } from "../../observability/error-collector.js";
 import { getLogBuffer } from "../../observability/log-buffer.js";
+import { invalidateRSCHandlersForProject } from "../services/rsc/endpoints/handler-registry.js";
 const logger = serverLogger.component("dev");
 export class RequestHandler {
     projectDir;
@@ -132,6 +133,7 @@ export class RequestHandler {
     }
     invalidateRuntimeHandler() {
         this.runtimeHandler = undefined;
+        invalidateRSCHandlersForProject(this.projectDir, this.defaultProjectId);
         resetApiHandler(this.projectDir).catch((error) => {
             logger.debug("resetApiHandler failed", error);
         });

package/esm/src/server/dev-server/route-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-discovery.d.ts","sourceRoot":"","sources":["../../../../src/src/server/dev-server/route-discovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AA4B7D,qBAAa,cAAc;IAIvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM,CAAC;IANjB,OAAO,CAAC,gBAAgB,CAAU;gBAGxB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,eAAe,YAAA;IAM5B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;YAoCvB,uBAAuB;YAmDvB,eAAe;YA6Bf,mBAAmB;YAsCnB,iBAAiB;YAIjB,0BAA0B;IA4BxC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"route-discovery.d.ts","sourceRoot":"","sources":["../../../../src/src/server/dev-server/route-discovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AA4B7D,qBAAa,cAAc;IAIvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM,CAAC;IANjB,OAAO,CAAC,gBAAgB,CAAU;gBAGxB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,eAAe,YAAA;IAM5B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;YAoCvB,uBAAuB;YA4DvB,eAAe;YA6Bf,mBAAmB;YAsCnB,iBAAiB;YAIjB,0BAA0B;IA4BxC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,qBAAqB;CAM9B"}

package/esm/src/server/dev-server/route-discovery.js

@@ -69,14 +69,16 @@ export class RouteDiscovery {
     }
     async resolveRouteDirectories() {
         const preferredRouter = this.config?.router;
+        const appDir = this.config?.directories?.app ?? "app";
+        const pagesDir = this.config?.directories?.pages ?? "pages";
         const results = [];
         const candidates = [];
         if (preferredRouter === "app")
-            candidates.push({ type: "app", dir: "app" });
+            candidates.push({ type: "app", dir: appDir });
         else if (preferredRouter === "pages")
-            candidates.push({ type: "pages", dir: "pages" });
+            candidates.push({ type: "pages", dir: pagesDir });
         else
-            candidates.push({ type: "app", dir: "app" }, { type: "pages", dir: "pages" });
+            candidates.push({ type: "app", dir: appDir }, { type: "pages", dir: pagesDir });
         const veryfrontDir = this.useRelativePaths ? ".veryfront" : join(this.projectDir, ".veryfront");
         if (await this.directoryExists(veryfrontDir)) {
             results.push({ type: "pages", path: veryfrontDir });
@@ -91,23 +93,26 @@ export class RouteDiscovery {
         }
         if (results.length === 0) {
             if (preferredRouter === "app") {
-                const pagesFallback = this.useRelativePaths ? "pages" : join(this.projectDir, "pages");
+                const pagesFallback = this.useRelativePaths ? pagesDir : join(this.projectDir, pagesDir);
                 if (await this.directoryExists(pagesFallback)) {
-                    logger.warn('router="app" but app/ directory missing; falling back to pages/');
+                    logger.warn(`router="app" but ${appDir}/ directory missing; falling back to ${pagesDir}/`);
                     results.push({ type: "pages", path: pagesFallback });
                 }
             }
             else if (preferredRouter === "pages") {
-                const appFallback = this.useRelativePaths ? "app" : join(this.projectDir, "app");
+                const appFallback = this.useRelativePaths ? appDir : join(this.projectDir, appDir);
                 if (await this.directoryExists(appFallback)) {
-                    logger.warn('router="pages" but pages/ directory missing; using app/');
+                    logger.warn(`router="pages" but ${pagesDir}/ directory missing; using ${appDir}/`);
                     results.push({ type: "app", path: appFallback });
                 }
             }
             else {
                 const fallbackDirs = [
-                    { type: "app", path: this.useRelativePaths ? "app" : join(this.projectDir, "app") },
-                    { type: "pages", path: this.useRelativePaths ? "pages" : join(this.projectDir, "pages") },
+                    { type: "app", path: this.useRelativePaths ? appDir : join(this.projectDir, appDir) },
+                    {
+                        type: "pages",
+                        path: this.useRelativePaths ? pagesDir : join(this.projectDir, pagesDir),
+                    },
                 ];
                 for (const fallback of fallbackDirs) {
                     if (await this.directoryExists(fallback.path))
@@ -147,7 +152,7 @@ export class RouteDiscovery {
                 if (shouldSkipEntry(entry.name, dir))
                     continue;
                 const fullPath = join(dir, entry.name);
-                const routePath = `${prefix}/${entry.name.replace(/\.(tsx?|jsx?|mdx)$/, "")}`.replace(/\/+/g, "/");
+                const routePath = `${prefix}/${entry.name.replace(/\.(tsx?|jsx?|mdx?)$/, "")}`.replace(/\/+/g, "/");
                 if (routePath.length > 500) {
                     logger.warn(`Route path too long, skipping: ${routePath.slice(0, 100)}...`);
                     continue;
@@ -156,7 +161,7 @@ export class RouteDiscovery {
                     await this.discoverPagesRoutes(fullPath, routePath);
                     continue;
                 }
-                if (!entry.isFile || !/\.(tsx?|jsx?|mdx|ts)$/.test(entry.name))
+                if (!entry.isFile || !/\.(tsx?|jsx?|mdx?)$/.test(entry.name))
                     continue;
                 if (routePath.startsWith("/api"))
                     continue;

package/esm/src/server/handlers/dev/files/esbuild-plugins.d.ts

@@ -1,8 +1,13 @@
 import type { Plugin } from "../../../../extensions/bundler/index.js";
 import type { RuntimeAdapter } from "../../../../platform/adapters/base.js";
 import { type LockfileManager } from "../../../../utils/import-lockfile.js";
+export interface RelativeFsPluginOptions {
+    enforceBrowserBoundaries?: boolean;
+}
+export type BrowserModulePathStatus = "trusted" | "symlink" | "unavailable";
+export declare function inspectBrowserModulePath(projectDir: string, filePath: string, adapter: RuntimeAdapter): Promise<BrowserModulePathStatus>;
 /** Create relative file system plugin for resolving imports via adapter's fs */
-export declare function createRelativeFsPlugin(projectDir: string, adapter: RuntimeAdapter): Plugin;
+export declare function createRelativeFsPlugin(projectDir: string, adapter: RuntimeAdapter, options?: RelativeFsPluginOptions): Plugin;
 interface BareExternalPluginOptions {
     bundle?: boolean;
     lockfile?: LockfileManager;

package/esm/src/server/handlers/dev/files/esbuild-plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugins.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/dev/files/esbuild-plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6B,MAAM,EAAe,MAAM,yCAAyC,CAAC;AAG9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,sCAAsC,CAAC;AAkB9C,gFAAgF;AAChF,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAyF1F;AAKD,UAAU,yBAAyB;IACjC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AA+DD,kFAAkF;AAClF,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,yBAAyB,GAAG,OAAe,GACnD,MAAM,CAqER;AAED,wBAAgB,wBAAwB,IAAI,MAAM,CAUjD"}
+{"version":3,"file":"esbuild-plugins.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/dev/files/esbuild-plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6B,MAAM,EAAe,MAAM,yCAAyC,CAAC;AAG9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,sCAAsC,CAAC;AAgC9C,MAAM,WAAW,uBAAuB;IACtC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AASD,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,SAAS,GAAG,aAAa,CAAC;AAE5E,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,uBAAuB,CAAC,CAmClC;AAoBD,gFAAgF;AAChF,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE,uBAA4B,GACpC,MAAM,CAiKR;AAKD,UAAU,yBAAyB;IACjC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AA+DD,kFAAkF;AAClF,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,yBAAyB,GAAG,OAAe,GACnD,MAAM,CAqER;AAED,wBAAgB,wBAAwB,IAAI,MAAM,CAUjD"}