astro 4.10.2 → 4.11.0

package/dist/core/render-context.js

@@ -15,6 +15,7 @@ import {
   responseSentSymbol
 } from "./constants.js";
 import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
+import { getFromResponse } from "./cookies/response.js";
 import { AstroError, AstroErrorData } from "./errors/index.js";
 import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
@@ -52,7 +53,8 @@ class RenderContext {
     pipeline,
     request,
     routeData,
-    status = 200
+    status = 200,
+    props
   }) {
     return new RenderContext(
       pipeline,
@@ -61,7 +63,11 @@ class RenderContext {
       pathname,
       request,
       routeData,
-      status
+      status,
+      void 0,
+      void 0,
+      void 0,
+      props
     );
   }
   /**
@@ -113,14 +119,16 @@ class RenderContext {
           );
         }
       }
+      let response2;
       switch (this.routeData.type) {
-        case "endpoint":
-          return renderEndpoint(componentInstance, ctx, serverLike, logger);
+        case "endpoint": {
+          response2 = await renderEndpoint(componentInstance, ctx, serverLike, logger);
+          break;
+        }
         case "redirect":
           return renderRedirect(this);
         case "page": {
           const result = await this.createResult(componentInstance);
-          let response2;
           try {
             response2 = await renderPage(
               result,
@@ -138,12 +146,17 @@ class RenderContext {
           if (this.routeData.route === "/404" || this.routeData.route === "/500" || this.isRewriting) {
             response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
           }
-          return response2;
+          break;
         }
         case "fallback": {
           return new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } });
         }
       }
+      const responseCookies = getFromResponse(response2);
+      if (responseCookies) {
+        cookies.merge(responseCookies);
+      }
+      return response2;
     };
     const response = await callMiddleware(
       middleware,
@@ -436,6 +449,9 @@ class RenderContext {
    * @param oldRequest The old `Request`
    */
   #copyRequest(newUrl, oldRequest) {
+    if (oldRequest.bodyUsed) {
+      throw new AstroError(AstroErrorData.RewriteWithBodyUsed);
+    }
     return new Request(newUrl, {
       method: oldRequest.method,
       headers: oldRequest.headers,

package/dist/core/request.js

@@ -12,7 +12,13 @@ function createRequest({
   locals,
   staticLike = false
 }) {
-  const headersObj = staticLike ? void 0 : headers instanceof Headers ? headers : new Headers(Object.entries(headers));
+  const headersObj = staticLike ? void 0 : headers instanceof Headers ? headers : new Headers(
+    // Filter out HTTP/2 pseudo-headers. These are internally-generated headers added to all HTTP/2 requests with trusted metadata about the request.
+    // Examples include `:method`, `:scheme`, `:authority`, and `:path`.
+    // They are always prefixed with a colon to distinguish them from other headers, and it is an error to add the to a Headers object manually.
+    // See https://httpwg.org/specs/rfc7540.html#HttpRequest
+    Object.entries(headers).filter(([name]) => !name.startsWith(":"))
+  );
   if (typeof url === "string") url = new URL(url);
   const imageEndpoint = prependForwardSlash(appendForwardSlash(base)) + "_image";
   if (staticLike && url.pathname !== imageEndpoint) {

package/dist/core/routing/astro-designed-error-pages.d.ts

@@ -1,5 +1,6 @@
 import type { ManifestData, RouteData } from '../../@types/astro.js';
 export declare const DEFAULT_404_ROUTE: RouteData;
+export declare const DEFAULT_500_ROUTE: RouteData;
 export declare function ensure404Route(manifest: ManifestData): ManifestData;
 export declare function default404Page({ pathname }: {
     pathname: string;

package/dist/core/routing/astro-designed-error-pages.js

@@ -1,5 +1,5 @@
 import notFoundTemplate from "../../template/4xx.js";
-import { DEFAULT_404_COMPONENT } from "../constants.js";
+import { DEFAULT_404_COMPONENT, DEFAULT_500_COMPONENT } from "../constants.js";
 const DEFAULT_404_ROUTE = {
   component: DEFAULT_404_COMPONENT,
   generate: () => "",
@@ -13,6 +13,19 @@ const DEFAULT_404_ROUTE = {
   fallbackRoutes: [],
   isIndex: false
 };
+const DEFAULT_500_ROUTE = {
+  component: DEFAULT_500_COMPONENT,
+  generate: () => "",
+  params: [],
+  pattern: /\/500/,
+  prerender: false,
+  pathname: "/500",
+  segments: [[{ content: "500", dynamic: false, spread: false }]],
+  type: "page",
+  route: "/500",
+  fallbackRoutes: [],
+  isIndex: false
+};
 function ensure404Route(manifest) {
   if (!manifest.routes.some((route) => route.route === "/404")) {
     manifest.routes.push(DEFAULT_404_ROUTE);
@@ -33,6 +46,7 @@ async function default404Page({ pathname }) {
 default404Page.isAstroComponentFactory = true;
 export {
   DEFAULT_404_ROUTE,
+  DEFAULT_500_ROUTE,
   default404Page,
   ensure404Route
 };

package/dist/core/routing/rewrite.d.ts

@@ -0,0 +1,10 @@
+import type { AstroConfig, RewritePayload, RouteData } from '../../@types/astro.js';
+export type FindRouteToRewrite = {
+    payload: RewritePayload;
+    routes: RouteData[];
+    request: Request;
+    trailingSlash: AstroConfig['trailingSlash'];
+    buildFormat: AstroConfig['build']['format'];
+    base: AstroConfig['base'];
+};
+export declare function findRouteToRewrite({ payload, routes, request, trailingSlash, buildFormat, base, }: FindRouteToRewrite): [RouteData, URL];

package/dist/core/routing/rewrite.js

@@ -0,0 +1,41 @@
+import { shouldAppendForwardSlash } from "../build/util.js";
+import { appendForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import { DEFAULT_404_ROUTE } from "./astro-designed-error-pages.js";
+function findRouteToRewrite({
+  payload,
+  routes,
+  request,
+  trailingSlash,
+  buildFormat,
+  base
+}) {
+  let finalUrl = void 0;
+  if (payload instanceof URL) {
+    finalUrl = payload;
+  } else if (payload instanceof Request) {
+    finalUrl = new URL(payload.url);
+  } else {
+    finalUrl = new URL(payload, new URL(request.url).origin);
+  }
+  let foundRoute;
+  for (const route of routes) {
+    const pathname = shouldAppendForwardSlash(trailingSlash, buildFormat) ? appendForwardSlash(finalUrl.pathname) : base !== "/" ? removeTrailingForwardSlash(finalUrl.pathname) : finalUrl.pathname;
+    if (route.pattern.test(decodeURI(pathname))) {
+      foundRoute = route;
+      break;
+    }
+  }
+  if (foundRoute) {
+    return [foundRoute, finalUrl];
+  } else {
+    const custom404 = routes.find((route) => route.route === "/404");
+    if (custom404) {
+      return [custom404, finalUrl];
+    } else {
+      return [DEFAULT_404_ROUTE, finalUrl];
+    }
+  }
+}
+export {
+  findRouteToRewrite
+};

package/dist/core/util.js

@@ -78,8 +78,11 @@ function isInjectedRoute(file, settings) {
   return false;
 }
 function isPublicRoute(file, config) {
-  const pagesDir = resolvePages(config);
-  const parts = file.toString().replace(pagesDir.toString(), "").split("/").slice(1);
+  const rootDir = config.root.toString();
+  const pagesDir = resolvePages(config).toString();
+  const fileDir = file.toString();
+  const normalizedDir = fileDir.startsWith(pagesDir) ? fileDir.slice(pagesDir.length) : fileDir.slice(rootDir.length);
+  const parts = normalizedDir.replace(pagesDir.toString(), "").split("/").slice(1);
   for (const part of parts) {
     if (part.startsWith("_")) return false;
   }

package/dist/env/constants.d.ts

@@ -4,7 +4,6 @@ export declare const VIRTUAL_MODULES_IDS: {
     internal: string;
 };
 export declare const VIRTUAL_MODULES_IDS_VALUES: Set<string>;
-export declare const PUBLIC_PREFIX = "PUBLIC_";
 export declare const ENV_TYPES_FILE = "env.d.ts";
 export declare const MODULE_TEMPLATE_URL: URL;
 export declare const TYPES_TEMPLATE_URL: URL;

package/dist/env/constants.js

@@ -4,7 +4,6 @@ const VIRTUAL_MODULES_IDS = {
   internal: "virtual:astro:env/internal"
 };
 const VIRTUAL_MODULES_IDS_VALUES = new Set(Object.values(VIRTUAL_MODULES_IDS));
-const PUBLIC_PREFIX = "PUBLIC_";
 const ENV_TYPES_FILE = "env.d.ts";
 const PKG_BASE = new URL("../../", import.meta.url);
 const MODULE_TEMPLATE_URL = new URL("templates/env/module.mjs", PKG_BASE);
@@ -12,7 +11,6 @@ const TYPES_TEMPLATE_URL = new URL("templates/env/types.d.ts", PKG_BASE);
 export {
   ENV_TYPES_FILE,
   MODULE_TEMPLATE_URL,
-  PUBLIC_PREFIX,
   TYPES_TEMPLATE_URL,
   VIRTUAL_MODULES_IDS,
   VIRTUAL_MODULES_IDS_VALUES

package/dist/env/runtime.d.ts

@@ -1,6 +1,8 @@
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
 export { validateEnvVariable } from './validators.js';
 export type GetEnv = (key: string) => string | undefined;
-export declare function setGetEnv(fn: GetEnv): void;
+export declare function setGetEnv(fn: GetEnv, reset?: boolean): void;
+declare let _onSetGetEnv: (reset: boolean) => void;
+export declare function setOnSetGetEnv(fn: typeof _onSetGetEnv): void;
 export declare function getEnv(...args: Parameters<GetEnv>): string | undefined;
 export declare function createInvalidVariableError(...args: Parameters<typeof AstroErrorData.EnvInvalidVariable.message>): AstroError;

package/dist/env/runtime.js

@@ -1,8 +1,14 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { validateEnvVariable } from "./validators.js";
 let _getEnv = (key) => process.env[key];
-function setGetEnv(fn) {
+function setGetEnv(fn, reset = false) {
   _getEnv = fn;
+  _onSetGetEnv(reset);
+}
+let _onSetGetEnv = (reset) => {
+};
+function setOnSetGetEnv(fn) {
+  _onSetGetEnv = fn;
 }
 function getEnv(...args) {
   return _getEnv(...args);
@@ -17,5 +23,6 @@ export {
   createInvalidVariableError,
   getEnv,
   setGetEnv,
+  setOnSetGetEnv,
   validateEnvVariable
 };

package/dist/env/schema.d.ts

@@ -220,7 +220,7 @@ declare const EnvFieldMetadata: z.ZodUnion<[z.ZodObject<{
     context: "server";
     access: "secret";
 }>]>;
-export declare const EnvSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodIntersection<z.ZodUnion<[z.ZodObject<{
+export declare const EnvSchema: z.ZodRecord<z.ZodString, z.ZodIntersection<z.ZodUnion<[z.ZodObject<{
     context: z.ZodLiteral<"client">;
     access: z.ZodLiteral<"public">;
 }, "strip", z.ZodTypeAny, {
@@ -344,83 +344,7 @@ export declare const EnvSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodInter
     values: string[];
     default?: string | undefined;
     optional?: boolean | undefined;
-}>]>>>, Record<string, ({
-    context: "client";
-    access: "public";
-} | {
-    context: "server";
-    access: "public";
-} | {
-    context: "server";
-    access: "secret";
-}) & ({
-    type: "string";
-    length?: number | undefined;
-    includes?: string | undefined;
-    endsWith?: string | undefined;
-    startsWith?: string | undefined;
-    default?: string | undefined;
-    url?: boolean | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-} | {
-    type: "number";
-    default?: number | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-    gt?: number | undefined;
-    lt?: number | undefined;
-    int?: boolean | undefined;
-} | {
-    type: "boolean";
-    default?: boolean | undefined;
-    optional?: boolean | undefined;
-} | {
-    type: "enum";
-    values: string[];
-    default?: string | undefined;
-    optional?: boolean | undefined;
-})>, Record<string, ({
-    context: "client";
-    access: "public";
-} | {
-    context: "server";
-    access: "public";
-} | {
-    context: "server";
-    access: "secret";
-}) & ({
-    type: "string";
-    length?: number | undefined;
-    includes?: string | undefined;
-    endsWith?: string | undefined;
-    startsWith?: string | undefined;
-    default?: string | undefined;
-    url?: boolean | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-} | {
-    type: "number";
-    default?: number | undefined;
-    optional?: boolean | undefined;
-    min?: number | undefined;
-    max?: number | undefined;
-    gt?: number | undefined;
-    lt?: number | undefined;
-    int?: boolean | undefined;
-} | {
-    type: "boolean";
-    default?: boolean | undefined;
-    optional?: boolean | undefined;
-} | {
-    type: "enum";
-    values: string[];
-    default?: string | undefined;
-    optional?: boolean | undefined;
-})>>;
+}>]>>>;
 type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};

package/dist/env/schema.js

@@ -1,5 +1,4 @@
 import { z } from "zod";
-import { PUBLIC_PREFIX } from "./constants.js";
 const StringSchema = z.object({
   type: z.literal("string"),
   optional: z.boolean().optional(),
@@ -76,22 +75,7 @@ const EnvSchema = z.record(
     message: "A valid variable name can only contain uppercase letters and underscores."
   }),
   z.intersection(EnvFieldMetadata, EnvFieldType)
-).superRefine((schema, ctx) => {
-  for (const [key, value] of Object.entries(schema)) {
-    if (key.startsWith(PUBLIC_PREFIX) && value.access !== "public") {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `An environment variable whose name is prefixed by "${PUBLIC_PREFIX}" must be public.`
-      });
-    }
-    if (value.access === "public" && !key.startsWith(PUBLIC_PREFIX)) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `An environment variable that is public must have a name prefixed by "${PUBLIC_PREFIX}".`
-      });
-    }
-  }
-});
+);
 export {
   EnvSchema
 };

package/dist/env/vite-plugin-env.js

@@ -46,9 +46,8 @@ function astroEnv({
         fs,
         content: getDts({
           fs,
-          clientPublic: clientTemplates.types,
-          serverPublic: serverTemplates.types.public,
-          serverSecret: serverTemplates.types.secret
+          client: clientTemplates.types,
+          server: serverTemplates.types
         })
       });
     },
@@ -119,13 +118,12 @@ function validatePublicVariables({
   return valid;
 }
 function getDts({
-  clientPublic,
-  serverPublic,
-  serverSecret,
+  client,
+  server,
   fs
 }) {
   const template = fs.readFileSync(TYPES_TEMPLATE_URL, "utf-8");
-  return template.replace("// @@CLIENT@@", clientPublic).replace("// @@SERVER@@", serverPublic).replace("// @@SECRET_VALUES@@", serverSecret);
+  return template.replace("// @@CLIENT@@", client).replace("// @@SERVER@@", server);
 }
 function getClientTemplates({
   validatedVariables
@@ -148,26 +146,28 @@ function getServerTemplates({
   fs
 }) {
   let module = fs.readFileSync(MODULE_TEMPLATE_URL, "utf-8");
-  let publicTypes = "";
-  let secretTypes = "";
+  let types = "";
+  let onSetGetEnv = "";
   for (const { key, type, value } of validatedVariables.filter((e) => e.context === "server")) {
     module += `export const ${key} = ${JSON.stringify(value)};`;
-    publicTypes += `export const ${key}: ${type};	
+    types += `export const ${key}: ${type};	
 `;
   }
   for (const [key, options] of Object.entries(schema)) {
     if (!(options.context === "server" && options.access === "secret")) {
       continue;
     }
-    secretTypes += `${key}: ${getEnvFieldType(options)};		
+    types += `export const ${key}: ${getEnvFieldType(options)};		
+`;
+    module += `export let ${key} = _internalGetSecret(${JSON.stringify(key)});
+`;
+    onSetGetEnv += `${key} = reset ? undefined : _internalGetSecret(${JSON.stringify(key)});
 `;
   }
+  module = module.replace("// @@ON_SET_GET_ENV@@", onSetGetEnv);
   return {
     module,
-    types: {
-      public: publicTypes,
-      secret: secretTypes
-    }
+    types
   };
 }
 export {

package/dist/jsx/server.d.ts

@@ -1,3 +1,4 @@
+import type { NamedSSRLoadedRendererValue } from '../@types/astro.js';
 export declare function check(Component: any, props: any, { default: children, ...slotted }?: {
     default?: null | undefined;
 }): Promise<any>;
@@ -6,8 +7,5 @@ export declare function renderToStaticMarkup(this: any, Component: any, props?:
 }): Promise<{
     html: any;
 }>;
-declare const _default: {
-    check: typeof check;
-    renderToStaticMarkup: typeof renderToStaticMarkup;
-};
-export default _default;
+declare const renderer: NamedSSRLoadedRendererValue;
+export default renderer;

package/dist/jsx/server.js

@@ -44,10 +44,12 @@ function throwEnhancedErrorIfMdxComponent(error, Component) {
     });
   }
 }
-var server_default = {
+const renderer = {
+  name: "astro:jsx",
   check,
   renderToStaticMarkup
 };
+var server_default = renderer;
 export {
   check,
   server_default as default,

package/dist/vite-plugin-astro/index.js

@@ -148,7 +148,7 @@ File: ${id}`
     },
     async transform(source, id) {
       const parsedId = parseAstroRequest(id);
-      if (!id.endsWith(".astro") || parsedId.query.astro) {
+      if (!parsedId.filename.endsWith(".astro") || parsedId.query.astro) {
         return;
       }
       const filename = normalizePath(parsedId.filename);

package/dist/vite-plugin-astro-server/pipeline.d.ts

@@ -19,7 +19,6 @@ export declare class DevPipeline extends Pipeline {
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;
     clearRouteCache(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
+    tryRewrite(payload: RewritePayload, request: Request, _sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     setManifestData(manifestData: ManifestData): void;
-    rewriteKnownRoute(route: string, sourceRoute: RouteData): ComponentInstance;
 }

package/dist/vite-plugin-astro-server/pipeline.js

@@ -1,12 +1,15 @@
 import { fileURLToPath } from "node:url";
 import { getInfoOutput } from "../cli/info/index.js";
 import {} from "../core/base-pipeline.js";
+import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { ASTRO_VERSION, DEFAULT_404_COMPONENT } from "../core/constants.js";
 import { enhanceViteSSRError } from "../core/errors/dev/index.js";
-import { InvalidRewrite404, RewriteEncounteredAnError } from "../core/errors/errors-data.js";
+import { RewriteEncounteredAnError } from "../core/errors/errors-data.js";
 import { AggregateError, AstroError, CSSError, MarkdownError } from "../core/errors/index.js";
+import { prependForwardSlash, removeTrailingForwardSlash } from "../core/path.js";
 import { Pipeline, loadRenderer } from "../core/render/index.js";
 import { DEFAULT_404_ROUTE, default404Page } from "../core/routing/astro-designed-error-pages.js";
+import { findRouteToRewrite } from "../core/routing/rewrite.js";
 import { isPage, isServerLikeOutput, resolveIdToUrl, viteID } from "../core/util.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { getStylesForURL } from "./css.js";
@@ -133,54 +136,24 @@ class DevPipeline extends Pipeline {
       return await this.preload(routeData, filePath);
     }
   }
-  async tryRewrite(payload, request, sourceRoute) {
-    let foundRoute;
+  async tryRewrite(payload, request, _sourceRoute) {
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
     }
-    let finalUrl = void 0;
-    for (const route of this.manifestData.routes) {
-      if (payload instanceof URL) {
-        finalUrl = payload;
-      } else if (payload instanceof Request) {
-        finalUrl = new URL(payload.url);
-      } else {
-        finalUrl = new URL(payload, new URL(request.url).origin);
-      }
-      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
-        foundRoute = route;
-        break;
-      } else if (finalUrl.pathname === "/404") {
-        foundRoute = DEFAULT_404_ROUTE;
-        break;
-      }
-    }
-    if (foundRoute && finalUrl) {
-      if (foundRoute.pathname === "/404") {
-        const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      } else {
-        const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      }
-    } else {
-      throw new AstroError({
-        ...RewriteEncounteredAnError,
-        message: RewriteEncounteredAnError.message(payload.toString())
-      });
-    }
+    const [foundRoute, finalUrl] = findRouteToRewrite({
+      payload,
+      request,
+      routes: this.manifestData?.routes,
+      trailingSlash: this.config.trailingSlash,
+      buildFormat: this.config.build.format,
+      base: this.config.base
+    });
+    const componentInstance = await this.getComponentByRoute(foundRoute);
+    return [foundRoute, componentInstance, finalUrl];
   }
   setManifestData(manifestData) {
     this.manifestData = manifestData;
   }
-  rewriteKnownRoute(route, sourceRoute) {
-    if (isServerLikeOutput(this.config) && sourceRoute.prerender) {
-      if (route === "/404") {
-        return { default: default404Page };
-      }
-    }
-    throw new AstroError(InvalidRewrite404);
-  }
 }
 export {
   DevPipeline

package/dist/vite-plugin-astro-server/request.js

@@ -11,7 +11,7 @@ async function handleRequest({
   incomingResponse
 }) {
   const { config, loader } = pipeline;
-  const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers.host}`;
+  const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers[":authority"] ?? incomingRequest.headers.host}`;
   const url = new URL(origin + incomingRequest.url);
   let pathname;
   if (config.trailingSlash === "never" && !incomingRequest.url) {