@vistagenic/vista 0.3.2 → 0.3.4

package/dist/deploy/utils.d.ts

@@ -1,5 +1,5 @@
 export declare function ensureDir(absolutePath: string): void;
-export declare function copyDirectoryRecursive(sourceDir: string, targetDir: string): void;
+export declare function copyDirectoryRecursive(sourceDir: string, targetDir: string, seen?: Set<string>): void;
 export declare function copyFileIfPresent(sourceFile: string, targetFile: string): void;
 export declare function writeFileIfAllowed(targetFile: string, content: string, force: boolean): {
     written: boolean;
@@ -15,4 +15,10 @@ export declare const STATIC_HOST_ROUTE_RULES: ({
     dest: string;
     handle?: undefined;
 })[];
+/** Lift `.vista/static/pages/*.html` to pretty CDN paths (`docs/foo/index.html`). */
+export declare function flattenPrerenderedPages(pagesDir: string, targetDir: string): void;
+/** Serve Flight files at `/rsc/*.rsc` (extension avoids file/directory collisions). */
+export declare function flattenPrerenderedFlight(pagesDir: string, targetDir: string): void;
+/** Copy webpack assets to `/_vista/static` and flatten HTML + Flight for file-based CDNs. */
+export declare function prepareStaticCdnOutput(targetDir: string): void;
 export declare function copyStaticHostAssets(cwd: string, vistaDir: string, targetDir: string): void;

package/dist/deploy/utils.js

@@ -9,22 +9,54 @@ exports.copyDirectoryRecursive = copyDirectoryRecursive;
 exports.copyFileIfPresent = copyFileIfPresent;
 exports.writeFileIfAllowed = writeFileIfAllowed;
 exports.readJsonSafe = readJsonSafe;
+exports.flattenPrerenderedPages = flattenPrerenderedPages;
+exports.flattenPrerenderedFlight = flattenPrerenderedFlight;
+exports.prepareStaticCdnOutput = prepareStaticCdnOutput;
 exports.copyStaticHostAssets = copyStaticHostAssets;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 function ensureDir(absolutePath) {
     fs_1.default.mkdirSync(absolutePath, { recursive: true });
 }
-function copyDirectoryRecursive(sourceDir, targetDir) {
+const SKIP_COPY_DIRECTORY_NAMES = new Set(['.cache', '.turbo', '.vite', 'coverage']);
+function copyDirectoryRecursive(sourceDir, targetDir, seen = new Set()) {
     if (!fs_1.default.existsSync(sourceDir))
         return;
+    let realSource = sourceDir;
+    try {
+        realSource = fs_1.default.realpathSync(sourceDir);
+    }
+    catch {
+        return;
+    }
+    if (seen.has(realSource))
+        return;
+    seen.add(realSource);
     ensureDir(targetDir);
     const entries = fs_1.default.readdirSync(sourceDir, { withFileTypes: true });
     for (const entry of entries) {
+        if (SKIP_COPY_DIRECTORY_NAMES.has(entry.name))
+            continue;
         const from = path_1.default.join(sourceDir, entry.name);
         const to = path_1.default.join(targetDir, entry.name);
+        if (entry.isSymbolicLink()) {
+            try {
+                const targetStat = fs_1.default.statSync(from);
+                if (targetStat.isDirectory()) {
+                    copyDirectoryRecursive(from, to, seen);
+                }
+                else if (targetStat.isFile()) {
+                    ensureDir(path_1.default.dirname(to));
+                    fs_1.default.copyFileSync(from, to);
+                }
+            }
+            catch {
+                // dangling symlink
+            }
+            continue;
+        }
         if (entry.isDirectory()) {
-            copyDirectoryRecursive(from, to);
+            copyDirectoryRecursive(from, to, seen);
         }
         else if (entry.isFile()) {
             fs_1.default.copyFileSync(from, to);
@@ -55,15 +87,75 @@ function readJsonSafe(absolutePath) {
 }
 exports.STATIC_HOST_ROUTE_RULES = [
     { handle: 'filesystem' },
-    { src: '^/_vista/(.*)$', dest: '/$1' },
+    { src: '^/_vista/static/(.*)$', dest: '/static/$1' },
     { src: '^/(?:rsc|_rsc)/?$', dest: '/static/pages/index.rsc' },
     { src: '^/(?:rsc|_rsc)/(.+)$', dest: '/static/pages/$1.rsc' },
     { src: '^/$', dest: '/static/pages/index.html' },
     { src: '^/(.+)$', dest: '/static/pages/$1.html' },
 ];
+function walkFiles(dir, visitor, prefix = '') {
+    if (!fs_1.default.existsSync(dir))
+        return;
+    const entries = fs_1.default.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
+        const absolutePath = path_1.default.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            walkFiles(absolutePath, visitor, relativePath);
+        }
+        else if (entry.isFile()) {
+            visitor(absolutePath, relativePath);
+        }
+    }
+}
+/** Lift `.vista/static/pages/*.html` to pretty CDN paths (`docs/foo/index.html`). */
+function flattenPrerenderedPages(pagesDir, targetDir) {
+    walkFiles(pagesDir, (absolutePath, relativePath) => {
+        const posix = relativePath.replace(/\\/g, '/');
+        if (!posix.endsWith('.html') || posix.endsWith('.shell.html'))
+            return;
+        const destRel = posix === 'index.html' || posix.endsWith('/index.html')
+            ? posix
+            : posix.replace(/\.html$/, '/index.html');
+        const dest = path_1.default.join(targetDir, destRel.split('/').join(path_1.default.sep));
+        ensureDir(path_1.default.dirname(dest));
+        fs_1.default.copyFileSync(absolutePath, dest);
+    });
+}
+/** Serve Flight files at `/rsc/*.rsc` (extension avoids file/directory collisions). */
+function flattenPrerenderedFlight(pagesDir, targetDir) {
+    walkFiles(pagesDir, (absolutePath, relativePath) => {
+        const posix = relativePath.replace(/\\/g, '/');
+        if (!posix.endsWith('.rsc'))
+            return;
+        const destRel = `rsc/${posix}`;
+        const dest = path_1.default.join(targetDir, destRel.split('/').join(path_1.default.sep));
+        ensureDir(path_1.default.dirname(dest));
+        fs_1.default.copyFileSync(absolutePath, dest);
+    });
+}
+function writeStaticRscRedirects(targetDir) {
+    const redirectsPath = path_1.default.join(targetDir, '_redirects');
+    const lines = [
+        '/rsc /rsc/index.rsc 200',
+        '/rsc/ /rsc/index.rsc 200',
+        '/rsc/*.rsc /rsc/:splat.rsc 200',
+        '/rsc/* /rsc/:splat.rsc 200',
+    ];
+    fs_1.default.writeFileSync(redirectsPath, `${lines.join('\n')}\n`, 'utf8');
+}
+/** Copy webpack assets to `/_vista/static` and flatten HTML + Flight for file-based CDNs. */
+function prepareStaticCdnOutput(targetDir) {
+    const staticDir = path_1.default.join(targetDir, 'static');
+    copyDirectoryRecursive(staticDir, path_1.default.join(targetDir, '_vista', 'static'));
+    flattenPrerenderedPages(path_1.default.join(staticDir, 'pages'), targetDir);
+    flattenPrerenderedFlight(path_1.default.join(staticDir, 'pages'), targetDir);
+    writeStaticRscRedirects(targetDir);
+}
 function copyStaticHostAssets(cwd, vistaDir, targetDir) {
     copyDirectoryRecursive(path_1.default.join(cwd, 'public'), targetDir);
     copyDirectoryRecursive(path_1.default.join(vistaDir, 'static'), path_1.default.join(targetDir, 'static'));
+    copyDirectoryRecursive(path_1.default.join(vistaDir, 'static'), path_1.default.join(targetDir, '_vista', 'static'));
     const clientCssPath = path_1.default.join(vistaDir, 'client.css');
     copyFileIfPresent(clientCssPath, path_1.default.join(targetDir, 'client.css'));
     copyFileIfPresent(clientCssPath, path_1.default.join(targetDir, 'styles.css'));

package/dist/flashpack/command.js

@@ -28,6 +28,7 @@ async function fallbackToCore(phase, port) {
     process.env.VISTA_ENGINE_VARIANT = 'flashpack';
     process.env.VISTA_FLASHPACK = 'true';
     process.env.VISTA_FLASHPACK_PIPELINE = 'js-fallback';
+    console.warn(`[flashpack] Using explicit webpack Flight SSR fallback for ${phase} (same inline-Flight contract; not renderToString).`);
     if (phase === 'build') {
         await (0, build_rsc_1.buildRSC)(false);
         return;

package/dist/flashpack/runtime.js

@@ -13,6 +13,7 @@ const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const constants_1 = require("../constants");
 const native_scanner_1 = require("../build/rsc/native-scanner");
+const app_dir_1 = require("../server/app-dir");
 function ensureDir(absolutePath) {
     fs_1.default.mkdirSync(absolutePath, { recursive: true });
 }
@@ -191,7 +192,7 @@ function prepareFlashpackRuntime(options) {
         generatedBy: 'vista-ts-bootstrap',
         timestamp: now,
     });
-    const appDir = path_1.default.join(cwd, 'app');
+    const appDir = (0, app_dir_1.resolveAppDir)(cwd);
     if ((0, native_scanner_1.isNativeAvailable)() && fs_1.default.existsSync(appDir)) {
         const nativeScan = (0, native_scanner_1.scanAppNative)(appDir);
         if (nativeScan) {

package/dist/image/get-img-props.js

@@ -3,22 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getImgProps = getImgProps;
 const image_config_1 = require("./image-config");
 // Helper: Generate srcSet
-function generateSrcSet(src, width, loader, config, unoptimized) {
+function generateSrcSet(src, _width, loader, config, unoptimized, quality) {
     if (unoptimized)
         return undefined;
     const { deviceSizes, imageSizes } = config;
     const sizes = [...deviceSizes, ...imageSizes].sort((a, b) => a - b);
-    // If width is known, only generate sizes up to that width (plus maybe 2x/3x for density)
-    // For simplicity MVP, we'll generate device sizes.
     return sizes
         .map((size) => {
-        const url = loader({ src, width: size });
+        const url = loader({ src, width: size, quality });
         return `${url} ${size}w`;
     })
         .join(', ');
 }
 function getImgProps(props, config = image_config_1.imageConfigDefault, defaultLoader) {
-    const { src, alt, width, height, fill, loader = defaultLoader, quality, priority, unoptimized, style, sizes, className, loading, placeholder, blurDataURL, onLoadingComplete, ...rest } = props;
+    const { src, alt, width, height, fill, loader = defaultLoader, quality, priority, unoptimized, style, sizes, className, loading, placeholder: _placeholder, blurDataURL: _blurDataURL, onLoadingComplete: _onLoadingComplete, ...rest } = props;
     const imgStyle = { ...style };
     // Handle Fill Mode
     if (fill) {
@@ -29,15 +27,27 @@ function getImgProps(props, config = image_config_1.imageConfigDefault, defaultL
         imgStyle.objectFit = 'cover'; // Default to cover for bg images
     }
     // Handle Dimensions
-    let widthInt = width ? Number(width) : undefined;
-    let heightInt = height ? Number(height) : undefined;
+    const widthInt = width ? Number(width) : undefined;
+    const heightInt = height ? Number(height) : undefined;
     const vercelStaticBuild = typeof window === 'undefined' &&
         (process.env.VERCEL === '1' || typeof process.env.VERCEL_URL === 'string');
-    // Disable optimizer when explicitly requested, configured globally,
-    // or when building for Vercel static output (no /_vista/image endpoint).
-    const disableOptimization = !!unoptimized || !!config.unoptimized || vercelStaticBuild;
+    const srcPath = String(src || '')
+        .split('?')[0]
+        .toLowerCase();
+    const passthroughSrc = srcPath.startsWith('data:') ||
+        srcPath.startsWith('blob:') ||
+        srcPath.endsWith('.svg') ||
+        srcPath.endsWith('.gif') ||
+        srcPath.endsWith('.ico');
+    const staticHost = process.env.VISTA_DEPLOY_OUTPUT === 'static' ||
+        process.env.VISTA_IMAGES_UNOPTIMIZED === '1' ||
+        process.env.CF_PAGES === '1' ||
+        process.env.NETLIFY === 'true';
+    // Skip /_vista/image when the optimizer is unavailable (static CDN hosts)
+    // or the format cannot be resized (SVG/GIF/ICO).
+    const disableOptimization = !!unoptimized || !!config.unoptimized || passthroughSrc || staticHost || vercelStaticBuild;
     // Generate SrcSet
-    const srcSet = generateSrcSet(src, widthInt, loader, config, disableOptimization);
+    const srcSet = generateSrcSet(src, widthInt, loader, config, disableOptimization, quality ? Number(quality) : undefined);
     return {
         ...rest,
         src,

package/dist/image/image-config.d.ts

@@ -14,6 +14,8 @@ export declare const imageConfigDefault: {
     remotePatterns: any[];
     unoptimized: boolean;
 };
+/** Merge defaults with build-time env (`VISTA_IMAGES_UNOPTIMIZED`, static deploy). */
+export declare function resolveRuntimeImageConfig(overrides?: ImageConfig): ImageConfigComplete;
 export type ImageConfigComplete = typeof imageConfigDefault;
 export type ImageConfig = Partial<ImageConfigComplete>;
 export declare const VALID_LOADERS: readonly ["default", "imgix", "cloudinary", "akamai", "custom"];

package/dist/image/image-config.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VALID_LOADERS = exports.imageConfigDefault = void 0;
+exports.resolveRuntimeImageConfig = resolveRuntimeImageConfig;
 const constants_1 = require("../constants");
 exports.imageConfigDefault = {
     deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -18,4 +19,20 @@ exports.imageConfigDefault = {
     remotePatterns: [],
     unoptimized: false,
 };
+function envDisablesImageOptimization() {
+    return (process.env.VISTA_IMAGES_UNOPTIMIZED === '1' ||
+        process.env.VISTA_DEPLOY_OUTPUT === 'static' ||
+        process.env.CF_PAGES === '1' ||
+        process.env.NETLIFY === 'true');
+}
+/** Merge defaults with build-time env (`VISTA_IMAGES_UNOPTIMIZED`, static deploy). */
+function resolveRuntimeImageConfig(overrides) {
+    return {
+        ...exports.imageConfigDefault,
+        ...overrides,
+        unoptimized: overrides?.unoptimized === true ||
+            exports.imageConfigDefault.unoptimized ||
+            envDisablesImageOptimization(),
+    };
+}
 exports.VALID_LOADERS = ['default', 'imgix', 'cloudinary', 'akamai', 'custom'];

package/dist/image/index.d.ts

@@ -1,6 +1,21 @@
 import React from 'react';
 import { ImageProps } from './get-img-props';
-export interface EnhancedImageProps extends ImageProps {
-}
-export declare const Image: React.ForwardRefExoticComponent<EnhancedImageProps & React.RefAttributes<HTMLImageElement>>;
+export type EnhancedImageProps = ImageProps;
+export declare const Image: React.ForwardRefExoticComponent<React.ImgHTMLAttributes<HTMLImageElement> & {
+    src: string;
+    alt: string;
+    width?: number | string;
+    height?: number | string;
+    fill?: boolean;
+    loader?: import("./image-loader").ImageLoader;
+    quality?: number | string;
+    priority?: boolean;
+    unoptimized?: boolean;
+    placeholder?: import("./get-img-props").PlaceholderValue;
+    blurDataURL?: string;
+    onLoadingComplete?: (result: {
+        naturalWidth: number;
+        naturalHeight: number;
+    }) => void;
+} & React.RefAttributes<HTMLImageElement>>;
 export default Image;

package/dist/image/index.js

@@ -61,7 +61,7 @@ exports.Image = (0, react_1.forwardRef)((props, ref) => {
         }
     }, [onError, useDirectSrc]);
     // Get processed img props
-    const imgProps = (0, get_img_props_1.getImgProps)({ ...restProps, priority, unoptimized: useDirectSrc || restProps.unoptimized }, image_config_1.imageConfigDefault, image_loader_1.defaultLoader);
+    const imgProps = (0, get_img_props_1.getImgProps)({ ...restProps, priority, unoptimized: useDirectSrc || restProps.unoptimized }, (0, image_config_1.resolveRuntimeImageConfig)(), image_loader_1.defaultLoader);
     const fallbackSrc = String(restProps.src || '');
     const effectiveSrc = useDirectSrc ? fallbackSrc : imgProps.src;
     const effectiveSrcSet = useDirectSrc ? undefined : imgProps.srcSet;

package/dist/image/react-server.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { type ImageProps } from './get-img-props';
-export interface EnhancedImageProps extends ImageProps {
-}
+export type EnhancedImageProps = ImageProps;
 /**
  * React-server safe Image component.
  *

package/dist/image/react-server.js

@@ -12,7 +12,7 @@ const image_loader_1 = require("./image-loader");
  * react-server condition uses a plain SSR-friendly <img> wrapper.
  */
 function Image(props) {
-    const imgProps = (0, get_img_props_1.getImgProps)(props, image_config_1.imageConfigDefault, image_loader_1.defaultLoader);
+    const imgProps = (0, get_img_props_1.getImgProps)(props, (0, image_config_1.resolveRuntimeImageConfig)(), image_loader_1.defaultLoader);
     return ((0, jsx_runtime_1.jsx)("img", { ...imgProps, decoding: props.priority ? 'sync' : 'async', fetchPriority: props.priority ? 'high' : undefined }));
 }
 exports.default = Image;

package/dist/index.d.ts

@@ -1,23 +1,23 @@
-export * from './router';
-export * from './components';
-export * from './types';
-export * from './dev-error';
-export { useRouter } from './client/router';
-export { usePathname, useSearchParams, useParams, useSelectedLayoutSegment, useSelectedLayoutSegments, } from './client/navigation';
-export { default as dynamic } from './client/dynamic';
-export { default as Script } from './client/script';
-export { default as Head, generateMetadataHead } from './client/head';
-export type { Metadata as HeadMetadata } from './client/head';
-export * from './font/index';
-export * from './metadata';
-export type { Metadata } from './metadata/types';
-export { hydrateClientComponents, initializeHydration } from './client/hydration';
-export { Client } from './components/client';
-export { RSCRouter, RSCRouterContext, useRSCRouter } from './client/rsc-router';
-export type { RSCRouterProps, RSCNavigationState, NavigationOptions } from './client/rsc-router';
-export { callServer } from './client/server-actions';
-export type { ClientManifest, ClientComponentEntry } from './build/rsc/client-manifest';
-export type { ServerManifest, ServerComponentEntry, RouteEntry } from './build/rsc/server-manifest';
-export { NextResponse } from './server/index';
-export type { VistaMiddlewareContext, VistaMiddlewareRequest, MiddlewareResult, MiddlewareConfig, MiddlewareFunction, NextFunction, } from './server/index';
-export * from './ai';
+export * from './router';
+export * from './components';
+export * from './types';
+export * from './dev-error';
+export { useRouter } from './client/router';
+export { usePathname, useSearchParams, useParams, useSelectedLayoutSegment, useSelectedLayoutSegments, } from './client/navigation';
+export { default as dynamic } from './client/dynamic';
+export { default as Script } from './client/script';
+export { default as Head, generateMetadataHead } from './client/head';
+export type { Metadata as HeadMetadata } from './client/head';
+export * from './font/index';
+export * from './metadata';
+export type { Metadata } from './metadata/types';
+export { hydrateClientComponents, initializeHydration } from './client/hydration';
+export { Client } from './components/client';
+export { RSCRouter, RSCRouterContext, useRSCRouter } from './client/rsc-router';
+export type { RSCRouterProps, RSCNavigationState, NavigationOptions } from './client/rsc-router';
+export { callServer } from './client/server-actions';
+export type { ClientManifest, ClientComponentEntry } from './build/rsc/client-manifest';
+export type { ServerManifest, ServerComponentEntry, RouteEntry } from './build/rsc/server-manifest';
+export { NextResponse } from './server/index';
+export type { VistaMiddlewareContext, VistaMiddlewareRequest, MiddlewareResult, MiddlewareConfig, MiddlewareFunction, NextFunction, } from './server/index';
+export * from './ai';

package/dist/index.js

@@ -1,61 +1,61 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NextResponse = exports.callServer = exports.useRSCRouter = exports.RSCRouterContext = exports.RSCRouter = exports.Client = exports.initializeHydration = exports.hydrateClientComponents = exports.generateMetadataHead = exports.Head = exports.Script = exports.dynamic = exports.useSelectedLayoutSegments = exports.useSelectedLayoutSegment = exports.useParams = exports.useSearchParams = exports.usePathname = exports.useRouter = void 0;
-__exportStar(require("./router"), exports);
-__exportStar(require("./components"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./dev-error"), exports);
-// Client-side features
-var router_1 = require("./client/router");
-Object.defineProperty(exports, "useRouter", { enumerable: true, get: function () { return router_1.useRouter; } });
-var navigation_1 = require("./client/navigation");
-Object.defineProperty(exports, "usePathname", { enumerable: true, get: function () { return navigation_1.usePathname; } });
-Object.defineProperty(exports, "useSearchParams", { enumerable: true, get: function () { return navigation_1.useSearchParams; } });
-Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return navigation_1.useParams; } });
-Object.defineProperty(exports, "useSelectedLayoutSegment", { enumerable: true, get: function () { return navigation_1.useSelectedLayoutSegment; } });
-Object.defineProperty(exports, "useSelectedLayoutSegments", { enumerable: true, get: function () { return navigation_1.useSelectedLayoutSegments; } });
-var dynamic_1 = require("./client/dynamic");
-Object.defineProperty(exports, "dynamic", { enumerable: true, get: function () { return __importDefault(dynamic_1).default; } });
-var script_1 = require("./client/script");
-Object.defineProperty(exports, "Script", { enumerable: true, get: function () { return __importDefault(script_1).default; } });
-var head_1 = require("./client/head");
-Object.defineProperty(exports, "Head", { enumerable: true, get: function () { return __importDefault(head_1).default; } });
-Object.defineProperty(exports, "generateMetadataHead", { enumerable: true, get: function () { return head_1.generateMetadataHead; } });
-// Font exports
-__exportStar(require("./font/index"), exports);
-// Metadata exports (Next.js compatible)
-__exportStar(require("./metadata"), exports);
-// RSC (React Server Components) exports
-var hydration_1 = require("./client/hydration");
-Object.defineProperty(exports, "hydrateClientComponents", { enumerable: true, get: function () { return hydration_1.hydrateClientComponents; } });
-Object.defineProperty(exports, "initializeHydration", { enumerable: true, get: function () { return hydration_1.initializeHydration; } });
-var client_1 = require("./components/client");
-Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return client_1.Client; } });
-var rsc_router_1 = require("./client/rsc-router");
-Object.defineProperty(exports, "RSCRouter", { enumerable: true, get: function () { return rsc_router_1.RSCRouter; } });
-Object.defineProperty(exports, "RSCRouterContext", { enumerable: true, get: function () { return rsc_router_1.RSCRouterContext; } });
-Object.defineProperty(exports, "useRSCRouter", { enumerable: true, get: function () { return rsc_router_1.useRSCRouter; } });
-var server_actions_1 = require("./client/server-actions");
-Object.defineProperty(exports, "callServer", { enumerable: true, get: function () { return server_actions_1.callServer; } });
-// Server & Middleware exports
-var index_1 = require("./server/index");
-Object.defineProperty(exports, "NextResponse", { enumerable: true, get: function () { return index_1.NextResponse; } });
-// AI Framework
-__exportStar(require("./ai"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NextResponse = exports.callServer = exports.useRSCRouter = exports.RSCRouterContext = exports.RSCRouter = exports.Client = exports.initializeHydration = exports.hydrateClientComponents = exports.generateMetadataHead = exports.Head = exports.Script = exports.dynamic = exports.useSelectedLayoutSegments = exports.useSelectedLayoutSegment = exports.useParams = exports.useSearchParams = exports.usePathname = exports.useRouter = void 0;
+__exportStar(require("./router"), exports);
+__exportStar(require("./components"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./dev-error"), exports);
+// Client-side features
+var router_1 = require("./client/router");
+Object.defineProperty(exports, "useRouter", { enumerable: true, get: function () { return router_1.useRouter; } });
+var navigation_1 = require("./client/navigation");
+Object.defineProperty(exports, "usePathname", { enumerable: true, get: function () { return navigation_1.usePathname; } });
+Object.defineProperty(exports, "useSearchParams", { enumerable: true, get: function () { return navigation_1.useSearchParams; } });
+Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return navigation_1.useParams; } });
+Object.defineProperty(exports, "useSelectedLayoutSegment", { enumerable: true, get: function () { return navigation_1.useSelectedLayoutSegment; } });
+Object.defineProperty(exports, "useSelectedLayoutSegments", { enumerable: true, get: function () { return navigation_1.useSelectedLayoutSegments; } });
+var dynamic_1 = require("./client/dynamic");
+Object.defineProperty(exports, "dynamic", { enumerable: true, get: function () { return __importDefault(dynamic_1).default; } });
+var script_1 = require("./client/script");
+Object.defineProperty(exports, "Script", { enumerable: true, get: function () { return __importDefault(script_1).default; } });
+var head_1 = require("./client/head");
+Object.defineProperty(exports, "Head", { enumerable: true, get: function () { return __importDefault(head_1).default; } });
+Object.defineProperty(exports, "generateMetadataHead", { enumerable: true, get: function () { return head_1.generateMetadataHead; } });
+// Font exports
+__exportStar(require("./font/index"), exports);
+// Metadata exports (Next.js compatible)
+__exportStar(require("./metadata"), exports);
+// RSC (React Server Components) exports
+var hydration_1 = require("./client/hydration");
+Object.defineProperty(exports, "hydrateClientComponents", { enumerable: true, get: function () { return hydration_1.hydrateClientComponents; } });
+Object.defineProperty(exports, "initializeHydration", { enumerable: true, get: function () { return hydration_1.initializeHydration; } });
+var client_1 = require("./components/client");
+Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return client_1.Client; } });
+var rsc_router_1 = require("./client/rsc-router");
+Object.defineProperty(exports, "RSCRouter", { enumerable: true, get: function () { return rsc_router_1.RSCRouter; } });
+Object.defineProperty(exports, "RSCRouterContext", { enumerable: true, get: function () { return rsc_router_1.RSCRouterContext; } });
+Object.defineProperty(exports, "useRSCRouter", { enumerable: true, get: function () { return rsc_router_1.useRSCRouter; } });
+var server_actions_1 = require("./client/server-actions");
+Object.defineProperty(exports, "callServer", { enumerable: true, get: function () { return server_actions_1.callServer; } });
+// Server & Middleware exports
+var index_1 = require("./server/index");
+Object.defineProperty(exports, "NextResponse", { enumerable: true, get: function () { return index_1.NextResponse; } });
+// AI Framework
+__exportStar(require("./ai"), exports);

package/dist/server/app-dir.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Resolve the App Router source directory.
+ *
+ * Supports both layouts (Next-compatible):
+ * - `<cwd>/app`
+ * - `<cwd>/src/app`
+ *
+ * Preference when both exist: root `app/` (matches existing middleware discovery).
+ * When neither exists, returns `<cwd>/app` so callers can emit a clear missing-app error.
+ */
+export declare function resolveAppDir(cwd: string): string;
+/** Like resolveAppDir, but returns null when no app directory exists yet. */
+export declare function resolveAppDirOrNull(cwd: string): string | null;
+/**
+ * True when the resolved app dir lives under `src/` (i.e. `src/app`).
+ */
+export declare function isSrcAppLayout(cwd: string, appDir?: string): boolean;
+/**
+ * Shared UI directory paired with the app layout.
+ * Prefers `src/components` for `src/app` projects, otherwise root `components/`.
+ */
+export declare function resolveComponentsDir(cwd: string): string;

package/dist/server/app-dir.js

@@ -0,0 +1,77 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAppDir = resolveAppDir;
+exports.resolveAppDirOrNull = resolveAppDirOrNull;
+exports.isSrcAppLayout = isSrcAppLayout;
+exports.resolveComponentsDir = resolveComponentsDir;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+/**
+ * Resolve the App Router source directory.
+ *
+ * Supports both layouts (Next-compatible):
+ * - `<cwd>/app`
+ * - `<cwd>/src/app`
+ *
+ * Preference when both exist: root `app/` (matches existing middleware discovery).
+ * When neither exists, returns `<cwd>/app` so callers can emit a clear missing-app error.
+ */
+function resolveAppDir(cwd) {
+    const rootApp = path_1.default.join(cwd, 'app');
+    const srcApp = path_1.default.join(cwd, 'src', 'app');
+    if (isDirectory(rootApp))
+        return rootApp;
+    if (isDirectory(srcApp))
+        return srcApp;
+    return rootApp;
+}
+/** Like resolveAppDir, but returns null when no app directory exists yet. */
+function resolveAppDirOrNull(cwd) {
+    const rootApp = path_1.default.join(cwd, 'app');
+    const srcApp = path_1.default.join(cwd, 'src', 'app');
+    if (isDirectory(rootApp))
+        return rootApp;
+    if (isDirectory(srcApp))
+        return srcApp;
+    return null;
+}
+/**
+ * True when the resolved app dir lives under `src/` (i.e. `src/app`).
+ */
+function isSrcAppLayout(cwd, appDir = resolveAppDir(cwd)) {
+    const relative = path_1.default.relative(cwd, appDir).replace(/\\/g, '/');
+    return relative === 'src/app' || relative.startsWith('src/app/');
+}
+/**
+ * Shared UI directory paired with the app layout.
+ * Prefers `src/components` for `src/app` projects, otherwise root `components/`.
+ */
+function resolveComponentsDir(cwd) {
+    const appDir = resolveAppDirOrNull(cwd);
+    const preferSrc = appDir ? isSrcAppLayout(cwd, appDir) : false;
+    const srcComponents = path_1.default.join(cwd, 'src', 'components');
+    const rootComponents = path_1.default.join(cwd, 'components');
+    if (preferSrc) {
+        if (isDirectory(srcComponents))
+            return srcComponents;
+        if (isDirectory(rootComponents))
+            return rootComponents;
+        return srcComponents;
+    }
+    if (isDirectory(rootComponents))
+        return rootComponents;
+    if (isDirectory(srcComponents))
+        return srcComponents;
+    return rootComponents;
+}
+function isDirectory(absolutePath) {
+    try {
+        return fs_1.default.existsSync(absolutePath) && fs_1.default.statSync(absolutePath).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}

package/dist/server/app-router-runtime.d.ts

@@ -21,6 +21,7 @@ export declare function resolveParallelSlotMatches(input: {
     layoutPath: string;
     pathname: string;
 }): ParallelSlotMatch[];
+export declare function isPathInside(parent: string, child: string): boolean;
 export declare function resolveDirectoryChain(rootDir: string, entryFilePath: string): string[];
 export declare function resolveNearestSegmentNotFoundPath(appDir: string, startDir: string): string | null;
 export {};