astro 4.16.6 → 4.16.7

package/dist/actions/runtime/middleware.js

@@ -1,5 +1,6 @@
 import { yellow } from "kleur/colors";
 import { defineMiddleware } from "../../core/middleware/index.js";
+import { getOriginPathname } 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";
@@ -11,7 +12,7 @@ const onRequest = defineMiddleware(async (context, next) => {
     if (context.request.method === "POST") {
       console.warn(
         yellow("[astro:actions]"),
-        'POST requests should not be sent to prerendered pages. If you\'re using Actions, disable prerendering with `export const prerender = "false".'
+        "POST requests should not be sent to prerendered pages. If you're using Actions, disable prerendering with `export const prerender = false`."
       );
     }
     return next();
@@ -84,10 +85,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 = getOriginPathname(context.request);
+  if (referer) {
     return context.redirect(referer);
   }
   return context.redirect(context.url.pathname);

package/dist/assets/endpoint/node.js

@@ -18,6 +18,10 @@ async function loadLocalImage(src, url) {
     fileUrl = pathToFileURL(removeQueryString(replaceFileSystemReferences(src)));
   } else {
     try {
+      const idx = url.pathname.indexOf("/_image");
+      if (idx > 0) {
+        src = src.slice(idx);
+      }
       fileUrl = new URL("." + src, outDir);
       const filePath = fileURLToPath(fileUrl);
       if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {

package/dist/content/content-layer.js

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

package/dist/content/types-generator.js

@@ -5,7 +5,6 @@ import { bold, cyan } from "kleur/colors";
 import { normalizePath } from "vite";
 import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
-import { printNode, zodToTs } from "zod-to-ts";
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
 import { isRelativePath } from "../core/path.js";
@@ -294,8 +293,16 @@ async function typeForCollection(collection, collectionKey) {
   if (collection?.type === CONTENT_LAYER_TYPE) {
     const schema = await getContentLayerSchema(collection, collectionKey);
     if (schema) {
-      const ast = zodToTs(schema);
-      return printNode(ast.node);
+      try {
+        const zodToTs = await import("zod-to-ts");
+        const ast = zodToTs.zodToTs(schema);
+        return zodToTs.printNode(ast.node);
+      } catch (err) {
+        if (err.message.includes("Cannot find package 'typescript'")) {
+          return "any";
+        }
+        throw err;
+      }
     }
   }
   return "any";

package/dist/core/app/node.js

@@ -1,10 +1,10 @@
 import fs from "node:fs";
 import { Http2ServerResponse } from "node:http2";
+import { clientAddressSymbol } from "../constants.js";
 import { deserializeManifest } from "./common.js";
 import { createOutgoingHttpHeaders } from "./createOutgoingHttpHeaders.js";
 import { App } from "./index.js";
 import { apply } from "../polyfill.js";
-const clientAddressSymbol = Symbol.for("astro.clientAddress");
 class NodeApp extends App {
   match(req) {
     if (!(req instanceof Request)) {

package/dist/core/constants.d.ts

@@ -57,6 +57,10 @@ export declare const clientAddressSymbol: unique symbol;
  * Use judiciously, as locals are now stored within `RenderContext` by default. Tacking it onto request is no longer necessary.
  */
 export declare const clientLocalsSymbol: unique symbol;
+/**
+ * Use this symbol to set and retrieve the original pathname of a request. This is useful when working with redirects and rewrites
+ */
+export declare const originPathnameSymbol: unique symbol;
 /**
  * The symbol used as a field on the response object to keep track of streaming.
  *

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.16.6";
+const ASTRO_VERSION = "4.16.7";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";
@@ -9,6 +9,7 @@ const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308, 300, 304];
 const REROUTABLE_STATUS_CODES = [404, 500];
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const clientLocalsSymbol = Symbol.for("astro.locals");
+const originPathnameSymbol = Symbol.for("astro.originPathname");
 const responseSentSymbol = Symbol.for("astro.responseSent");
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
@@ -33,5 +34,6 @@ export {
   SUPPORTED_MARKDOWN_FILE_EXTENSIONS,
   clientAddressSymbol,
   clientLocalsSymbol,
+  originPathnameSymbol,
   responseSentSymbol
 };

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

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -24,6 +24,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, setOriginPathname } 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 = {}, partial = void 0) {
@@ -60,6 +61,7 @@ class RenderContext {
     partial = void 0
   }) {
     const pipelineMiddleware = await pipeline.getMiddleware();
+    setOriginPathname(request, pathname);
     return new RenderContext(
       pipeline,
       locals,
@@ -121,7 +123,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);
@@ -205,7 +207,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);
@@ -461,34 +463,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 setOriginPathname(request: Request, pathname: string): void;
+export declare function getOriginPathname(request: Request): string | undefined;

package/dist/core/routing/rewrite.js

@@ -1,4 +1,6 @@
 import { shouldAppendForwardSlash } from "../build/util.js";
+import { originPathnameSymbol } 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 setOriginPathname(request, pathname) {
+  Reflect.set(request, originPathnameSymbol, encodeURIComponent(pathname));
+}
+function getOriginPathname(request) {
+  const origin = Reflect.get(request, originPathnameSymbol);
+  if (origin) {
+    return decodeURIComponent(origin);
+  }
+  return void 0;
+}
 export {
-  findRouteToRewrite
+  copyRequest,
+  findRouteToRewrite,
+  getOriginPathname,
+  setOriginPathname
 };

package/dist/core/server-islands/endpoint.js

@@ -30,7 +30,7 @@ function ensureServerIslandRoute(config, routeManifest) {
   if (routeManifest.routes.some((route) => route.route === "/_server-islands/[name]")) {
     return;
   }
-  routeManifest.routes.push(getServerIslandRouteData(config));
+  routeManifest.routes.unshift(getServerIslandRouteData(config));
 }
 function createEndpoint(manifest) {
   const page = async (result) => {

package/dist/runtime/server/render/astro/head-and-content.js

@@ -1,6 +1,6 @@
 const headAndContentSym = Symbol.for("astro.headAndContent");
 function isHeadAndContent(obj) {
-  return typeof obj === "object" && !!obj[headAndContentSym];
+  return typeof obj === "object" && obj !== null && !!obj[headAndContentSym];
 }
 function createHeadAndContent(head, content) {
   return {

package/dist/runtime/server/render/astro/instance.js

@@ -67,7 +67,7 @@ function createAstroComponentInstance(result, displayName, factory, props, slots
   return instance;
 }
 function isAstroComponentInstance(obj) {
-  return typeof obj === "object" && !!obj[astroComponentInstanceSym];
+  return typeof obj === "object" && obj !== null && !!obj[astroComponentInstanceSym];
 }
 export {
   AstroComponentInstance,

package/dist/runtime/server/render/astro/render-template.js

@@ -42,7 +42,7 @@ class RenderTemplateResult {
   }
 }
 function isRenderTemplateResult(obj) {
-  return typeof obj === "object" && !!obj[renderTemplateResultSym];
+  return typeof obj === "object" && obj !== null && !!obj[renderTemplateResultSym];
 }
 function renderTemplate(htmlParts, ...expressions) {
   return new RenderTemplateResult(htmlParts, expressions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.16.6",
+  "version": "4.16.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -116,7 +116,7 @@
     "@rollup/pluginutils": "^5.1.2",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
-    "acorn": "^8.12.1",
+    "acorn": "^8.13.0",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
     "boxen": "8.0.1",
@@ -155,7 +155,7 @@
     "rehype": "^13.0.2",
     "semver": "^7.6.3",
     "shiki": "^1.22.0",
-    "tinyexec": "^0.3.0",
+    "tinyexec": "^0.3.1",
     "tsconfck": "^3.1.4",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
@@ -167,8 +167,8 @@
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.3",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/markdown-remark": "5.3.0",
     "@astrojs/internal-helpers": "0.4.1",
+    "@astrojs/markdown-remark": "5.3.0",
     "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
@@ -176,7 +176,7 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.48.0",
+    "@playwright/test": "^1.48.1",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
@@ -205,7 +205,7 @@
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.24.0",
-    "sass": "^1.79.5",
+    "sass": "^1.80.3",
     "undici": "^6.20.1",
     "unified": "^11.0.5",
     "astro-scripts": "0.0.14"