astro 4.9.2 → 4.10.0

package/dist/core/config/schema.js

@@ -3,6 +3,7 @@ import { bundledThemes } from "shiki";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { z } from "zod";
+import { EnvSchema } from "../../env/schema.js";
 import { appendForwardSlash, prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
 const ASTRO_CONFIG_DEFAULTS = {
   root: ".",
@@ -325,7 +326,10 @@ const AstroConfigSchema = z.object({
     contentCollectionJsonSchema: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentCollectionJsonSchema),
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
     globalRoutePriority: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.globalRoutePriority),
-    rewriting: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.rewriting)
+    rewriting: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.rewriting),
+    env: z.object({
+      schema: EnvSchema.optional()
+    }).strict().optional()
   }).strict(
     `Invalid or outdated experimental feature.
 Check for incorrect spelling or outdated Astro version.

package/dist/core/config/settings.js

@@ -92,6 +92,7 @@ function createBaseSettings(config) {
     watchFiles: [],
     devToolbarApps: [],
     timer: new AstroTimer(),
+    dotAstroDir: new URL(".astro/", config.root),
     latestAstroVersion: void 0
     // Will be set later if applicable when the dev server starts
   };

package/dist/core/constants.d.ts

@@ -26,7 +26,7 @@ export declare const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 /**
  * The value of the `component` field of the default 404 page, which is used when there is no user-provided 404.astro page.
  */
-export declare const DEFAULT_404_COMPONENT = "astro-default-404";
+export declare const DEFAULT_404_COMPONENT = "astro-default-404.astro";
 /**
  * A response with one of these status codes will be rewritten
  * with the result of rendering the respective error page.

package/dist/core/constants.js

@@ -1,7 +1,7 @@
-const ASTRO_VERSION = "4.9.2";
+const ASTRO_VERSION = "4.10.0";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
-const DEFAULT_404_COMPONENT = "astro-default-404";
+const DEFAULT_404_COMPONENT = "astro-default-404.astro";
 const REROUTABLE_STATUS_CODES = [404, 500];
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const clientLocalsSymbol = Symbol.for("astro.locals");

package/dist/core/create-vite.js

@@ -10,6 +10,7 @@ import {
   astroContentImportPlugin,
   astroContentVirtualModPlugin
 } from "../content/index.js";
+import { astroEnv } from "../env/vite-plugin-env.js";
 import astroInternationalization from "../i18n/vite-plugin-i18n.js";
 import astroPrefetch from "../prefetch/vite-plugin-prefetch.js";
 import astroDevToolbar from "../toolbar/vite-plugin-dev-toolbar.js";
@@ -110,6 +111,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       // the build to run very slow as the filewatcher is triggered often.
       mode !== "build" && vitePluginAstroServer({ settings, logger, fs }),
       envVitePlugin({ settings }),
+      astroEnv({ settings, mode, fs }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),
       mdxVitePlugin(),

package/dist/core/dev/dev.js

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

package/dist/core/errors/errors-data.d.ts

@@ -1000,6 +1000,27 @@ export declare const MissingMiddlewareForInternationalization: {
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * The user tried to rewrite using a route that doesn't exist, or it emitted a runtime error during its rendering phase.
+ */
+export declare const RewriteEncounteredAnError: {
+    name: string;
+    title: string;
+    message: (route: string, stack?: string) => string;
+};
+/**
+ * @docs
+ * @description
+ *
+ * The user tried to rewrite a 404 page inside a static page.
+ */
+export declare const InvalidRewrite404: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @description
@@ -1050,7 +1071,6 @@ export declare const i18nNotEnabled: {
 /**
  * @docs
  * @description
- *
  * Astro couldn't find a route matching the one provided by the user
  */
 export declare const RouteNotFound: {
@@ -1058,6 +1078,46 @@ export declare const RouteNotFound: {
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * Some environment variables do not match the data type and/or properties defined in `experimental.env.schema`.
+ */
+export declare const EnvInvalidVariables: {
+    name: string;
+    title: string;
+    message: (variables: string) => string;
+};
+/**
+ * @docs
+ * @description
+ * An environment variable does not match the data type and/or properties defined in `experimental.env.schema`.
+ */
+export declare const EnvInvalidVariable: {
+    name: string;
+    title: string;
+    message: (key: string, type: string) => string;
+};
+/**
+ * @docs
+ * @description
+ * The `astro:env/server` exported function `getSecret()` is not supported by your adapter.
+ */
+export declare const EnvUnsupportedGetSecret: {
+    name: string;
+    title: string;
+    message: string;
+};
+/**
+ * @docs
+ * @description
+ * This module is only available server-side.
+ */
+export declare const ServerOnlyModule: {
+    name: string;
+    title: string;
+    message: (name: string) => string;
+};
 /**
  * @docs
  * @kind heading

package/dist/core/errors/errors-data.js

@@ -356,6 +356,16 @@ const MissingMiddlewareForInternationalization = {
   title: "Enabled manual internationalization routing without having a middleware.",
   message: "Your configuration setting `i18n.routing: 'manual'` requires you to provide your own i18n `middleware` file."
 };
+const RewriteEncounteredAnError = {
+  name: "RewriteEncounteredAnError",
+  title: "Astro couldn't find the route to rewrite, or if was found but it emitted an error during the rendering phase.",
+  message: (route, stack) => `The route ${route} that you tried to render doesn't exist, or it emitted an error during the rendering phase. ${stack ? stack : ""}.`
+};
+const InvalidRewrite404 = {
+  name: "InvalidRewrite404",
+  title: "You attempted to rewrite a 404 inside a static page, and this isn't allowed.",
+  message: "Rewriting a 404 is only allowed inside on-demand pages."
+};
 const CantRenderPage = {
   name: "CantRenderPage",
   title: "Astro can't render the route.",
@@ -380,6 +390,29 @@ const RouteNotFound = {
   title: "Route not found.",
   message: `Astro could not find a route that matches the one you requested.`
 };
+const EnvInvalidVariables = {
+  name: "EnvInvalidVariables",
+  title: "Invalid Environment Variables",
+  message: (variables) => `The following environment variables do not match the data type and/or properties defined in \`experimental.env.schema\`:
+
+${variables}
+`
+};
+const EnvInvalidVariable = {
+  name: "EnvInvalidVariable",
+  title: "Invalid Environment Variable",
+  message: (key, type) => `The following environment variable does not match the data type and/or properties defined in \`experimental.env.schema\`: ${key} is not of type ${type}`
+};
+const EnvUnsupportedGetSecret = {
+  name: "EnvUnsupportedGetSecret",
+  title: "Unsupported astro:env getSecret",
+  message: "`astro:env/server` exported function `getSecret` is not supported by your adapter."
+};
+const ServerOnlyModule = {
+  name: "ServerOnlyModule",
+  title: "Module is only available server-side",
+  message: (name) => `The "${name}" module is only available server-side.`
+};
 const UnknownCSSError = {
   name: "UnknownCSSError",
   title: "Unknown CSS Error."
@@ -533,6 +566,9 @@ export {
   DataCollectionEntryParseError,
   DuplicateContentEntrySlugError,
   EndpointDidNotReturnAResponse,
+  EnvInvalidVariable,
+  EnvInvalidVariables,
+  EnvUnsupportedGetSecret,
   ExpectedImage,
   ExpectedImageOptions,
   FailedToFetchRemoteImageDimensions,
@@ -558,6 +594,7 @@ export {
   InvalidGlob,
   InvalidImageService,
   InvalidPrerenderExport,
+  InvalidRewrite404,
   LocalImageUsedWrongly,
   LocalsNotAnObject,
   MarkdownFrontmatterParseError,
@@ -588,7 +625,9 @@ export {
   RedirectWithNoLocation,
   ReservedSlotName,
   ResponseSentError,
+  RewriteEncounteredAnError,
   RouteNotFound,
+  ServerOnlyModule,
   StaticClientAddressNotAvailable,
   StaticRedirectNotAvailable,
   UnhandledRejection,

package/dist/core/logger/core.d.ts

@@ -7,7 +7,7 @@ export type LoggerLevel = 'debug' | 'info' | 'warn' | 'error' | 'silent';
  * rather than specific to a single command, function, use, etc. The label will be
  * shown in the log message to the user, so it should be relevant.
  */
-export type LoggerLabel = 'add' | 'build' | 'check' | 'config' | 'content' | 'deprecated' | 'markdown' | 'router' | 'types' | 'vite' | 'watch' | 'middleware' | 'preferences' | 'redirects' | 'toolbar' | 'assets' | 'update' | 'SKIP_FORMAT';
+export type LoggerLabel = 'add' | 'build' | 'check' | 'config' | 'content' | 'deprecated' | 'markdown' | 'router' | 'types' | 'vite' | 'watch' | 'middleware' | 'preferences' | 'redirects' | 'toolbar' | 'assets' | 'env' | 'update' | 'SKIP_FORMAT';
 export interface LogOptions {
     dest: LogWritable<LogMessage>;
     level: LoggerLevel;

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.9.2";
+  const version = "4.10.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.9.2"}`
+        `v${"4.10.0"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.d.ts

@@ -19,6 +19,7 @@ export declare class RenderContext {
     params: import("../@types/astro.js").Params;
     protected url: URL;
     props: Props;
+    originalRoute: RouteData;
     private constructor();
     /**
      * A flag that tells the render content if the rewriting was triggered

package/dist/core/render-context.js

@@ -8,6 +8,7 @@ import { renderEndpoint } from "../runtime/server/endpoint.js";
 import { renderPage } from "../runtime/server/index.js";
 import {
   ASTRO_VERSION,
+  DEFAULT_404_COMPONENT,
   REROUTE_DIRECTIVE_HEADER,
   ROUTE_TYPE_HEADER,
   clientAddressSymbol,
@@ -33,7 +34,10 @@ class RenderContext {
     this.params = params;
     this.url = url;
     this.props = props;
+    this.originalRoute = routeData;
   }
+  // The first route that this instance of the context attempts to render
+  originalRoute;
   /**
    * A flag that tells the render content if the rewriting was triggered
    */
@@ -95,18 +99,14 @@ class RenderContext {
     const lastNext = async (ctx, payload) => {
       if (payload) {
         if (this.pipeline.manifest.rewritingEnabled) {
-          try {
-            const [routeData, component] = await pipeline.tryRewrite(payload, this.request);
-            this.routeData = routeData;
-            componentInstance = component;
-          } catch (e) {
-            return new Response("Not found", {
-              status: 404,
-              statusText: "Not found"
-            });
-          } finally {
-            this.isRewriting = true;
-          }
+          const [routeData, component] = await pipeline.tryRewrite(
+            payload,
+            this.request,
+            this.originalRoute
+          );
+          this.routeData = routeData;
+          componentInstance = component;
+          this.isRewriting = true;
         } else {
           this.pipeline.logger.warn(
             "router",
@@ -173,29 +173,25 @@ class RenderContext {
     const redirect = (path, status = 302) => new Response(null, { status, headers: { Location: path } });
     const rewrite = async (reroutePayload) => {
       pipeline.logger.debug("router", "Called rewriting to:", reroutePayload);
-      try {
-        const [routeData, component] = await pipeline.tryRewrite(reroutePayload, this.request);
-        this.routeData = routeData;
-        if (reroutePayload instanceof Request) {
-          this.request = reroutePayload;
-        } else {
-          this.request = new Request(
-            new URL(routeData.pathname ?? routeData.route, this.url.origin),
-            this.request
-          );
-        }
-        this.url = new URL(this.request.url);
-        this.cookies = new AstroCookies(this.request);
-        this.params = getParams(routeData, url.toString());
-        this.isRewriting = true;
-        return await this.render(component);
-      } catch (e) {
-        pipeline.logger.debug("router", "Rewrite failed.", e);
-        return new Response("Not found", {
-          status: 404,
-          statusText: "Not found"
-        });
+      const [routeData, component] = await pipeline.tryRewrite(
+        reroutePayload,
+        this.request,
+        this.originalRoute
+      );
+      this.routeData = routeData;
+      if (reroutePayload instanceof Request) {
+        this.request = reroutePayload;
+      } else {
+        this.request = this.#copyRequest(
+          new URL(routeData.pathname ?? routeData.route, this.url.origin),
+          this.request
+        );
       }
+      this.url = new URL(this.request.url);
+      this.cookies = new AstroCookies(this.request);
+      this.params = getParams(routeData, url.toString());
+      this.isRewriting = true;
+      return await this.render(component);
     };
     return {
       cookies,
@@ -330,30 +326,26 @@ class RenderContext {
       return new Response(null, { status, headers: { Location: path } });
     };
     const rewrite = async (reroutePayload) => {
-      try {
-        pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
-        const [routeData, component] = await pipeline.tryRewrite(reroutePayload, this.request);
-        this.routeData = routeData;
-        if (reroutePayload instanceof Request) {
-          this.request = reroutePayload;
-        } else {
-          this.request = new Request(
-            new URL(routeData.pathname ?? routeData.route, this.url.origin),
-            this.request
-          );
-        }
-        this.url = new URL(this.request.url);
-        this.cookies = new AstroCookies(this.request);
-        this.params = getParams(routeData, url.toString());
-        this.isRewriting = true;
-        return await this.render(component);
-      } catch (e) {
-        pipeline.logger.debug("router", "Rerouting failed, returning a 404.", e);
-        return new Response("Not found", {
-          status: 404,
-          statusText: "Not found"
-        });
+      pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
+      const [routeData, component] = await pipeline.tryRewrite(
+        reroutePayload,
+        this.request,
+        this.originalRoute
+      );
+      this.routeData = routeData;
+      if (reroutePayload instanceof Request) {
+        this.request = reroutePayload;
+      } else {
+        this.request = this.#copyRequest(
+          new URL(routeData.pathname ?? routeData.route, this.url.origin),
+          this.request
+        );
       }
+      this.url = new URL(this.request.url);
+      this.cookies = new AstroCookies(this.request);
+      this.params = getParams(routeData, url.toString());
+      this.isRewriting = true;
+      return await this.render(component);
     };
     return {
       generator: astroStaticPartial.generator,
@@ -434,6 +426,31 @@ class RenderContext {
     if (!i18n) return;
     return this.#preferredLocaleList ??= computePreferredLocaleList(request, i18n.locales);
   }
+  /**
+   * Utility function that creates a new `Request` with a new URL from an old `Request`.
+   *
+   * @param newUrl The new `URL`
+   * @param oldRequest The old `Request`
+   */
+  #copyRequest(newUrl, oldRequest) {
+    return new Request(newUrl, {
+      method: oldRequest.method,
+      headers: oldRequest.headers,
+      body: oldRequest.body,
+      referrer: oldRequest.referrer,
+      referrerPolicy: oldRequest.referrerPolicy,
+      mode: oldRequest.mode,
+      credentials: oldRequest.credentials,
+      cache: oldRequest.cache,
+      redirect: oldRequest.redirect,
+      integrity: oldRequest.integrity,
+      signal: oldRequest.signal,
+      keepalive: oldRequest.keepalive,
+      // https://fetch.spec.whatwg.org/#dom-request-duplex
+      // @ts-expect-error It isn't part of the types, but undici accepts it and it allows to carry over the body to a new request
+      duplex: "half"
+    });
+  }
 }
 export {
   RenderContext

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

@@ -1,2 +1,9 @@
-import type { ManifestData } from '../../@types/astro.js';
+import type { ManifestData, RouteData } from '../../@types/astro.js';
+export declare const DEFAULT_404_ROUTE: RouteData;
 export declare function ensure404Route(manifest: ManifestData): ManifestData;
+export declare function default404Page({ pathname }: {
+    pathname: string;
+}): Promise<Response>;
+export declare namespace default404Page {
+    var isAstroComponentFactory: boolean;
+}

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

@@ -1,21 +1,38 @@
+import notFoundTemplate from "../../template/4xx.js";
 import { DEFAULT_404_COMPONENT } from "../constants.js";
+const DEFAULT_404_ROUTE = {
+  component: DEFAULT_404_COMPONENT,
+  generate: () => "",
+  params: [],
+  pattern: /\/404/,
+  prerender: false,
+  pathname: "/404",
+  segments: [[{ content: "404", dynamic: false, spread: false }]],
+  type: "page",
+  route: "/404",
+  fallbackRoutes: [],
+  isIndex: false
+};
 function ensure404Route(manifest) {
   if (!manifest.routes.some((route) => route.route === "/404")) {
-    manifest.routes.push({
-      component: DEFAULT_404_COMPONENT,
-      generate: () => "",
-      params: [],
-      pattern: /\/404/,
-      prerender: false,
-      segments: [[{ content: "404", dynamic: false, spread: false }]],
-      type: "page",
-      route: "/404",
-      fallbackRoutes: [],
-      isIndex: false
-    });
+    manifest.routes.push(DEFAULT_404_ROUTE);
   }
   return manifest;
 }
+async function default404Page({ pathname }) {
+  return new Response(
+    notFoundTemplate({
+      statusCode: 404,
+      title: "Not found",
+      tabTitle: "404: Not Found",
+      pathname
+    }),
+    { status: 404, headers: { "Content-Type": "text/html; charset=utf-8" } }
+  );
+}
+default404Page.isAstroComponentFactory = true;
 export {
+  DEFAULT_404_ROUTE,
+  default404Page,
   ensure404Route
 };

package/dist/env/config.d.ts

@@ -0,0 +1,9 @@
+import type { BooleanField, BooleanFieldInput, NumberField, NumberFieldInput, StringField, StringFieldInput } from './schema.js';
+/**
+ * Return a valid env field to use in this Astro config for `experimental.env.schema`.
+ */
+export declare const envField: {
+    string: (options: StringFieldInput) => StringField;
+    number: (options: NumberFieldInput) => NumberField;
+    boolean: (options: BooleanFieldInput) => BooleanField;
+};

package/dist/env/config.js

@@ -0,0 +1,17 @@
+const envField = {
+  string: (options) => ({
+    ...options,
+    type: "string"
+  }),
+  number: (options) => ({
+    ...options,
+    type: "number"
+  }),
+  boolean: (options) => ({
+    ...options,
+    type: "boolean"
+  })
+};
+export {
+  envField
+};

package/dist/env/constants.d.ts

@@ -0,0 +1,11 @@
+export declare const VIRTUAL_MODULES_IDS: {
+    client: string;
+    server: string;
+    internal: string;
+};
+export declare const VIRTUAL_MODULES_IDS_VALUES: Set<string>;
+export declare const VIRTUAL_MODULE_SETUP_ID = "astro:env/setup";
+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

@@ -0,0 +1,21 @@
+const VIRTUAL_MODULES_IDS = {
+  client: "astro:env/client",
+  server: "astro:env/server",
+  internal: "virtual:astro:env/internal"
+};
+const VIRTUAL_MODULES_IDS_VALUES = new Set(Object.values(VIRTUAL_MODULES_IDS));
+const VIRTUAL_MODULE_SETUP_ID = "astro:env/setup";
+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);
+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,
+  VIRTUAL_MODULE_SETUP_ID
+};

package/dist/env/runtime.d.ts

@@ -0,0 +1,6 @@
+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 getEnv(...args: Parameters<GetEnv>): string | undefined;
+export declare function createInvalidVariableError(...args: Parameters<typeof AstroErrorData.EnvInvalidVariable.message>): AstroError;

package/dist/env/runtime.js

@@ -0,0 +1,21 @@
+import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { validateEnvVariable } from "./validators.js";
+let _getEnv = (key) => process.env[key];
+function setGetEnv(fn) {
+  _getEnv = fn;
+}
+function getEnv(...args) {
+  return _getEnv(...args);
+}
+function createInvalidVariableError(...args) {
+  return new AstroError({
+    ...AstroErrorData.EnvInvalidVariable,
+    message: AstroErrorData.EnvInvalidVariable.message(...args)
+  });
+}
+export {
+  createInvalidVariableError,
+  getEnv,
+  setGetEnv,
+  validateEnvVariable
+};