astro 4.10.1 → 4.10.3

package/dist/core/constants.d.ts

@@ -27,6 +27,10 @@ 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.astro";
+/**
+ * The value of the `component` field of the default 500 page, which is used when there is no user-provided 404.astro page.
+ */
+export declare const DEFAULT_500_COMPONENT = "astro-default-500.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,8 @@
-const ASTRO_VERSION = "4.10.1";
+const ASTRO_VERSION = "4.10.3";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";
+const DEFAULT_500_COMPONENT = "astro-default-500.astro";
 const REROUTABLE_STATUS_CODES = [404, 500];
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const clientLocalsSymbol = Symbol.for("astro.locals");
@@ -18,6 +19,7 @@ const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
 export {
   ASTRO_VERSION,
   DEFAULT_404_COMPONENT,
+  DEFAULT_500_COMPONENT,
   MIDDLEWARE_PATH_SEGMENT_NAME,
   REROUTABLE_STATUS_CODES,
   REROUTE_DIRECTIVE_HEADER,

package/dist/core/create-vite.js

@@ -5,6 +5,7 @@ import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import { getAssetsPrefix } from "../assets/utils/getAssetsPrefix.js";
 import astroAssetsPlugin from "../assets/vite-plugin-assets.js";
+import astroContainer from "../container/vite-plugin-container.js";
 import {
   astroContentAssetPropagationPlugin,
   astroContentImportPlugin,
@@ -122,7 +123,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroScannerPlugin({ settings, logger }),
       astroInjectEnvTsPlugin({ settings, logger, fs }),
       astroContentVirtualModPlugin({ fs, settings }),
-      astroContentImportPlugin({ fs, settings }),
+      astroContentImportPlugin({ fs, settings, logger }),
       astroContentAssetPropagationPlugin({ mode, settings }),
       vitePluginMiddleware({ settings }),
       vitePluginSSRManifest(),
@@ -131,7 +132,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroTransitions({ settings }),
       astroDevToolbar({ settings, logger }),
       vitePluginFileURL({}),
-      astroInternationalization({ settings })
+      astroInternationalization({ settings }),
+      astroContainer()
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),

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.10.1";
+  const currentVersion = "4.10.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -1068,6 +1068,17 @@ export declare const i18nNotEnabled: {
     message: string;
     hint: string;
 };
+/**
+ * @docs
+ * @description
+ * An i18n utility tried to use the locale from a URL path that does not contain one. You can prevent this error by using pathHasLocale to check URLs for a locale first before using i18n utilities.
+ *
+ */
+export declare const i18nNoLocaleFoundInPath: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @description
@@ -1118,6 +1129,26 @@ export declare const ServerOnlyModule: {
     title: string;
     message: (name: string) => string;
 };
+/**
+ * @docs
+ * @description
+ * `Astro.rewrite()` cannot be used if the request body has already been read. If you need to read the body, first clone the request. For example:
+ *
+ * ```js
+ * const data = await Astro.request.clone().formData();
+ *
+ * Astro.rewrite("/target")
+ * ```
+ *
+ * @see
+ * - [Request.clone()](https://developer.mozilla.org/en-US/docs/Web/API/Request/clone)
+ * - [Astro.rewrite](https://docs.astro.build/en/reference/configuration-reference/#experimentalrewriting)
+ */
+export declare const RewriteWithBodyUsed: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @kind heading

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

@@ -385,6 +385,11 @@ const i18nNotEnabled = {
   message: "The `astro:i18n` module can not be used without enabling i18n in your Astro config.",
   hint: "See https://docs.astro.build/en/guides/internationalization for a guide on setting up i18n."
 };
+const i18nNoLocaleFoundInPath = {
+  name: "i18nNoLocaleFoundInPath",
+  title: "The path doesn't contain any locale",
+  message: "You tried to use an i18n utility on a path that doesn't contain any locale. You can use `pathHasLocale` first to determine if the path has a locale."
+};
 const RouteNotFound = {
   name: "RouteNotFound",
   title: "Route not found.",
@@ -413,6 +418,11 @@ const ServerOnlyModule = {
   title: "Module is only available server-side",
   message: (name) => `The "${name}" module is only available server-side.`
 };
+const RewriteWithBodyUsed = {
+  name: "RewriteWithBodyUsed",
+  title: "Cannot use Astro.rewrite after the request body has been read",
+  message: "Astro.rewrite() cannot be used if the request body has already been read. If you need to read the body, first clone the request."
+};
 const UnknownCSSError = {
   name: "UnknownCSSError",
   title: "Unknown CSS Error."
@@ -626,6 +636,7 @@ export {
   ReservedSlotName,
   ResponseSentError,
   RewriteEncounteredAnError,
+  RewriteWithBodyUsed,
   RouteNotFound,
   ServerOnlyModule,
   StaticClientAddressNotAvailable,
@@ -642,5 +653,6 @@ export {
   UnsupportedConfigTransformError,
   UnsupportedImageConversion,
   UnsupportedImageFormat,
+  i18nNoLocaleFoundInPath,
   i18nNotEnabled
 };

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.10.1";
+  const version = "4.10.3";
   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.10.1"}`
+        `v${"4.10.3"}`
       )} ${headline}`
     );
   }

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

@@ -11,7 +11,7 @@ export declare class RenderContext {
     readonly pipeline: Pipeline;
     locals: App.Locals;
     readonly middleware: MiddlewareHandler;
-    readonly pathname: string;
+    pathname: string;
     request: Request;
     routeData: RouteData;
     status: number;

package/dist/core/render-context.js

@@ -8,7 +8,6 @@ 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,
@@ -77,13 +76,13 @@ class RenderContext {
    * - fallback
    */
   async render(componentInstance, slots = {}) {
-    const { cookies, middleware, pathname, pipeline } = this;
-    const { logger, routeCache, serverLike, streaming } = pipeline;
+    const { cookies, middleware, pipeline } = this;
+    const { logger, serverLike, streaming } = pipeline;
     const props = Object.keys(this.props).length > 0 ? this.props : await getProps({
       mod: componentInstance,
       routeData: this.routeData,
-      routeCache,
-      pathname,
+      routeCache: this.pipeline.routeCache,
+      pathname: this.pathname,
       logger,
       serverLike
     });
@@ -173,7 +172,7 @@ 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);
-      const [routeData, component] = await pipeline.tryRewrite(
+      const [routeData, component, newURL] = await pipeline.tryRewrite(
         reroutePayload,
         this.request,
         this.originalRoute
@@ -182,15 +181,13 @@ class RenderContext {
       if (reroutePayload instanceof Request) {
         this.request = reroutePayload;
       } else {
-        this.request = this.#copyRequest(
-          new URL(routeData.pathname ?? routeData.route, this.url.origin),
-          this.request
-        );
+        this.request = this.#copyRequest(newURL, this.request);
       }
-      this.url = new URL(this.request.url);
+      this.url = newURL;
       this.cookies = new AstroCookies(this.request);
-      this.params = getParams(routeData, url.toString());
+      this.params = getParams(routeData, this.url.pathname);
       this.isRewriting = true;
+      this.pathname = this.url.pathname;
       return await this.render(component);
     };
     return {
@@ -289,10 +286,18 @@ class RenderContext {
    * The page level partial is used as the prototype of the user-visible `Astro` global object, which is instantiated once per use of a component.
    */
   createAstro(result, astroStaticPartial, props, slotValues) {
-    const astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(
-      result,
-      astroStaticPartial
-    );
+    let astroPagePartial;
+    if (this.isRewriting) {
+      astroPagePartial = this.#astroPagePartial = this.createAstroPagePartial(
+        result,
+        astroStaticPartial
+      );
+    } else {
+      astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(
+        result,
+        astroStaticPartial
+      );
+    }
     const astroComponentPartial = { props, self: null };
     const Astro = Object.assign(
       Object.create(astroPagePartial),
@@ -327,7 +332,7 @@ class RenderContext {
     };
     const rewrite = async (reroutePayload) => {
       pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
-      const [routeData, component] = await pipeline.tryRewrite(
+      const [routeData, component, newURL] = await pipeline.tryRewrite(
         reroutePayload,
         this.request,
         this.originalRoute
@@ -336,14 +341,12 @@ class RenderContext {
       if (reroutePayload instanceof Request) {
         this.request = reroutePayload;
       } else {
-        this.request = this.#copyRequest(
-          new URL(routeData.pathname ?? routeData.route, this.url.origin),
-          this.request
-        );
+        this.request = this.#copyRequest(newURL, this.request);
       }
       this.url = new URL(this.request.url);
       this.cookies = new AstroCookies(this.request);
-      this.params = getParams(routeData, url.toString());
+      this.params = getParams(routeData, this.url.pathname);
+      this.pathname = this.url.pathname;
       this.isRewriting = true;
       return await this.render(component);
     };
@@ -433,6 +436,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/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/params.js

@@ -9,7 +9,7 @@ function stringifyParams(params, route) {
     }
     return acc;
   }, {});
-  return JSON.stringify(route.generate(validatedParams));
+  return route.generate(validatedParams);
 }
 export {
   stringifyParams

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/config.d.ts

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

package/dist/env/config.js

@@ -10,6 +10,10 @@ const envField = {
   boolean: (options) => ({
     ...options,
     type: "boolean"
+  }),
+  enum: (options) => ({
+    ...options,
+    type: "enum"
   })
 };
 export {

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
 };