astro 4.16.1 → 4.16.2

package/dist/actions/runtime/middleware.js

@@ -1,7 +1,5 @@
 import { yellow } from "kleur/colors";
-import { ASTRO_ORIGIN_HEADER } from "../../core/constants.js";
 import { defineMiddleware } from "../../core/middleware/index.js";
-import { getOriginHeader } from "../../core/routing/rewrite.js";
 import { ACTION_QUERY_PARAMS } from "../consts.js";
 import { formContentTypes, hasContentType } from "./utils.js";
 import { getAction } from "./virtual/get-action.js";
@@ -86,14 +84,10 @@ async function redirectWithResult({
     actionResult: serializeActionResult(actionResult)
   });
   if (actionResult.error) {
-    const referer2 = context.request.headers.get("Referer");
-    if (!referer2) {
+    const referer = context.request.headers.get("Referer");
+    if (!referer) {
       throw new Error("Internal: Referer unexpectedly missing from Action POST request.");
     }
-    return context.redirect(referer2);
-  }
-  const referer = getOriginHeader(context.request);
-  if (referer) {
     return context.redirect(referer);
   }
   return context.redirect(context.url.pathname);

package/dist/content/content-layer.js

@@ -121,7 +121,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "4.16.1") {
+    if (previousAstroVersion !== "4.16.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -129,8 +129,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("4.16.1") {
-      await this.#store.metaStore().set("astro-version", "4.16.1");
+    if ("4.16.2") {
+      await this.#store.metaStore().set("astro-version", "4.16.2");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/core/constants.d.ts

@@ -25,10 +25,6 @@ export declare const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
  * This metadata is used to determine the origin of a Response. If a rewrite has occurred, it should be prioritised over other logic.
  */
 export declare const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
-/**
- * Header used to track the original URL requested by the user. This information is useful rewrites are involved.
- */
-export declare const ASTRO_ORIGIN_HEADER = "X-Astro-Origin";
 export declare const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";
 /**
  * The name for the header used to help i18n middleware, which only needs to act on "page" and "fallback" route types.

package/dist/core/constants.js

@@ -1,7 +1,6 @@
-const ASTRO_VERSION = "4.16.1";
+const ASTRO_VERSION = "4.16.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
-const ASTRO_ORIGIN_HEADER = "X-Astro-Origin";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";
@@ -21,7 +20,6 @@ const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
 ];
 const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
 export {
-  ASTRO_ORIGIN_HEADER,
   ASTRO_VERSION,
   DEFAULT_404_COMPONENT,
   DEFAULT_500_COMPONENT,

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/core/middleware/sequence.js

@@ -1,7 +1,6 @@
 import { AstroCookies } from "../cookies/cookies.js";
 import { apiContextRoutesSymbol } from "../render-context.js";
 import { getParams } from "../render/index.js";
-import { copyRequest } from "../routing/rewrite.js";
 import { defineMiddleware } from "./index.js";
 function sequence(...handlers) {
   const filtered = handlers.filter((h) => !!h);
@@ -23,9 +22,9 @@ function sequence(...handlers) {
             if (payload instanceof Request) {
               newRequest = payload;
             } else if (payload instanceof URL) {
-              newRequest = copyRequest(payload, handleContext.request);
+              newRequest = new Request(payload, handleContext.request);
             } else {
-              newRequest = copyRequest(
+              newRequest = new Request(
                 new URL(payload, handleContext.url.origin),
                 handleContext.request
               );

package/dist/core/render-context.js

@@ -8,7 +8,6 @@ import {
 import { renderEndpoint } from "../runtime/server/endpoint.js";
 import { renderPage } from "../runtime/server/index.js";
 import {
-  ASTRO_ORIGIN_HEADER,
   ASTRO_VERSION,
   REROUTE_DIRECTIVE_HEADER,
   REWRITE_DIRECTIVE_HEADER_KEY,
@@ -25,7 +24,6 @@ import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
 import { renderRedirect } from "./redirects/render.js";
 import { Slots, getParams, getProps } from "./render/index.js";
-import { copyRequest, setOriginHeader } from "./routing/rewrite.js";
 const apiContextRoutesSymbol = Symbol.for("context.routes");
 class RenderContext {
   constructor(pipeline, locals, middleware, pathname, request, routeData, status, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = new URL(request.url), props = {}) {
@@ -60,7 +58,6 @@ class RenderContext {
     props
   }) {
     const pipelineMiddleware = await pipeline.getMiddleware();
-    setOriginHeader(request, pathname);
     return new RenderContext(
       pipeline,
       locals,
@@ -121,7 +118,7 @@ class RenderContext {
         if (payload instanceof Request) {
           this.request = payload;
         } else {
-          this.request = copyRequest(newUrl, this.request);
+          this.request = this.#copyRequest(newUrl, this.request);
         }
         this.isRewriting = true;
         this.url = new URL(this.request.url);
@@ -205,7 +202,7 @@ class RenderContext {
     if (reroutePayload instanceof Request) {
       this.request = reroutePayload;
     } else {
-      this.request = copyRequest(newUrl, this.request);
+      this.request = this.#copyRequest(newUrl, this.request);
     }
     this.url = new URL(this.request.url);
     this.cookies = new AstroCookies(this.request);
@@ -451,6 +448,34 @@ 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) {
+    if (oldRequest.bodyUsed) {
+      throw new AstroError(AstroErrorData.RewriteWithBodyUsed);
+    }
+    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/rewrite.d.ts

@@ -18,12 +18,3 @@ export interface FindRouteToRewriteResult {
  * 2.
  */
 export declare function findRouteToRewrite({ payload, routes, request, trailingSlash, buildFormat, base, }: FindRouteToRewrite): FindRouteToRewriteResult;
-/**
- * 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`
- */
-export declare function copyRequest(newUrl: URL, oldRequest: Request): Request;
-export declare function setOriginHeader(request: Request, pathname: string): void;
-export declare function getOriginHeader(request: Request): string | undefined;

package/dist/core/routing/rewrite.js

@@ -1,6 +1,4 @@
 import { shouldAppendForwardSlash } from "../build/util.js";
-import { ASTRO_ORIGIN_HEADER } from "../constants.js";
-import { AstroError, AstroErrorData } from "../errors/index.js";
 import { appendForwardSlash, removeTrailingForwardSlash } from "../path.js";
 import { DEFAULT_404_ROUTE } from "./astro-designed-error-pages.js";
 function findRouteToRewrite({
@@ -46,41 +44,6 @@ function findRouteToRewrite({
     }
   }
 }
-function copyRequest(newUrl, oldRequest) {
-  if (oldRequest.bodyUsed) {
-    throw new AstroError(AstroErrorData.RewriteWithBodyUsed);
-  }
-  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"
-  });
-}
-function setOriginHeader(request, pathname) {
-  request.headers.set(ASTRO_ORIGIN_HEADER, encodeURIComponent(pathname));
-}
-function getOriginHeader(request) {
-  const origin = request.headers.get(ASTRO_ORIGIN_HEADER);
-  if (origin) {
-    return decodeURIComponent(origin);
-  }
-  return void 0;
-}
 export {
-  copyRequest,
-  findRouteToRewrite,
-  getOriginHeader,
-  setOriginHeader
+  findRouteToRewrite
 };

package/package.json

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