astro 4.10.0 → 4.10.2

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.10.0";
+const ASTRO_VERSION = "4.10.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

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.0";
+  const currentVersion = "4.10.2";
   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

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.",
@@ -642,5 +647,6 @@ export {
   UnsupportedConfigTransformError,
   UnsupportedImageConversion,
   UnsupportedImageFormat,
+  i18nNoLocaleFoundInPath,
   i18nNotEnabled
 };

package/dist/core/messages.js

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

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

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 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);
@@ -16,6 +15,5 @@ export {
   PUBLIC_PREFIX,
   TYPES_TEMPLATE_URL,
   VIRTUAL_MODULES_IDS,
-  VIRTUAL_MODULES_IDS_VALUES,
-  VIRTUAL_MODULE_SETUP_ID
+  VIRTUAL_MODULES_IDS_VALUES
 };