astro 6.0.0-alpha.2 → 6.0.0-alpha.4

package/dist/cli/add/index.js

@@ -63,20 +63,17 @@ export default async function seed() {
 }
 `,
   CLOUDFLARE_WRANGLER_CONFIG: (name) => `{
-	"main": "dist/_worker.js/index.js",
+	"compatibility_date": ${JSON.stringify((/* @__PURE__ */ new Date()).toISOString().slice(0, 10))},
+	"compatibility_flags": ["global_fetch_strictly_public"],
 	"name": ${JSON.stringify(name)},
-  "compatibility_date": ${JSON.stringify((/* @__PURE__ */ new Date()).toISOString().slice(0, 10))},
-  "compatibility_flags": [
-    "nodejs_compat",
-    "global_fetch_strictly_public"
-  ],
+	"main": "@astrojs/cloudflare/entrypoints/server",
 	"assets": {
-		"binding": "ASSETS",
-		"directory": "./dist"
+		"directory": "./dist",
+		"binding": "ASSETS"
 	},
 	"observability": {
-    "enabled": true
-  }
+		"enabled": true
+	}
 }`,
   CLOUDFLARE_ASSETSIGNORE: `_worker.js
 _routes.json`

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.0-alpha.2";
+  version = "6.0.0-alpha.4";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/config/entrypoint.d.ts

@@ -6,6 +6,7 @@ export { mergeConfig } from '../core/config/merge.js';
 export { validateConfig } from '../core/config/validate.js';
 export { envField } from '../env/config.js';
 export { defineConfig, getViteConfig } from './index.js';
+export { sessionDrivers } from '../core/session/drivers.js';
 /**
  * Return the configuration needed to use the Sharp-based image service
  */

package/dist/config/entrypoint.js

@@ -3,6 +3,7 @@ import { mergeConfig } from "../core/config/merge.js";
 import { validateConfig } from "../core/config/validate.js";
 import { envField } from "../env/config.js";
 import { defineConfig, getViteConfig } from "./index.js";
+import { sessionDrivers } from "../core/session/drivers.js";
 function sharpImageService(config = {}) {
   return {
     entrypoint: "astro/assets/services/sharp",
@@ -23,6 +24,7 @@ export {
   getViteConfig,
   mergeConfig,
   passthroughImageService,
+  sessionDrivers,
   sharpImageService,
   validateConfig
 };

package/dist/config/index.d.ts

@@ -1,10 +1,11 @@
 import type { UserConfig as ViteUserConfig, UserConfigFn as ViteUserConfigFn } from 'vite';
-import type { AstroInlineConfig, AstroUserConfig, Locales, SessionDriverName } from '../types/public/config.js';
+import type { AstroInlineConfig, AstroUserConfig, Locales } from '../types/public/config.js';
+import type { SessionDriverConfig, SessionDriverName } from '../core/session/types.js';
 /**
  * See the full Astro Configuration API Documentation
  * https://astro.build/config
  */
-export declare function defineConfig<const TLocales extends Locales = never, const TDriver extends SessionDriverName = never>(config: AstroUserConfig<TLocales, TDriver>): AstroUserConfig<TLocales, TDriver>;
+export declare function defineConfig<const TLocales extends Locales = never, const TDriver extends SessionDriverName | SessionDriverConfig = never>(config: AstroUserConfig<TLocales, TDriver>): AstroUserConfig<TLocales, TDriver>;
 /**
  * Use Astro to generate a fully resolved Vite config
  */

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-alpha.2") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-alpha.4") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-alpha.2") {
-      await this.#store.metaStore().set("astro-version", "6.0.0-alpha.2");
+    if ("6.0.0-alpha.4") {
+      await this.#store.metaStore().set("astro-version", "6.0.0-alpha.4");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/app/base.js

@@ -24,7 +24,7 @@ import { RenderContext } from "../render-context.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { ensure404Route } from "../routing/astro-designed-error-pages.js";
 import { matchRoute } from "../routing/match.js";
-import { PERSIST_SYMBOL } from "../session.js";
+import { PERSIST_SYMBOL } from "../session/runtime.js";
 class BaseApp {
   manifest;
   manifestData;

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

@@ -3,12 +3,15 @@ import type { Logger } from '../../logger/core.js';
 import type { CreateRenderContext, RenderContext } from '../../render-context.js';
 import { BaseApp, type RenderErrorOptions } from '../base.js';
 import type { SSRManifest } from '../types.js';
-import { DevPipeline } from './pipeline.js';
-export declare class DevApp extends BaseApp<DevPipeline> {
+import { NonRunnablePipeline } from './pipeline.js';
+/**
+ *
+ */
+export declare class DevApp extends BaseApp<NonRunnablePipeline> {
     logger: Logger;
     currentRenderContext: RenderContext | undefined;
     constructor(manifest: SSRManifest, streaming: boolean | undefined, logger: Logger);
-    createPipeline(streaming: boolean, manifest: SSRManifest, logger: Logger): DevPipeline;
+    createPipeline(streaming: boolean, manifest: SSRManifest, logger: Logger): NonRunnablePipeline;
     match(request: Request): RouteData | undefined;
     createRenderContext(payload: CreateRenderContext): Promise<RenderContext>;
     renderError(request: Request, { locals, skipMiddleware, error, clientAddress, status }: RenderErrorOptions): Promise<Response>;

package/dist/core/app/dev/app.js

@@ -1,8 +1,8 @@
 import { MiddlewareNoDataOrNextCalled, MiddlewareNotAResponse } from "../../errors/errors-data.js";
 import { isAstroError } from "../../errors/index.js";
-import { isRoute404, isRoute500 } from "../../routing/match.js";
 import { BaseApp } from "../base.js";
-import { DevPipeline } from "./pipeline.js";
+import { NonRunnablePipeline } from "./pipeline.js";
+import { getCustom404Route, getCustom500Route } from "../../routing/helpers.js";
 class DevApp extends BaseApp {
   logger;
   currentRenderContext = void 0;
@@ -11,7 +11,7 @@ class DevApp extends BaseApp {
     this.logger = logger;
   }
   createPipeline(streaming, manifest, logger) {
-    return DevPipeline.create({
+    return NonRunnablePipeline.create({
       logger,
       manifest,
       streaming
@@ -62,9 +62,9 @@ class DevApp extends BaseApp {
       }
     };
     if (status === 404) {
-      const custom400 = getCustom400Route(this.manifestData);
-      if (custom400) {
-        return renderRoute(custom400);
+      const custom404 = getCustom404Route(this.manifestData);
+      if (custom404) {
+        return renderRoute(custom404);
       }
     }
     const custom500 = getCustom500Route(this.manifestData);
@@ -75,12 +75,6 @@ class DevApp extends BaseApp {
     }
   }
 }
-function getCustom500Route(manifestData) {
-  return manifestData.routes.find((r) => isRoute500(r.route));
-}
-function getCustom400Route(manifestData) {
-  return manifestData.routes.find((r) => isRoute404(r.route));
-}
 export {
   DevApp
 };

package/dist/core/app/dev/pipeline.d.ts

@@ -1,10 +1,13 @@
 import type { ComponentInstance } from '../../../types/astro.js';
 import type { RewritePayload, RouteData } from '../../../types/public/index.js';
 import { type HeadElements, Pipeline, type TryRewriteResult } from '../../base-pipeline.js';
-type DevPipelineCreate = Pick<DevPipeline, 'logger' | 'manifest' | 'streaming'>;
-export declare class DevPipeline extends Pipeline {
+type DevPipelineCreate = Pick<NonRunnablePipeline, 'logger' | 'manifest' | 'streaming'>;
+/**
+ * A pipeline that can't load modules at runtime using the vite environment APIs
+ */
+export declare class NonRunnablePipeline extends Pipeline {
     getName(): string;
-    static create({ logger, manifest, streaming }: DevPipelineCreate): DevPipeline;
+    static create({ logger, manifest, streaming }: DevPipelineCreate): NonRunnablePipeline;
     headElements(routeData: RouteData): Promise<HeadElements>;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;

package/dist/core/app/dev/pipeline.js

@@ -2,9 +2,9 @@ import { Pipeline } from "../../base-pipeline.js";
 import { ASTRO_VERSION } from "../../constants.js";
 import { createModuleScriptElement, createStylesheetElementSet } from "../../render/ssr-element.js";
 import { findRouteToRewrite } from "../../routing/rewrite.js";
-class DevPipeline extends Pipeline {
+class NonRunnablePipeline extends Pipeline {
   getName() {
-    return "DevPipeline";
+    return "NonRunnablePipeline";
   }
   static create({ logger, manifest, streaming }) {
     async function resolve(specifier) {
@@ -14,7 +14,7 @@ class DevPipeline extends Pipeline {
         return "/@id/" + specifier;
       }
     }
-    const pipeline = new DevPipeline(
+    const pipeline = new NonRunnablePipeline(
       logger,
       manifest,
       "development",
@@ -119,5 +119,5 @@ class DevPipeline extends Pipeline {
   }
 }
 export {
-  DevPipeline
+  NonRunnablePipeline
 };

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

@@ -1,13 +1,13 @@
 import type { ActionClient } from '../../actions/runtime/types.js';
 import type { ComponentInstance, SerializedRouteData } from '../../types/astro.js';
 import type { AstroMiddlewareInstance } from '../../types/public/common.js';
-import type { AstroConfig, CspAlgorithm, Locales, RemotePattern, ResolvedSessionConfig } from '../../types/public/config.js';
+import type { AstroConfig, CspAlgorithm, Locales, RemotePattern } from '../../types/public/config.js';
 import type { RouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../types/public/internal.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
 import type { CspDirective } from '../csp/config.js';
 import type { LoggerLevel } from '../logger/core.js';
-import type { SessionDriver } from '../session.js';
 import type { RoutingStrategies } from './common.js';
+import type { BaseSessionConfig, SessionDriverFactory } from '../session/types.js';
 type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -81,11 +81,11 @@ export type SSRManifest = {
     middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
     actions?: () => Promise<SSRActions> | SSRActions;
     sessionDriver?: () => Promise<{
-        default: SessionDriver | null;
+        default: SessionDriverFactory | null;
     }>;
     checkOrigin: boolean;
     allowedDomains?: Partial<RemotePattern>[];
-    sessionConfig?: ResolvedSessionConfig<any>;
+    sessionConfig?: SSRManifestSession;
     cacheDir: URL;
     srcDir: URL;
     outDir: URL;
@@ -132,6 +132,10 @@ export type SSRManifestCSP = {
     styleResources: string[];
     directives: CspDirective[];
 };
+export interface SSRManifestSession extends BaseSessionConfig {
+    driver: string;
+    options?: Record<string, any> | undefined;
+}
 /** Public type exposed through the `astro:build:ssr` integration hook */
 export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives' | 'serverIslandNameMap' | 'key' | 'rootDir' | 'srcDir' | 'cacheDir' | 'outDir' | 'publicDir' | 'buildClientDir' | 'buildServerDir'> & {
     rootDir: string;

package/dist/core/base-pipeline.d.ts

@@ -8,7 +8,7 @@ import type { ServerIslandMappings } from './app/types.js';
 import type { SinglePageBuiltModule } from './build/types.js';
 import type { Logger } from './logger/core.js';
 import { RouteCache } from './render/route-cache.js';
-import type { SessionDriver } from './session.js';
+import type { SessionDriverFactory } from './session/types.js';
 /**
  * The `Pipeline` represents the static parts of rendering that do not change between requests.
  * These are mostly known when the server first starts up and do not change.
@@ -51,13 +51,13 @@ export declare abstract class Pipeline {
     }[];
     readonly actions: (() => Promise<SSRActions> | SSRActions) | undefined;
     readonly sessionDriver: (() => Promise<{
-        default: SessionDriver | null;
+        default: SessionDriverFactory | null;
     }>) | undefined;
     readonly serverIslands: (() => Promise<ServerIslandMappings> | ServerIslandMappings) | undefined;
     readonly internalMiddleware: MiddlewareHandler[];
     resolvedMiddleware: MiddlewareHandler | undefined;
     resolvedActions: SSRActions | undefined;
-    resolvedSessionDriver: SessionDriver | null | undefined;
+    resolvedSessionDriver: SessionDriverFactory | null | undefined;
     constructor(logger: Logger, manifest: SSRManifest, 
     /**
      * "development" or "production" only
@@ -81,7 +81,7 @@ export declare abstract class Pipeline {
         route: string;
         component: string;
     }[], actions?: (() => Promise<SSRActions> | SSRActions) | undefined, sessionDriver?: (() => Promise<{
-        default: SessionDriver | null;
+        default: SessionDriverFactory | null;
     }>) | undefined, serverIslands?: (() => Promise<ServerIslandMappings> | ServerIslandMappings) | undefined);
     abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
     abstract componentMetadata(routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
@@ -111,7 +111,7 @@ export declare abstract class Pipeline {
      */
     getMiddleware(): Promise<MiddlewareHandler>;
     getActions(): Promise<SSRActions>;
-    getSessionDriver(): Promise<SessionDriver | null>;
+    getSessionDriver(): Promise<SessionDriverFactory | null>;
     getServerIslands(): Promise<ServerIslandMappings>;
     getAction(path: string): Promise<ActionClient<unknown, ActionAccept, $ZodType>>;
     getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;

package/dist/core/build/plugins/plugin-manifest.js

@@ -25,6 +25,7 @@ import { DEFAULT_COMPONENTS } from "../../routing/default.js";
 import { getOutFile, getOutFolder } from "../common.js";
 import { cssOrder, mergeInlineCss } from "../runtime.js";
 import { makePageDataKey } from "./util.js";
+import { sessionConfigToManifest } from "../../session/utils.js";
 const MANIFEST_REPLACE = "@@ASTRO_MANIFEST_REPLACE@@";
 const replaceExp = new RegExp(`['"]${MANIFEST_REPLACE}['"]`, "g");
 async function manifestBuildPostHook(options, internals, {
@@ -255,7 +256,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
     allowedDomains: settings.config.security?.allowedDomains,
     key: encodedKey,
-    sessionConfig: settings.config.session,
+    sessionConfig: sessionConfigToManifest(settings.config.session),
     csp,
     devToolbar: {
       enabled: false,

package/dist/core/config/schemas/base.d.ts

@@ -68,7 +68,6 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         schema: {};
         validateSecrets: false;
     };
-    session: undefined;
     prerenderConflictBehavior: "warn";
     experimental: {
         clientPrerender: false;
@@ -152,9 +151,9 @@ export declare const AstroConfigSchema: z.ZodObject<{
         }, z.core.$strip>>>;
         layout: z.ZodOptional<z.ZodEnum<{
             fixed: "fixed";
+            none: "none";
             constrained: "constrained";
             "full-width": "full-width";
-            none: "none";
         }>>;
         objectFit: z.ZodOptional<z.ZodString>;
         objectPosition: z.ZodOptional<z.ZodString>;
@@ -401,34 +400,25 @@ export declare const AstroConfigSchema: z.ZodObject<{
         validateSecrets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, z.core.$strict>>>;
     session: z.ZodOptional<z.ZodObject<{
-        driver: z.ZodOptional<z.ZodString>;
+        driver: z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+            entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
+        }, z.core.$strip>]>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-        cookie: z.ZodOptional<z.ZodPipe<z.ZodUnion<[z.ZodObject<{
+        cookie: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
             domain: z.ZodOptional<z.ZodString>;
             path: z.ZodOptional<z.ZodString>;
             maxAge: z.ZodOptional<z.ZodNumber>;
             sameSite: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
                 strict: "strict";
-                none: "none";
                 lax: "lax";
+                none: "none";
             }>, z.ZodBoolean]>>;
             secure: z.ZodOptional<z.ZodBoolean>;
-        }, z.core.$strip>, z.ZodString]>, z.ZodTransform<{
-            name?: string | undefined;
-            domain?: string | undefined;
-            path?: string | undefined;
-            maxAge?: number | undefined;
-            sameSite?: boolean | "strict" | "none" | "lax" | undefined;
-            secure?: boolean | undefined;
-        }, string | {
-            name?: string | undefined;
-            domain?: string | undefined;
-            path?: string | undefined;
-            maxAge?: number | undefined;
-            sameSite?: boolean | "strict" | "none" | "lax" | undefined;
-            secure?: boolean | undefined;
-        }>>>;
+        }, z.core.$strip>, z.ZodPipe<z.ZodString, z.ZodTransform<{
+            name: string;
+        }, string>>]>>;
         ttl: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
     prerenderConflictBehavior: z.ZodDefault<z.ZodOptional<z.ZodEnum<{

package/dist/core/config/schemas/base.js

@@ -4,6 +4,7 @@ import * as z from "zod/v4";
 import { localFontFamilySchema, remoteFontFamilySchema } from "../../../assets/fonts/config.js";
 import { EnvSchema } from "../../../env/schema.js";
 import { allowedDirectivesSchema, cspAlgorithmSchema, cspHashSchema } from "../../csp/config.js";
+import { SessionSchema } from "../../session/config.js";
 const ASTRO_CONFIG_DEFAULTS = {
   root: ".",
   srcDir: "./src",
@@ -51,7 +52,6 @@ const ASTRO_CONFIG_DEFAULTS = {
     schema: {},
     validateSecrets: false
   },
-  session: void 0,
   prerenderConflictBehavior: "warn",
   experimental: {
     clientPrerender: false,
@@ -267,24 +267,7 @@ const AstroConfigSchema = z.object({
     schema: EnvSchema.optional().default(ASTRO_CONFIG_DEFAULTS.env.schema),
     validateSecrets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.env.validateSecrets)
   }).strict().optional().default(ASTRO_CONFIG_DEFAULTS.env),
-  session: z.object({
-    driver: z.string().optional(),
-    options: z.record(z.string(), z.any()).optional(),
-    cookie: z.object({
-      name: z.string().optional(),
-      domain: z.string().optional(),
-      path: z.string().optional(),
-      maxAge: z.number().optional(),
-      sameSite: z.union([z.enum(["strict", "lax", "none"]), z.boolean()]).optional(),
-      secure: z.boolean().optional()
-    }).or(z.string()).transform((val) => {
-      if (typeof val === "string") {
-        return { name: val };
-      }
-      return val;
-    }).optional(),
-    ttl: z.number().optional()
-  }).optional(),
+  session: SessionSchema.optional(),
   prerenderConflictBehavior: z.enum(["error", "warn", "ignore"]).optional().default(ASTRO_CONFIG_DEFAULTS.prerenderConflictBehavior),
   experimental: z.strictObject({
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),

package/dist/core/config/schemas/relative.d.ts

@@ -45,9 +45,9 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         }, z.core.$strip>>>;
         layout: z.ZodOptional<z.ZodEnum<{
             fixed: "fixed";
+            none: "none";
             constrained: "constrained";
             "full-width": "full-width";
-            none: "none";
         }>>;
         objectFit: z.ZodOptional<z.ZodString>;
         objectPosition: z.ZodOptional<z.ZodString>;
@@ -294,34 +294,25 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         validateSecrets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, z.core.$strict>>>;
     session: z.ZodOptional<z.ZodObject<{
-        driver: z.ZodOptional<z.ZodString>;
+        driver: z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+            entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
+        }, z.core.$strip>]>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-        cookie: z.ZodOptional<z.ZodPipe<z.ZodUnion<[z.ZodObject<{
+        cookie: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
             domain: z.ZodOptional<z.ZodString>;
             path: z.ZodOptional<z.ZodString>;
             maxAge: z.ZodOptional<z.ZodNumber>;
             sameSite: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
                 strict: "strict";
-                none: "none";
                 lax: "lax";
+                none: "none";
             }>, z.ZodBoolean]>>;
             secure: z.ZodOptional<z.ZodBoolean>;
-        }, z.core.$strip>, z.ZodString]>, z.ZodTransform<{
-            name?: string | undefined;
-            domain?: string | undefined;
-            path?: string | undefined;
-            maxAge?: number | undefined;
-            sameSite?: boolean | "strict" | "none" | "lax" | undefined;
-            secure?: boolean | undefined;
-        }, string | {
-            name?: string | undefined;
-            domain?: string | undefined;
-            path?: string | undefined;
-            maxAge?: number | undefined;
-            sameSite?: boolean | "strict" | "none" | "lax" | undefined;
-            secure?: boolean | undefined;
-        }>>>;
+        }, z.core.$strip>, z.ZodPipe<z.ZodString, z.ZodTransform<{
+            name: string;
+        }, string>>]>>;
         ttl: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
     prerenderConflictBehavior: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
@@ -488,7 +479,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             pathname?: string | undefined;
         }[];
         responsiveStyles: boolean;
-        layout?: "fixed" | "constrained" | "full-width" | "none" | undefined;
+        layout?: "fixed" | "none" | "constrained" | "full-width" | undefined;
         objectFit?: string | undefined;
         objectPosition?: string | undefined;
         breakpoints?: number[] | undefined;
@@ -696,14 +687,19 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         fallback?: Record<string, string> | undefined;
     } | undefined;
     session?: {
-        driver?: string | undefined;
+        driver: string | {
+            entrypoint: string | URL;
+            config?: Record<string, any> | undefined;
+        };
         options?: Record<string, any> | undefined;
         cookie?: {
+            name: string;
+        } | {
             name?: string | undefined;
             domain?: string | undefined;
             path?: string | undefined;
             maxAge?: number | undefined;
-            sameSite?: boolean | "strict" | "none" | "lax" | undefined;
+            sameSite?: boolean | "strict" | "lax" | "none" | undefined;
             secure?: boolean | undefined;
         } | undefined;
         ttl?: number | undefined;
@@ -740,7 +736,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             pathname?: string | undefined;
         }[];
         responsiveStyles: boolean;
-        layout?: "fixed" | "constrained" | "full-width" | "none" | undefined;
+        layout?: "fixed" | "none" | "constrained" | "full-width" | undefined;
         objectFit?: string | undefined;
         objectPosition?: string | undefined;
         breakpoints?: number[] | undefined;
@@ -948,14 +944,19 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         fallback?: Record<string, string> | undefined;
     } | undefined;
     session?: {
-        driver?: string | undefined;
+        driver: string | {
+            entrypoint: string | URL;
+            config?: Record<string, any> | undefined;
+        };
         options?: Record<string, any> | undefined;
         cookie?: {
+            name: string;
+        } | {
             name?: string | undefined;
             domain?: string | undefined;
             path?: string | undefined;
             maxAge?: number | undefined;
-            sameSite?: boolean | "strict" | "none" | "lax" | undefined;
+            sameSite?: boolean | "strict" | "lax" | "none" | undefined;
             secure?: boolean | undefined;
         } | undefined;
         ttl?: number | undefined;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.0.0-alpha.2";
+const ASTRO_VERSION = "6.0.0-alpha.4";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "6.0.0-alpha.2";
+  const currentVersion = "6.0.0-alpha.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/zod-error-map.js

@@ -11,7 +11,8 @@ const errorMap = (issue) => {
           typeOrLiteralErrByPath.set(flattenedErrorPath, {
             code: unionError.code,
             received: unionError.received,
-            expected: [unionError.expected]
+            expected: [unionError.expected],
+            message: unionError.message
           });
         }
       }
@@ -65,7 +66,8 @@ const errorMap = (issue) => {
         getTypeOrLiteralMsg({
           code: issue.code,
           received: typeof issue.input,
-          expected: [issue.expected]
+          expected: [issue.expected],
+          message: issue.message
         })
       )
     };
@@ -74,7 +76,8 @@ const errorMap = (issue) => {
   }
 };
 const getTypeOrLiteralMsg = (error) => {
-  if (typeof error.received === "undefined" || error.received === "undefined") return "Required";
+  if (typeof error.received === "undefined" || error.received === "undefined")
+    return error.message ?? "Required";
   const expectedDeduped = new Set(error.expected);
   switch (error.code) {
     case "invalid_type":

package/dist/core/messages.d.ts

@@ -4,14 +4,6 @@ import { type ErrorWithMetadata } from './errors/index.js';
 /**
  * Prestyled messages for the CLI. Used by astro CLI commands.
  */
-/** Display each request being served with the path and the status code.  */
-export declare function req({ url, method, statusCode, reqTime, isRewrite, }: {
-    url: string;
-    statusCode: number;
-    method?: string;
-    reqTime?: number;
-    isRewrite?: boolean;
-}): string;
 /** Display server host and startup time */
 export declare function serverStart({ startupTime, resolvedUrls, host, base, }: {
     startupTime: number;

package/dist/core/messages.js

@@ -22,23 +22,13 @@ const {
   underline,
   yellow
 } = colors;
-function req({
-  url,
-  method,
-  statusCode,
-  reqTime,
-  isRewrite
-}) {
-  const color = statusCode >= 500 ? red : statusCode >= 300 ? yellow : blue;
-  return color(`[${statusCode}]`) + ` ${isRewrite ? color("(rewrite) ") : ""}` + (method && method !== "GET" ? color(method) + " " : "") + url + ` ` + (reqTime ? dim(Math.round(reqTime) + "ms") : "");
-}
 function serverStart({
   startupTime,
   resolvedUrls,
   host,
   base
 }) {
-  const version = "6.0.0-alpha.2";
+  const version = "6.0.0-alpha.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -275,7 +265,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.0.0-alpha.2"}`
+        `v${"6.0.0-alpha.4"}`
       )} ${headline}`
     );
   }
@@ -314,7 +304,6 @@ export {
   preferenceSet,
   prerelease,
   printHelp,
-  req,
   serverShortcuts,
   serverStart,
   success,