astro 7.1.0 → 7.1.1

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "7.1.0";
+  version = "7.1.1";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -196,7 +196,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "7.1.0") {
+    if (previousAstroVersion && previousAstroVersion !== "7.1.1") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -204,8 +204,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("7.1.0") {
-      this.#store.metaStore().set("astro-version", "7.1.0");
+    if ("7.1.1") {
+      this.#store.metaStore().set("astro-version", "7.1.1");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.1.0";
+const ASTRO_VERSION = "7.1.1";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

package/dist/core/dev/dev.js

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

package/dist/core/fetch/fetch-state.js

@@ -1,6 +1,7 @@
 import colors from "piccolore";
 import {
   collapseDuplicateLeadingSlashes,
+  collapseDuplicateSlashes,
   prependForwardSlash,
   removeTrailingForwardSlash
 } from "@astrojs/internal-helpers/path";
@@ -28,7 +29,6 @@ import {
 import { getParams, getProps } from "../render/index.js";
 import { Rewrites } from "../rewrites/handler.js";
 import { isRoute404or500, isRouteServerIsland } from "../routing/match.js";
-import { normalizeUrl } from "../util/normalized-url.js";
 import { MultiLevelEncodingError, validateAndDecodePathname } from "../util/pathname.js";
 import { getOriginPathname, setOriginPathname } from "../routing/rewrite.js";
 import { computePathnameFromDomain } from "../i18n/domain.js";
@@ -178,28 +178,29 @@ class FetchState {
     this.componentInstance = void 0;
     this.slots = void 0;
     const url = new URL(request.url);
+    const publicPathname = this.#normalizePathname(url.pathname);
+    const pathname = this.#computePathname(publicPathname);
+    url.pathname = publicPathname;
+    url.pathname = collapseDuplicateSlashes(url.pathname);
     const domainPathname = computePathnameFromDomain(
       request,
       url,
       pipeline.manifest.i18n,
       pipeline.manifest.base,
       pipeline.manifest.trailingSlash,
-      pipeline.logger
+      pipeline.logger,
+      pathname
     );
     if (domainPathname) {
       this.#domainPathname = domainPathname;
-      try {
-        this.pathname = decodeURI(domainPathname);
-      } catch {
-        this.pathname = domainPathname;
-      }
+      this.pathname = domainPathname;
     } else {
-      this.pathname = this.#computePathname(url);
+      this.pathname = pathname;
     }
     this.timeStart = performance.now();
     this.clientAddress = options?.clientAddress;
     this.locals = options?.locals ?? {};
-    this.url = normalizeUrl(url);
+    this.url = url;
     this.cookies = new AstroCookies(request);
     if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0 && !this.routeData?.prerender) {
       this.#applyForwardedHeaders();
@@ -732,32 +733,37 @@ class FetchState {
     this.#stripHtmlExtension();
   }
   /**
-   * Strips the pipeline's base from the request URL, prepends a forward
-   * slash, and decodes the pathname. Falls back to the raw (not decoded)
-   * pathname if `decodeURI` throws.
+   * Strips the pipeline's base from a normalized request pathname and prepends
+   * a forward slash.
    *
    * Mirrors `BaseApp.removeBase`, including the
    * `collapseDuplicateLeadingSlashes` fix that prevents middleware
    * authorization bypass when the URL starts with `//`.
    */
-  #computePathname(url) {
-    let pathname = collapseDuplicateLeadingSlashes(url.pathname);
+  #computePathname(normalizedPathname) {
+    let pathname = collapseDuplicateLeadingSlashes(normalizedPathname);
     const base = this.pipeline.manifest.base;
     if (pathname.startsWith(base)) {
       const baseWithoutTrailingSlash = removeTrailingForwardSlash(base);
       pathname = pathname.slice(baseWithoutTrailingSlash.length + 1);
     }
-    pathname = prependForwardSlash(pathname);
+    return prependForwardSlash(pathname);
+  }
+  /**
+   * Decodes and normalizes the public request pathname before deriving the
+   * separate pathname used for route matching.
+   */
+  #normalizePathname(pathname) {
     try {
-      return validateAndDecodePathname(pathname);
+      pathname = validateAndDecodePathname(pathname);
     } catch (e) {
       if (e instanceof MultiLevelEncodingError) {
         this.invalidEncoding = true;
-        return pathname;
+      } else {
+        this.pipeline.logger.error(null, e.toString());
       }
-      this.pipeline.logger.error(null, e.toString());
-      return pathname;
     }
+    return collapseDuplicateSlashes(pathname);
   }
   /**
    * Reads X-Forwarded-Proto, X-Forwarded-Host, and X-Forwarded-Port

package/dist/core/i18n/domain.d.ts

@@ -9,4 +9,4 @@ import type { AstroLogger } from '../logger/core.js';
  * mapped to a locale — in which case normal pathname routing applies.
  *
  */
-export declare function computePathnameFromDomain(request: Request, url: URL, i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], logger: AstroLogger): string | undefined;
+export declare function computePathnameFromDomain(request: Request, url: URL, i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], logger: AstroLogger, pathnameFromRequest?: string): string | undefined;

package/dist/core/i18n/domain.js

@@ -6,7 +6,7 @@ import {
   removeTrailingForwardSlash
 } from "@astrojs/internal-helpers/path";
 import { normalizeTheLocale } from "../../i18n/path.js";
-function computePathnameFromDomain(request, url, i18n, base, trailingSlash, logger) {
+function computePathnameFromDomain(request, url, i18n, base, trailingSlash, logger, pathnameFromRequest) {
   let pathname = void 0;
   if (i18n && (i18n.strategy === "domains-prefix-always" || i18n.strategy === "domains-prefix-other-locales" || i18n.strategy === "domains-prefix-always-no-redirect")) {
     let host = request.headers.get("X-Forwarded-Host");
@@ -32,14 +32,13 @@ function computePathnameFromDomain(request, url, i18n, base, trailingSlash, logg
           }
         }
         if (locale) {
-          pathname = prependForwardSlash(
-            joinPaths(normalizeTheLocale(locale), removeBase(url.pathname, base))
-          );
+          const requestPathname = pathnameFromRequest ?? removeBase(url.pathname, base);
+          pathname = prependForwardSlash(joinPaths(normalizeTheLocale(locale), requestPathname));
           if (trailingSlash === "always") {
             pathname = appendForwardSlash(pathname);
           } else if (trailingSlash === "never") {
             pathname = removeTrailingForwardSlash(pathname);
-          } else if (url.pathname.endsWith("/")) {
+          } else if (requestPathname.endsWith("/")) {
             pathname = appendForwardSlash(pathname);
           }
         }

package/dist/core/messages/runtime.js

@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"7.1.0"}`
+        `v${"7.1.1"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",