astro 2.6.6 → 2.7.1

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

@@ -1,5 +1,5 @@
 import type { default as vite, InlineConfig } from 'vite';
-import type { AstroConfig, AstroMiddlewareInstance, AstroSettings, BuildConfig, ComponentInstance, ManifestData, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
+import type { AstroConfig, AstroSettings, ComponentInstance, ManifestData, MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 import type { RouteCache } from '../render/route-cache';
 export type ComponentPath = string;
@@ -33,7 +33,6 @@ export type AllPagesData = Record<ComponentPath, PageBuildData>;
 export interface StaticBuildOptions {
     allPages: AllPagesData;
     settings: AstroSettings;
-    buildConfig: BuildConfig;
     logging: LogOptions;
     manifest: ManifestData;
     mode: RuntimeMode;
@@ -46,7 +45,10 @@ export interface StaticBuildOptions {
 type ImportComponentInstance = () => Promise<ComponentInstance>;
 export interface SinglePageBuiltModule {
     page: ImportComponentInstance;
-    middleware: AstroMiddlewareInstance<unknown>;
+    /**
+     * The `onRequest` hook exported by the middleware
+     */
+    onRequest?: MiddlewareHandler<unknown>;
     renderers: SSRLoadedRenderer[];
 }
 export type ViteBuildReturn = Awaited<ReturnType<typeof vite.build>>;

package/dist/core/compile/compile.js

@@ -55,7 +55,6 @@ function handleCompileResultErrors(result, cssTransformErrors) {
   const compilerError = result.diagnostics.find((diag) => diag.severity === 1);
   if (compilerError) {
     throw new CompilerError({
-      code: compilerError.code,
       message: compilerError.text,
       location: {
         line: compilerError.location.line,
@@ -70,15 +69,11 @@ function handleCompileResultErrors(result, cssTransformErrors) {
       break;
     case 1: {
       const error = cssTransformErrors[0];
-      if (!error.errorCode) {
-        error.errorCode = AstroErrorData.UnknownCSSError.code;
-      }
       throw cssTransformErrors[0];
     }
     default: {
       throw new AggregateError({
         ...cssTransformErrors[0],
-        code: cssTransformErrors[0].errorCode,
         errors: cssTransformErrors
       });
     }

package/dist/core/compile/style.js

@@ -69,7 +69,6 @@ function enhanceCSSError(err, filename) {
   const errorPosition = positionAt(styleTagBeginning, fileContent);
   errorPosition.line += 1;
   return new CSSError({
-    code: AstroErrorData.UnknownCSSError.code,
     message: err.message,
     location: {
       file: filename,

package/dist/core/config/schema.d.ts

@@ -48,6 +48,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
+        split: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -57,6 +58,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "never" | "always" | "auto";
+        split: boolean;
     }, {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -66,6 +68,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "never" | "always" | "auto" | undefined;
+        split?: boolean | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         open: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -213,6 +216,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "never" | "always" | "auto";
+        split: boolean;
     };
     image: {
         service: {
@@ -268,6 +272,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "never" | "always" | "auto" | undefined;
+        split?: boolean | undefined;
     } | undefined;
     image?: {
         service: {
@@ -429,6 +434,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
+        split: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -438,6 +444,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "never" | "always" | "auto";
+        split: boolean;
     }, {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -447,6 +454,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "never" | "always" | "auto" | undefined;
+        split?: boolean | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
@@ -510,6 +518,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "never" | "always" | "auto";
+        split: boolean;
     };
     image: {
         service: {
@@ -565,6 +574,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "never" | "always" | "auto" | undefined;
+        split?: boolean | undefined;
     } | undefined;
     image?: {
         service: {
@@ -629,6 +639,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "never" | "always" | "auto";
+        split: boolean;
     };
     image: {
         service: {
@@ -684,6 +695,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "never" | "always" | "auto" | undefined;
+        split?: boolean | undefined;
     } | undefined;
     image?: {
         service: {

package/dist/core/config/schema.js

@@ -17,7 +17,8 @@ const ASTRO_CONFIG_DEFAULTS = {
     assets: "_astro",
     serverEntry: "entry.mjs",
     redirects: true,
-    inlineStylesheets: "never"
+    inlineStylesheets: "never",
+    split: false
   },
   compressHTML: false,
   server: {
@@ -66,7 +67,8 @@ const AstroConfigSchema = z.object({
     assetsPrefix: z.string().optional(),
     serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
     redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
-    inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
+    inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets),
+    split: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.split)
   }).optional().default({}),
   server: z.preprocess(
     // preprocess
@@ -160,7 +162,8 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
       assetsPrefix: z.string().optional(),
       serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
       redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
-      inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
+      inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets),
+      split: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.split)
     }).optional().default({}),
     server: z.preprocess(
       // preprocess

package/dist/core/config/settings.js

@@ -19,7 +19,7 @@ function createBaseSettings(config) {
     tsConfig: void 0,
     tsConfigPath: void 0,
     adapter: void 0,
-    injectedRoutes: config.experimental.assets && isServerLikeOutput(config) ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint" }] : [],
+    injectedRoutes: config.experimental.assets && isServerLikeOutput(config) ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint", prerender: false }] : [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     contentEntryTypes: [markdownContentEntryType],
     dataEntryTypes: [

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.6.6";
+const ASTRO_VERSION = "2.7.1";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.6.6";
+  const currentVersion = "2.7.1";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/dev/index.js

@@ -15,7 +15,7 @@ async function call(options, logging) {
     env,
     mod: endpointHandler
   });
-  return await callEndpoint(endpointHandler, env, ctx, logging, middleware);
+  return await callEndpoint(endpointHandler, env, ctx, logging, middleware == null ? void 0 : middleware.onRequest);
 }
 export {
   call

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { APIContext, AstroConfig, AstroMiddlewareInstance, EndpointHandler, EndpointOutput, Params } from '../../@types/astro';
+import type { APIContext, AstroConfig, EndpointHandler, EndpointOutput, MiddlewareHandler, Params } from '../../@types/astro';
 import type { Environment, RenderContext } from '../render/index';
 import { AstroCookies } from '../cookies/index.js';
 import { type LogOptions } from '../logger/core.js';
@@ -19,6 +19,6 @@ export declare function createAPIContext({ request, params, site, props, adapter
     props: Record<string, any>;
     adapterName?: string;
 }): APIContext;
-export declare function callEndpoint<MiddlewareResult = Response | EndpointOutput>(mod: EndpointHandler, env: Environment, ctx: RenderContext, logging: LogOptions, middleware?: AstroMiddlewareInstance<MiddlewareResult> | undefined): Promise<EndpointCallResult>;
+export declare function callEndpoint<MiddlewareResult = Response | EndpointOutput>(mod: EndpointHandler, env: Environment, ctx: RenderContext, logging: LogOptions, onRequest?: MiddlewareHandler<MiddlewareResult> | undefined): Promise<EndpointCallResult>;
 export declare function throwIfRedirectNotAllowed(response: Response, config: AstroConfig): void;
 export {};

package/dist/core/endpoint/index.js

@@ -45,6 +45,7 @@ function createAPIContext({
     }
   };
   Object.defineProperty(context, "locals", {
+    enumerable: true,
     get() {
       return Reflect.get(request, clientLocalsSymbol);
     },
@@ -58,7 +59,7 @@ function createAPIContext({
   });
   return context;
 }
-async function callEndpoint(mod, env, ctx, logging, middleware) {
+async function callEndpoint(mod, env, ctx, logging, onRequest) {
   var _a;
   const context = createAPIContext({
     request: ctx.request,
@@ -68,8 +69,7 @@ async function callEndpoint(mod, env, ctx, logging, middleware) {
     adapterName: env.adapterName
   });
   let response;
-  if (middleware && middleware.onRequest) {
-    const onRequest = middleware.onRequest;
+  if (onRequest) {
     response = await callMiddleware(
       env.logging,
       onRequest,

package/dist/core/errors/dev/vite.js

@@ -29,7 +29,6 @@ function enhanceViteSSRError({
       safeError.name = "FailedToLoadModuleSSR";
       safeError.message = AstroErrorData.FailedToLoadModuleSSR.message(importName);
       safeError.hint = AstroErrorData.FailedToLoadModuleSSR.hint;
-      safeError.code = AstroErrorData.FailedToLoadModuleSSR.code;
       const line = lns.findIndex((ln) => ln.includes(importName));
       if (line !== -1) {
         const column = (_b = lns[line]) == null ? void 0 : _b.indexOf(importName);
@@ -55,7 +54,6 @@ function enhanceViteSSRError({
         safeError.message = AstroErrorData.InvalidGlob.message(globPattern);
         safeError.name = "InvalidGlob";
         safeError.hint = AstroErrorData.InvalidGlob.hint;
-        safeError.code = AstroErrorData.InvalidGlob.code;
         safeError.title = AstroErrorData.InvalidGlob.title;
         const line = lns.findIndex((ln) => ln.includes(globPattern));
         if (line !== -1) {
@@ -81,13 +79,7 @@ async function getViteErrorPayload(err) {
   }
   const message = renderErrorMarkdown(err.message.trim(), "html");
   const hint = err.hint ? renderErrorMarkdown(err.hint.trim(), "html") : void 0;
-  const hasDocs = err.type && err.name && [
-    "AstroError",
-    "AggregateError",
-    /* 'CompilerError' ,*/
-    "CSSError",
-    "MarkdownError"
-  ] || ["FailedToLoadModuleSSR", "InvalidGlob"].includes(err.name);
+  const hasDocs = err.name in AstroErrorData;
   const docslink = hasDocs ? `https://docs.astro.build/en/reference/errors/${getKebabErrorName(err.name)}/` : void 0;
   const highlighter = await getHighlighter({ theme: "css-variables" });
   let highlighterLang = (_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.split(".").pop();