astro 4.16.0 → 4.16.1

package/dist/actions/runtime/middleware.js

@@ -1,5 +1,7 @@
 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";
@@ -84,10 +86,14 @@ async function redirectWithResult({
     actionResult: serializeActionResult(actionResult)
   });
   if (actionResult.error) {
-    const referer = context.request.headers.get("Referer");
-    if (!referer) {
+    const referer2 = context.request.headers.get("Referer");
+    if (!referer2) {
       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

@@ -1,5 +1,5 @@
 import { promises as fs, existsSync } from "node:fs";
-import * as fastq from "fastq";
+import PQueue from "p-queue";
 import xxhash from "xxhash-wasm";
 import { AstroUserError } from "../core/errors/errors.js";
 import {
@@ -28,13 +28,13 @@ class ContentLayer {
     this.#store = store;
     this.#settings = settings;
     this.#watcher = watcher;
-    this.#queue = fastq.promise(this.#doSync.bind(this), 1);
+    this.#queue = new PQueue({ concurrency: 1 });
   }
   /**
    * Whether the content layer is currently loading content
    */
   get loading() {
-    return !this.#queue.idle();
+    return this.#queue.size > 0 || this.#queue.pending > 0;
   }
   /**
    * Watch for changes to the content config and trigger a sync when it changes.
@@ -90,7 +90,7 @@ class ContentLayer {
    * so that only one sync can run at a time. The function returns a promise that resolves when this sync job is complete.
    */
   sync(options = {}) {
-    return this.#queue.push(options);
+    return this.#queue.add(() => this.#doSync(options));
   }
   async #doSync(options) {
     const contentConfig = globalContentConfigObserver.get();
@@ -121,7 +121,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "4.16.0") {
+    if (previousAstroVersion !== "4.16.1") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -129,8 +129,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("4.16.0") {
-      await this.#store.metaStore().set("astro-version", "4.16.0");
+    if ("4.16.1") {
+      await this.#store.metaStore().set("astro-version", "4.16.1");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/core/constants.d.ts

@@ -25,6 +25,10 @@ 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,6 +1,7 @@
-const ASTRO_VERSION = "4.16.0";
+const ASTRO_VERSION = "4.16.1";
 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";
@@ -20,6 +21,7 @@ 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.0";
+  const currentVersion = "4.16.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -29,8 +29,6 @@ export declare function info(opts: LogOptions, label: string | null, message: st
 export declare function warn(opts: LogOptions, label: string | null, message: string, newLine?: boolean): void;
 /** Emit a error message, Useful when Astro can't recover from some error. */
 export declare function error(opts: LogOptions, label: string | null, message: string, newLine?: boolean): void;
-type LogFn = typeof info | typeof warn | typeof error;
-export declare function table(opts: LogOptions, columns: number[]): (logFn: LogFn, ...input: Array<any>) => void;
 export declare function debug(...args: any[]): void;
 /**
  * Get the prefix for a log message.
@@ -63,4 +61,3 @@ export declare class AstroIntegrationLogger {
     error(message: string): void;
     debug(message: string): void;
 }
-export {};

package/dist/core/logger/core.js

@@ -1,5 +1,4 @@
 import { blue, bold, dim, red, yellow } from "kleur/colors";
-import stringWidth from "string-width";
 const dateTimeFormat = new Intl.DateTimeFormat([], {
   hour: "2-digit",
   minute: "2-digit",
@@ -39,25 +38,11 @@ function warn(opts, label, message, newLine = true) {
 function error(opts, label, message, newLine = true) {
   return log(opts, "error", label, message, newLine);
 }
-function table(opts, columns) {
-  return function logTable(logFn, ...input) {
-    const message = columns.map((len, i) => padStr(input[i].toString(), len)).join(" ");
-    logFn(opts, null, message);
-  };
-}
 function debug(...args) {
   if ("_astroGlobalDebug" in globalThis) {
     globalThis._astroGlobalDebug(...args);
   }
 }
-function padStr(str, len) {
-  const strLen = stringWidth(str);
-  if (strLen > len) {
-    return str.substring(0, len - 3) + "...";
-  }
-  const spaces = Array.from({ length: len - strLen }, () => " ").join("");
-  return str + spaces;
-}
 function getEventPrefix({ level, label }) {
   const timestamp = `${dateTimeFormat.format(/* @__PURE__ */ new Date())}`;
   const prefix = [];
@@ -147,7 +132,6 @@ export {
   isLogLevelEnabled,
   levels,
   log,
-  table,
   timerMessage,
   warn
 };

package/dist/core/messages.js

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

package/dist/core/middleware/sequence.js

@@ -1,6 +1,7 @@
 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);
@@ -22,9 +23,9 @@ function sequence(...handlers) {
             if (payload instanceof Request) {
               newRequest = payload;
             } else if (payload instanceof URL) {
-              newRequest = new Request(payload, handleContext.request);
+              newRequest = copyRequest(payload, handleContext.request);
             } else {
-              newRequest = new Request(
+              newRequest = copyRequest(
                 new URL(payload, handleContext.url.origin),
                 handleContext.request
               );

package/dist/core/render-context.js

@@ -8,6 +8,7 @@ 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,
@@ -24,6 +25,7 @@ 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 = {}) {
@@ -58,6 +60,7 @@ class RenderContext {
     props
   }) {
     const pipelineMiddleware = await pipeline.getMiddleware();
+    setOriginHeader(request, pathname);
     return new RenderContext(
       pipeline,
       locals,
@@ -118,7 +121,7 @@ class RenderContext {
         if (payload instanceof Request) {
           this.request = payload;
         } else {
-          this.request = this.#copyRequest(newUrl, this.request);
+          this.request = copyRequest(newUrl, this.request);
         }
         this.isRewriting = true;
         this.url = new URL(this.request.url);
@@ -202,7 +205,7 @@ class RenderContext {
     if (reroutePayload instanceof Request) {
       this.request = reroutePayload;
     } else {
-      this.request = this.#copyRequest(newUrl, this.request);
+      this.request = copyRequest(newUrl, this.request);
     }
     this.url = new URL(this.request.url);
     this.cookies = new AstroCookies(this.request);
@@ -448,34 +451,6 @@ 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,3 +18,12 @@ 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,4 +1,6 @@
 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({
@@ -44,6 +46,41 @@ 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 {
-  findRouteToRewrite
+  copyRequest,
+  findRouteToRewrite,
+  getOriginHeader,
+  setOriginHeader
 };

package/dist/transitions/router.js

@@ -75,7 +75,7 @@ function getFallback() {
 }
 function runScripts() {
   let wait = Promise.resolve();
-  for (const script of Array.from(document.scripts)) {
+  for (const script of document.getElementsByTagName("script")) {
     if (script.dataset.astroExec === "") continue;
     const type = script.getAttribute("type");
     if (type && type !== "module" && type !== "text/javascript") continue;
@@ -416,7 +416,7 @@ if (inBrowser) {
       );
     }
   }
-  for (const script of document.scripts) {
+  for (const script of document.getElementsByTagName("script")) {
     script.dataset.astroExec = "";
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.16.0",
+  "version": "4.16.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -135,7 +135,6 @@
     "esbuild": "^0.21.5",
     "estree-walker": "^3.0.3",
     "fast-glob": "^3.3.2",
-    "fastq": "^1.17.1",
     "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
@@ -156,7 +155,6 @@
     "rehype": "^13.0.2",
     "semver": "^7.6.3",
     "shiki": "^1.22.0",
-    "string-width": "^7.2.0",
     "tinyexec": "^0.3.0",
     "tsconfck": "^3.1.3",
     "unist-util-visit": "^5.0.0",

package/types/content.d.ts

@@ -98,6 +98,7 @@ declare module 'astro:content' {
 	/** Run `astro sync` to generate high fidelity types */
 	export type CollectionKey = any;
 	/** Run `astro sync` to generate high fidelity types */
+	// biome-ignore lint/correctness/noUnusedVariables: stub generic type to match generated type
 	export type CollectionEntry<C> = any;
 	/** Run `astro sync` to generate high fidelity types */
 	export type ContentCollectionKey = any;