astro 4.14.2 → 5.0.0-alpha.0

package/astro-jsx.d.ts

@@ -17,23 +17,21 @@ declare namespace astroHTML.JSX {
 		children: {};
 	}
 
-	interface IntrinsicAttributes
-		extends AstroBuiltinProps,
-			AstroBuiltinAttributes,
-			AstroClientDirectives {
+	interface IntrinsicAttributes extends AstroComponentDirectives, AstroBuiltinAttributes {
 		slot?: string | undefined | null;
 		children?: Children;
 	}
 
-	type AstroBuiltinProps = import('./dist/@types/astro.js').AstroBuiltinProps;
-	type AstroClientDirectives = import('./dist/@types/astro.js').AstroClientDirectives;
-	type AstroBuiltinAttributes = import('./dist/@types/astro.js').AstroBuiltinAttributes;
-	type AstroDefineVarsAttribute = import('./dist/@types/astro.js').AstroDefineVarsAttribute;
-	type AstroScriptAttributes = import('./dist/@types/astro.js').AstroScriptAttributes &
+	type AstroComponentDirectives =
+		import('./dist/types/public/elements.js').AstroComponentDirectives;
+	type AstroBuiltinAttributes = import('./dist/types/public/elements.js').AstroBuiltinAttributes;
+	type AstroDefineVarsAttribute =
+		import('./dist/types/public/elements.js').AstroDefineVarsAttribute;
+	type AstroScriptAttributes = import('./dist/types/public/elements.js').AstroScriptAttributes &
 		AstroDefineVarsAttribute;
-	type AstroStyleAttributes = import('./dist/@types/astro.js').AstroStyleAttributes &
+	type AstroStyleAttributes = import('./dist/types/public/elements.js').AstroStyleAttributes &
 		AstroDefineVarsAttribute;
-	type AstroSlotAttributes = import('./dist/@types/astro.js').AstroSlotAttributes;
+	type AstroSlotAttributes = import('./dist/types/public/elements.js').AstroSlotAttributes;
 
 	// This is an unfortunate use of `any`, but unfortunately we can't make a type that works for every framework
 	// without importing every single framework's types (which comes with its own set of problems).

package/astro.js

@@ -12,7 +12,7 @@ const CI_INSTRUCTIONS = {
 };
 
 // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
-const engines = '>=18.14.1';
+const engines = '>=18.17.1';
 const skipSemverCheckIfAbove = 19;
 
 /** `astro *` */

package/client.d.ts

@@ -2,12 +2,6 @@
 /// <reference path="./types/content.d.ts" />
 /// <reference path="./types/actions.d.ts" />
 
-// eslint-disable-next-line  @typescript-eslint/no-namespace
-declare namespace App {
-	// eslint-disable-next-line  @typescript-eslint/no-empty-interface
-	export interface Locals {}
-}
-
 interface ImportMetaEnv {
 	/**
 	 * The prefix for Astro-generated asset links if the build.assetsPrefix config option is set. This can be used to create asset links not handled by Astro.
@@ -52,7 +46,7 @@ declare module 'astro:assets' {
 		getImage: (
 			options: import('./dist/assets/types.js').UnresolvedImageTransform,
 		) => Promise<import('./dist/assets/types.js').GetImageResult>;
-		imageConfig: import('./dist/@types/astro.js').AstroConfig['image'];
+		imageConfig: import('./dist/types/public/config.js').AstroConfig['image'];
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		inferRemoteSize: typeof import('./dist/assets/utils/index.js').inferRemoteSize;
 		Image: typeof import('./components/Image.astro').default;
@@ -172,7 +166,7 @@ declare module 'astro:components' {
 	export * from 'astro/components';
 }
 
-type MD = import('./dist/@types/astro.js').MarkdownInstance<Record<string, any>>;
+type MD = import('./dist/types/public/content.js').MarkdownInstance<Record<string, any>>;
 interface ExportedMarkdownModuleEntities {
 	frontmatter: MD['frontmatter'];
 	file: MD['file'];
@@ -191,7 +185,6 @@ declare module '*.md' {
 		file,
 		url,
 		getHeadings,
-		getHeaders,
 		Content,
 		rawContent,
 		compiledContent,
@@ -206,7 +199,6 @@ declare module '*.markdown' {
 		file,
 		url,
 		getHeadings,
-		getHeaders,
 		Content,
 		rawContent,
 		compiledContent,
@@ -221,7 +213,6 @@ declare module '*.mkdn' {
 		file,
 		url,
 		getHeadings,
-		getHeaders,
 		Content,
 		rawContent,
 		compiledContent,
@@ -236,7 +227,6 @@ declare module '*.mkd' {
 		file,
 		url,
 		getHeadings,
-		getHeaders,
 		Content,
 		rawContent,
 		compiledContent,
@@ -251,7 +241,6 @@ declare module '*.mdwn' {
 		file,
 		url,
 		getHeadings,
-		getHeaders,
 		Content,
 		rawContent,
 		compiledContent,
@@ -266,7 +255,6 @@ declare module '*.mdown' {
 		file,
 		url,
 		getHeadings,
-		getHeaders,
 		Content,
 		rawContent,
 		compiledContent,
@@ -275,7 +263,7 @@ declare module '*.mdown' {
 }
 
 declare module '*.mdx' {
-	type MDX = import('./dist/@types/astro.js').MDXInstance<Record<string, any>>;
+	type MDX = import('./dist/types/public/content.js').MDXInstance<Record<string, any>>;
 
 	export const frontmatter: MDX['frontmatter'];
 	export const file: MDX['file'];
@@ -288,7 +276,7 @@ declare module '*.mdx' {
 }
 
 declare module 'astro:ssr-manifest' {
-	export const manifest: import('./dist/@types/astro.js').SSRManifest;
+	export const manifest: import('./dist/types/public/internal.js').SSRManifest;
 }
 
 // Everything below are Vite's types (apart from image types, which are in `client.d.ts`)

package/components/Picture.astro

@@ -1,9 +1,9 @@
 ---
 import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
 import * as mime from 'mrmime';
-import type { GetImageResult, ImageOutputFormat } from '../dist/@types/astro';
 import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
+import type { GetImageResult, ImageOutputFormat } from '../dist/types/public/index.js';
 import type { HTMLAttributes } from '../types';
 
 type Props = (LocalImageProps | RemoteImageProps) & {

package/config.d.ts

@@ -1,8 +1,8 @@
 type ViteUserConfig = import('vite').UserConfig;
 type ViteUserConfigFn = import('vite').UserConfigFn;
-type AstroUserConfig = import('./dist/@types/astro.js').AstroUserConfig;
-type AstroInlineConfig = import('./dist/@types/astro.js').AstroInlineConfig;
-type ImageServiceConfig = import('./dist/@types/astro.js').ImageServiceConfig;
+type AstroUserConfig = import('./dist/types/public/config.js').AstroUserConfig;
+type AstroInlineConfig = import('./dist/types/public/config.js').AstroInlineConfig;
+type ImageServiceConfig = import('./dist/types/public/config.js').ImageServiceConfig;
 type SharpImageServiceConfig = import('./dist/assets/services/sharp.js').SharpImageServiceConfig;
 type EnvField = typeof import('./dist/env/config.js').envField;
 
@@ -42,4 +42,4 @@ export function passthroughImageService(): ImageServiceConfig;
 /**
  * Return a valid env field to use in this Astro config for `experimental.env.schema`.
  */
-export const envField: EnvField;
+export declare const envField: EnvField;

package/dist/actions/index.d.ts

@@ -1,6 +1,7 @@
 import fsMod from 'node:fs';
 import type { Plugin as VitePlugin } from 'vite';
-import type { AstroIntegration, AstroSettings } from '../@types/astro.js';
+import type { AstroSettings } from '../types/astro.js';
+import type { AstroIntegration } from '../types/public/integrations.js';
 export default function astroActions({ fs, settings, }: {
     fs?: typeof fsMod;
     settings: AstroSettings;

package/dist/actions/runtime/middleware.d.ts

@@ -6,4 +6,4 @@ export type ActionPayload = {
 export type Locals = {
     _actionPayload: ActionPayload;
 };
-export declare const onRequest: import("../../@types/astro.js").MiddlewareHandler;
+export declare const onRequest: import("../../types/public/common.js").MiddlewareHandler;

package/dist/actions/runtime/route.d.ts

@@ -1,2 +1,2 @@
-import type { APIRoute } from '../../@types/astro.js';
+import type { APIRoute } from '../../types/public/common.js';
 export declare const POST: APIRoute;

package/dist/actions/runtime/utils.d.ts

@@ -1,4 +1,4 @@
-import type { APIContext } from '../../@types/astro.js';
+import type { APIContext } from '../../types/public/context.js';
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
 export type ActionAPIContext = Omit<APIContext, 'getActionResult' | 'callAction' | 'props'>;

package/dist/actions/utils.d.ts

@@ -1,6 +1,6 @@
-import type { APIContext } from '../@types/astro.js';
+import type { APIContext } from '../types/public/context.js';
 import type { Locals } from './runtime/middleware.js';
-import { type ActionAPIContext } from './runtime/utils.js';
+import type { ActionAPIContext } from './runtime/utils.js';
 export declare function hasActionPayload(locals: APIContext['locals']): locals is Locals;
 export declare function createGetActionResult(locals: APIContext['locals']): APIContext['getActionResult'];
 export declare function createCallAction(context: ActionAPIContext): APIContext['callAction'];

package/dist/actions/utils.js

@@ -1,4 +1,3 @@
-import {} from "./runtime/utils.js";
 import { deserializeActionResult, getActionQueryString } from "./runtime/virtual/shared.js";
 function hasActionPayload(locals) {
   return "_actionPayload" in locals;

package/dist/assets/build/generate.d.ts

@@ -1,8 +1,8 @@
 import type PQueue from 'p-queue';
-import type { AstroConfig } from '../../@types/astro.js';
 import type { BuildPipeline } from '../../core/build/pipeline.js';
 import type { Logger } from '../../core/logger/core.js';
 import type { MapValue } from '../../type-utils.js';
+import type { AstroConfig } from '../../types/public/config.js';
 import type { AssetsGlobalStaticImagesList } from '../types.js';
 type AssetEnv = {
     logger: Logger;

package/dist/assets/endpoint/config.d.ts

@@ -1,2 +1,2 @@
-import type { AstroSettings } from '../../@types/astro.js';
+import type { AstroSettings } from '../../types/astro.js';
 export declare function injectImageEndpoint(settings: AstroSettings, mode: 'dev' | 'build'): AstroSettings;

package/dist/assets/endpoint/generic.d.ts

@@ -1,4 +1,4 @@
-import type { APIRoute } from '../../@types/astro.js';
+import type { APIRoute } from '../../types/public/common.js';
 /**
  * Endpoint used in dev and SSR to serve optimized images by the base image services
  */

package/dist/assets/endpoint/node.d.ts

@@ -1,4 +1,4 @@
-import type { APIRoute } from '../../@types/astro.js';
+import type { APIRoute } from '../../types/public/common.js';
 /**
  * Endpoint used in dev and SSR to serve optimized images by the base image services
  */

package/dist/assets/internal.d.ts

@@ -1,4 +1,4 @@
-import type { AstroConfig } from '../@types/astro.js';
+import type { AstroConfig } from '../types/public/config.js';
 import { type ImageService } from './services/service.js';
 import { type GetImageResult, type UnresolvedImageTransform } from './types.js';
 export declare function getConfiguredImageService(): Promise<ImageService>;

package/dist/assets/services/service.d.ts

@@ -1,4 +1,4 @@
-import type { AstroConfig } from '../../@types/astro.js';
+import type { AstroConfig } from '../../types/public/config.js';
 import type { ImageOutputFormat, ImageTransform, UnresolvedSrcSetValue } from '../types.js';
 export type ImageService = LocalImageService | ExternalImageService;
 export declare function isLocalService(service: ImageService | undefined): service is LocalImageService;

package/dist/assets/utils/remotePattern.d.ts

@@ -1,4 +1,4 @@
-import type { AstroConfig } from '../../@types/astro.js';
+import type { AstroConfig } from '../../types/public/config.js';
 export type RemotePattern = {
     hostname?: string;
     pathname?: string;

package/dist/assets/utils/vendor/image-size/types/index.d.ts

@@ -1,3 +1,3 @@
-export declare const typeHandlers: Map<"jpg" | "png" | "tiff" | "webp" | "gif" | "svg" | "heif" | "icns" | "ktx" | "bmp" | "cur" | "dds" | "ico" | "j2c" | "jp2" | "pnm" | "psd" | "tga", import("./interface.js").IImage>;
-export declare const types: ("jpg" | "png" | "tiff" | "webp" | "gif" | "svg" | "heif" | "icns" | "ktx" | "bmp" | "cur" | "dds" | "ico" | "j2c" | "jp2" | "pnm" | "psd" | "tga")[];
+export declare const typeHandlers: Map<"svg" | "jpg" | "png" | "tiff" | "webp" | "gif" | "heif" | "icns" | "ktx" | "bmp" | "cur" | "dds" | "ico" | "j2c" | "jp2" | "pnm" | "psd" | "tga", import("./interface.js").IImage>;
+export declare const types: ("svg" | "jpg" | "png" | "tiff" | "webp" | "gif" | "heif" | "icns" | "ktx" | "bmp" | "cur" | "dds" | "ico" | "j2c" | "jp2" | "pnm" | "psd" | "tga")[];
 export type imageType = typeof types[number];

package/dist/assets/vite-plugin-assets.d.ts

@@ -1,5 +1,5 @@
 import type * as vite from 'vite';
-import type { AstroPluginOptions } from '../@types/astro.js';
+import type { AstroPluginOptions } from '../types/astro.js';
 export default function assets({ settings, mode, }: AstroPluginOptions & {
     mode: string;
 }): vite.Plugin[];

package/dist/cli/flags.d.ts

@@ -1,6 +1,6 @@
 import type { Arguments } from 'yargs-parser';
-import type { AstroInlineConfig } from '../@types/astro.js';
 import { Logger } from '../core/logger/core.js';
+import type { AstroInlineConfig } from '../types/public/config.js';
 export type Flags = Arguments;
 export declare function flagsToAstroInlineConfig(flags: Flags): AstroInlineConfig;
 /**

package/dist/cli/info/index.d.ts

@@ -1,4 +1,4 @@
-import type { AstroConfig, AstroUserConfig } from '../../@types/astro.js';
+import type { AstroConfig, AstroUserConfig } from '../../types/public/config.js';
 import { type Flags } from '../flags.js';
 interface InfoOptions {
     flags: Flags;

package/dist/cli/preview/index.d.ts

@@ -2,5 +2,5 @@ import { type Flags } from '../flags.js';
 interface PreviewOptions {
     flags: Flags;
 }
-export declare function preview({ flags }: PreviewOptions): Promise<import("../../@types/astro.js").PreviewServer | undefined>;
+export declare function preview({ flags }: PreviewOptions): Promise<import("../../types/public/preview.js").PreviewServer | undefined>;
 export {};

package/dist/config/index.d.ts

@@ -1,5 +1,5 @@
 import type { UserConfig as ViteUserConfig } from 'vite';
-import type { AstroInlineConfig, AstroUserConfig } from '../@types/astro.js';
+import type { AstroInlineConfig, AstroUserConfig } from '../types/public/config.js';
 export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
 export declare function getViteConfig(userViteConfig: ViteUserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
     mode: string;

package/dist/config/vite-plugin-content-listen.d.ts

@@ -1,7 +1,7 @@
 import type fsMod from 'node:fs';
 import type { Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
 /**
  * Listen for Astro content directory changes and generate types.
  *

package/dist/container/index.d.ts

@@ -1,5 +1,18 @@
-import type { AstroUserConfig, NamedSSRLoadedRendererValue, Props, RouteType, SSRLoadedRenderer, SSRLoadedRendererValue, SSRManifest, SSRResult } from '../@types/astro.js';
 import type { AstroComponentFactory } from '../runtime/server/index.js';
+import type { Props } from '../types/public/common.js';
+import type { AstroUserConfig } from '../types/public/config.js';
+import type { NamedSSRLoadedRendererValue, RouteType, SSRLoadedRenderer, SSRLoadedRendererValue, SSRManifest, SSRResult } from '../types/public/internal.js';
+/** Public type, used for integrations to define a renderer for the container API */
+export type ContainerRenderer = {
+    /**
+     * The name of the renderer.
+     */
+    name: string;
+    /**
+     * The entrypoint that is used to render a component on the server
+     */
+    serverEntrypoint: string;
+};
 /**
  * Options to be passed when rendering a route
  */

package/dist/container/pipeline.d.ts

@@ -1,5 +1,7 @@
-import type { ComponentInstance, RewritePayload, RouteData, SSRResult } from '../@types/astro.js';
 import { type HeadElements, Pipeline } from '../core/base-pipeline.js';
+import type { ComponentInstance } from '../types/astro.js';
+import type { RewritePayload } from '../types/public/common.js';
+import type { RouteData, SSRResult } from '../types/public/internal.js';
 export declare class ContainerPipeline extends Pipeline {
     #private;
     static create({ logger, manifest, renderers, resolve, serverLike, streaming, }: Pick<ContainerPipeline, 'logger' | 'manifest' | 'renderers' | 'resolve' | 'serverLike' | 'streaming'>): ContainerPipeline;

package/dist/content/content-layer.d.ts

@@ -1,6 +1,6 @@
 import type { FSWatcher } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
 import type { LoaderContext } from './loaders/types.js';
 import type { MutableDataStore } from './mutable-data-store.js';
 export interface ContentLayerOptions {

package/dist/content/loaders/glob.js

@@ -80,7 +80,7 @@ function glob(globOptions) {
         if (entryType.getRenderFunction) {
           let render = renderFunctionByContentType.get(entryType);
           if (!render) {
-            render = await entryType.getRenderFunction(settings);
+            render = await entryType.getRenderFunction(settings.config);
             renderFunctionByContentType.set(entryType, render);
           }
           let rendered = void 0;

package/dist/content/loaders/types.d.ts

@@ -1,6 +1,7 @@
 import type { FSWatcher } from 'vite';
 import type { ZodSchema } from 'zod';
-import type { AstroIntegrationLogger, AstroSettings } from '../../@types/astro.js';
+import type { AstroIntegrationLogger } from '../../core/logger/core.js';
+import type { AstroSettings } from '../../types/astro.js';
 import type { MetaStore, ScopedDataStore } from '../mutable-data-store.js';
 export interface ParseDataOptions<TData extends Record<string, unknown>> {
     /** The ID of the entry. Unique per collection */

package/dist/content/server-listeners.d.ts

@@ -1,7 +1,7 @@
 import type fsMod from 'node:fs';
 import type { ViteDevServer } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
 interface ContentServerListenerParams {
     fs: typeof fsMod;
     logger: Logger;

package/dist/content/types-generator.d.ts

@@ -1,7 +1,7 @@
 import type fsMod from 'node:fs';
 import { type ViteDevServer } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
 import { type ContentObservable } from './utils.js';
 type ChokidarEvent = 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir';
 type RawContentEvent = {

package/dist/content/utils.d.ts

@@ -3,8 +3,10 @@ import matter from 'gray-matter';
 import type { PluginContext } from 'rollup';
 import { type ViteDevServer } from 'vite';
 import { z } from 'zod';
-import type { AstroConfig, AstroSettings, ContentEntryType, DataEntryType } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
+import type { AstroConfig } from '../types/public/config.js';
+import type { ContentEntryType, DataEntryType } from '../types/public/content.js';
 import { CONTENT_FLAGS } from './consts.js';
 /**
  * Amap from a collection + slug to the local file path.
@@ -85,7 +87,6 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
         schema: z.ZodOptional<z.ZodAny>;
         render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
     }, "strip", z.ZodTypeAny, {
-        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -96,10 +97,10 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             watcher?: any;
         }) => unknown;
-        schema?: any;
+        name: string;
         render?: ((args_0: any) => unknown) | undefined;
+        schema?: any;
     }, {
-        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -110,8 +111,9 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             watcher?: any;
         }) => unknown;
-        schema?: any;
+        name: string;
         render?: ((args_0: any) => unknown) | undefined;
+        schema?: any;
     }>]>;
 }, "strip", z.ZodTypeAny, {
     type: "content_layer";
@@ -120,7 +122,6 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     }, z.ZodUnknown, "strip">[] | Promise<z.objectOutputType<{
         id: z.ZodString;
     }, z.ZodUnknown, "strip">[]>) | {
-        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -131,8 +132,9 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             watcher?: any;
         }) => unknown;
-        schema?: any;
+        name: string;
         render?: ((args_0: any) => unknown) | undefined;
+        schema?: any;
     };
     schema?: any;
 }, {
@@ -142,7 +144,6 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     }, z.ZodUnknown, "strip">[] | Promise<z.objectInputType<{
         id: z.ZodString;
     }, z.ZodUnknown, "strip">[]>) | {
-        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -153,8 +154,9 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             watcher?: any;
         }) => unknown;
-        schema?: any;
+        name: string;
         render?: ((args_0: any) => unknown) | undefined;
+        schema?: any;
     };
     schema?: any;
 }>]>;
@@ -225,7 +227,6 @@ declare const contentConfigParser: z.ZodObject<{
             schema: z.ZodOptional<z.ZodAny>;
             render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -236,10 +237,10 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 watcher?: any;
             }) => unknown;
-            schema?: any;
+            name: string;
             render?: ((args_0: any) => unknown) | undefined;
+            schema?: any;
         }, {
-            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -250,8 +251,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 watcher?: any;
             }) => unknown;
-            schema?: any;
+            name: string;
             render?: ((args_0: any) => unknown) | undefined;
+            schema?: any;
         }>]>;
     }, "strip", z.ZodTypeAny, {
         type: "content_layer";
@@ -260,7 +262,6 @@ declare const contentConfigParser: z.ZodObject<{
         }, z.ZodUnknown, "strip">[] | Promise<z.objectOutputType<{
             id: z.ZodString;
         }, z.ZodUnknown, "strip">[]>) | {
-            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -271,8 +272,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 watcher?: any;
             }) => unknown;
-            schema?: any;
+            name: string;
             render?: ((args_0: any) => unknown) | undefined;
+            schema?: any;
         };
         schema?: any;
     }, {
@@ -282,7 +284,6 @@ declare const contentConfigParser: z.ZodObject<{
         }, z.ZodUnknown, "strip">[] | Promise<z.objectInputType<{
             id: z.ZodString;
         }, z.ZodUnknown, "strip">[]>) | {
-            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -293,8 +294,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 watcher?: any;
             }) => unknown;
-            schema?: any;
+            name: string;
             render?: ((args_0: any) => unknown) | undefined;
+            schema?: any;
         };
         schema?: any;
     }>]>>;
@@ -312,7 +314,6 @@ declare const contentConfigParser: z.ZodObject<{
         }, z.ZodUnknown, "strip">[] | Promise<z.objectOutputType<{
             id: z.ZodString;
         }, z.ZodUnknown, "strip">[]>) | {
-            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -323,8 +324,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 watcher?: any;
             }) => unknown;
-            schema?: any;
+            name: string;
             render?: ((args_0: any) => unknown) | undefined;
+            schema?: any;
         };
         schema?: any;
     }>;
@@ -342,7 +344,6 @@ declare const contentConfigParser: z.ZodObject<{
         }, z.ZodUnknown, "strip">[] | Promise<z.objectInputType<{
             id: z.ZodString;
         }, z.ZodUnknown, "strip">[]>) | {
-            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -353,8 +354,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 watcher?: any;
             }) => unknown;
-            schema?: any;
+            name: string;
             render?: ((args_0: any) => unknown) | undefined;
+            schema?: any;
         };
         schema?: any;
     }>;

package/dist/content/vite-plugin-content-assets.d.ts

@@ -1,8 +1,8 @@
 import type { Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
 import type { BuildInternals } from '../core/build/internal.js';
 import type { AstroBuildPlugin } from '../core/build/plugin.js';
 import type { StaticBuildOptions } from '../core/build/types.js';
+import type { AstroSettings } from '../types/astro.js';
 export declare function astroContentAssetPropagationPlugin({ mode, settings, }: {
     mode: string;
     settings: AstroSettings;

package/dist/content/vite-plugin-content-imports.d.ts

@@ -1,7 +1,7 @@
 import type fsMod from 'node:fs';
 import type { Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
 export declare function astroContentImportPlugin({ fs, settings, logger, }: {
     fs: typeof fsMod;
     settings: AstroSettings;

package/dist/content/vite-plugin-content-virtual-mod.d.ts

@@ -1,6 +1,6 @@
 import nodeFs from 'node:fs';
 import type { Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
+import type { AstroSettings } from '../types/astro.js';
 import { type ContentLookupMap } from './utils.js';
 interface AstroContentVirtualModPluginParams {
     settings: AstroSettings;

package/dist/core/app/index.d.ts

@@ -1,4 +1,5 @@
-import type { ManifestData, RouteData, SSRManifest } from '../../@types/astro.js';
+import type { ManifestData } from '../../types/astro.js';
+import type { RouteData, SSRManifest } from '../../types/public/internal.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';
 import { AstroIntegrationLogger } from '../logger/core.js';
 export { deserializeManifest } from './common.js';

package/dist/core/app/middlewares.d.ts

@@ -1,4 +1,4 @@
-import type { MiddlewareHandler } from '../../@types/astro.js';
+import type { MiddlewareHandler } from '../../types/public/common.js';
 /**
  * Returns a middleware function in charge to check the `origin` header.
  *