astro 4.7.1 → 4.8.0

package/dist/core/render-context.js

@@ -1,3 +1,4 @@
+import { createGetActionResult } from "../actions/utils.js";
 import {
   computeCurrentLocale,
   computePreferredLocale,
@@ -32,6 +33,14 @@ class RenderContext {
     this.params = params;
     this.url = url;
   }
+  /**
+   * A flag that tells the render content if the rewriting was triggered
+   */
+  isRewriting = false;
+  /**
+   * A safety net in case of loops
+   */
+  counter = 0;
   static create({
     locals = {},
     middleware,
@@ -63,21 +72,50 @@ class RenderContext {
    * - fallback
    */
   async render(componentInstance) {
-    const { cookies, middleware, pathname, pipeline, routeData } = this;
+    const { cookies, middleware, pathname, pipeline } = this;
     const { logger, routeCache, serverLike, streaming } = pipeline;
     const props = await getProps({
       mod: componentInstance,
-      routeData,
+      routeData: this.routeData,
       routeCache,
       pathname,
       logger,
       serverLike
     });
     const apiContext = this.createAPIContext(props);
-    const lastNext = async () => {
-      switch (routeData.type) {
+    this.counter++;
+    if (this.counter === 4) {
+      return new Response("Loop Detected", {
+        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/508
+        status: 508,
+        statusText: "Astro detected a loop where you tried to call the rewriting logic more than four times."
+      });
+    }
+    const lastNext = async (ctx, payload) => {
+      if (payload) {
+        if (this.pipeline.manifest.rewritingEnabled) {
+          try {
+            const [routeData, component] = await pipeline.tryRewrite(payload);
+            this.routeData = routeData;
+            componentInstance = component;
+          } catch (e) {
+            return new Response("Not found", {
+              status: 404,
+              statusText: "Not found"
+            });
+          } finally {
+            this.isRewriting = true;
+          }
+        } else {
+          this.pipeline.logger.warn(
+            "router",
+            "The rewrite API is experimental. To use this feature, add the `rewriting` flag to the `experimental` object in your Astro config."
+          );
+        }
+      }
+      switch (this.routeData.type) {
         case "endpoint":
-          return renderEndpoint(componentInstance, apiContext, serverLike, logger);
+          return renderEndpoint(componentInstance, ctx, serverLike, logger);
         case "redirect":
           return renderRedirect(this);
         case "page": {
@@ -90,14 +128,14 @@ class RenderContext {
               props,
               {},
               streaming,
-              routeData
+              this.routeData
             );
           } catch (e) {
             result.cancelled = true;
             throw e;
           }
           response2.headers.set(ROUTE_TYPE_HEADER, "page");
-          if (routeData.route === "/404" || routeData.route === "/500") {
+          if (this.routeData.route === "/404" || this.routeData.route === "/500" || this.isRewriting) {
             response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
           }
           return response2;
@@ -107,7 +145,13 @@ class RenderContext {
         }
       }
     };
-    const response = await callMiddleware(middleware, apiContext, lastNext);
+    const response = await callMiddleware(
+      middleware,
+      apiContext,
+      lastNext,
+      this.pipeline.manifest.rewritingEnabled,
+      this.pipeline.logger
+    );
     if (response.headers.get(ROUTE_TYPE_HEADER)) {
       response.headers.delete(ROUTE_TYPE_HEADER);
     }
@@ -115,10 +159,43 @@ class RenderContext {
     return response;
   }
   createAPIContext(props) {
+    const context = this.createActionAPIContext();
+    return Object.assign(context, {
+      props,
+      getActionResult: createGetActionResult(context.locals)
+    });
+  }
+  createActionAPIContext() {
     const renderContext = this;
-    const { cookies, params, pipeline, request, url } = this;
+    const { cookies, params, pipeline, url } = this;
     const generator = `Astro v${ASTRO_VERSION}`;
     const redirect = (path, status = 302) => new Response(null, { status, headers: { Location: path } });
+    const rewrite = async (reroutePayload) => {
+      pipeline.logger.debug("router", "Called rewriting to:", reroutePayload);
+      try {
+        const [routeData, component] = await pipeline.tryRewrite(reroutePayload);
+        this.routeData = routeData;
+        if (reroutePayload instanceof Request) {
+          this.request = reroutePayload;
+        } else {
+          this.request = new Request(
+            new URL(routeData.pathname ?? routeData.route, this.url.origin),
+            this.request
+          );
+        }
+        this.url = new URL(this.request.url);
+        this.cookies = new AstroCookies(this.request);
+        this.params = getParams(routeData, url.toString());
+        this.isRewriting = true;
+        return await this.render(component);
+      } catch (e) {
+        pipeline.logger.debug("router", "Rewrite failed.", e);
+        return new Response("Not found", {
+          status: 404,
+          statusText: "Not found"
+        });
+      }
+    };
     return {
       cookies,
       get clientAddress() {
@@ -137,7 +214,7 @@ class RenderContext {
           throw new AstroError(AstroErrorData.LocalsNotAnObject);
         } else {
           renderContext.locals = val;
-          Reflect.set(request, clientLocalsSymbol, val);
+          Reflect.set(this.request, clientLocalsSymbol, val);
         }
       },
       params,
@@ -147,9 +224,9 @@ class RenderContext {
       get preferredLocaleList() {
         return renderContext.computePreferredLocaleList();
       },
-      props,
       redirect,
-      request,
+      rewrite,
+      request: this.request,
       site: pipeline.site,
       url
     };
@@ -238,16 +315,42 @@ class RenderContext {
   }
   createAstroPagePartial(result, astroStaticPartial) {
     const renderContext = this;
-    const { cookies, locals, params, pipeline, request, url } = this;
+    const { cookies, locals, params, pipeline, url } = this;
     const { response } = result;
     const redirect = (path, status = 302) => {
-      if (request[responseSentSymbol]) {
+      if (this.request[responseSentSymbol]) {
         throw new AstroError({
           ...AstroErrorData.ResponseSentError
         });
       }
       return new Response(null, { status, headers: { Location: path } });
     };
+    const rewrite = async (reroutePayload) => {
+      try {
+        pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
+        const [routeData, component] = await pipeline.tryRewrite(reroutePayload);
+        this.routeData = routeData;
+        if (reroutePayload instanceof Request) {
+          this.request = reroutePayload;
+        } else {
+          this.request = new Request(
+            new URL(routeData.pathname ?? routeData.route, this.url.origin),
+            this.request
+          );
+        }
+        this.url = new URL(this.request.url);
+        this.cookies = new AstroCookies(this.request);
+        this.params = getParams(routeData, url.toString());
+        this.isRewriting = true;
+        return await this.render(component);
+      } catch (e) {
+        pipeline.logger.debug("router", "Rerouting failed, returning a 404.", e);
+        return new Response("Not found", {
+          status: 404,
+          statusText: "Not found"
+        });
+      }
+    };
     return {
       generator: astroStaticPartial.generator,
       glob: astroStaticPartial.glob,
@@ -267,7 +370,9 @@ class RenderContext {
       },
       locals,
       redirect,
-      request,
+      rewrite,
+      request: this.request,
+      getActionResult: createGetActionResult(locals),
       response,
       site: pipeline.site,
       url
@@ -278,14 +383,18 @@ class RenderContext {
     if (clientAddressSymbol in request) {
       return Reflect.get(request, clientAddressSymbol);
     }
-    if (pipeline.adapterName) {
-      throw new AstroError({
-        ...AstroErrorData.ClientAddressNotAvailable,
-        message: AstroErrorData.ClientAddressNotAvailable.message(pipeline.adapterName)
-      });
-    } else {
-      throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
+    if (pipeline.serverLike) {
+      if (request.body === null) {
+        throw new AstroError(AstroErrorData.PrerenderClientAddressNotAvailable);
+      }
+      if (pipeline.adapterName) {
+        throw new AstroError({
+          ...AstroErrorData.ClientAddressNotAvailable,
+          message: AstroErrorData.ClientAddressNotAvailable.message(pipeline.adapterName)
+        });
+      }
     }
+    throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
   }
   /**
    * API Context may be created multiple times per request, i18n data needs to be computed only once.
@@ -298,8 +407,7 @@ class RenderContext {
       pipeline: { i18n },
       routeData
     } = this;
-    if (!i18n)
-      return;
+    if (!i18n) return;
     const { defaultLocale, locales, strategy } = i18n;
     const fallbackTo = strategy === "pathname-prefix-other-locales" || strategy === "domains-prefix-other-locales" ? defaultLocale : void 0;
     return this.#currentLocale ??= computeCurrentLocale(routeData.route, locales) ?? computeCurrentLocale(url.pathname, locales) ?? fallbackTo;
@@ -310,8 +418,7 @@ class RenderContext {
       pipeline: { i18n },
       request
     } = this;
-    if (!i18n)
-      return;
+    if (!i18n) return;
     return this.#preferredLocale ??= computePreferredLocale(request, i18n.locales);
   }
   #preferredLocaleList;
@@ -320,8 +427,7 @@ class RenderContext {
       pipeline: { i18n },
       request
     } = this;
-    if (!i18n)
-      return;
+    if (!i18n) return;
     return this.#preferredLocaleList ??= computePreferredLocaleList(request, i18n.locales);
   }
 }

package/dist/core/request.js

@@ -13,8 +13,7 @@ function createRequest({
   staticLike = false
 }) {
   const headersObj = staticLike ? void 0 : headers instanceof Headers ? headers : new Headers(Object.entries(headers));
-  if (typeof url === "string")
-    url = new URL(url);
+  if (typeof url === "string") url = new URL(url);
   const imageEndpoint = prependForwardSlash(appendForwardSlash(base)) + "_image";
   if (staticLike && url.pathname !== imageEndpoint) {
     url.search = "";

package/dist/core/routing/manifest/create.js

@@ -16,8 +16,7 @@ const require2 = createRequire(import.meta.url);
 function countOccurrences(needle, haystack) {
   let count = 0;
   for (const hay of haystack) {
-    if (hay === needle)
-      count += 1;
+    if (hay === needle) count += 1;
   }
   return count;
 }
@@ -26,8 +25,7 @@ const ROUTE_SPREAD = /^\.{3}.+$/;
 function getParts(part, file) {
   const result = [];
   part.split(ROUTE_DYNAMIC_SPLIT).map((str, i) => {
-    if (!str)
-      return;
+    if (!str) return;
     const dynamic = i % 2 === 1;
     const [, content] = dynamic ? /([^(]+)$/.exec(str) || [null, null] : [null, str];
     if (!content || dynamic && !/^(?:\.\.\.)?[\w$]+$/.test(content)) {
@@ -75,8 +73,7 @@ function getTrailingSlashPattern(addTrailingSlash) {
   return "\\/?$";
 }
 function validateSegment(segment, file = "") {
-  if (!file)
-    file = segment;
+  if (!file) file = segment;
   if (/\]\[/.test(segment)) {
     throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
   }

package/dist/core/sync/index.js

@@ -16,7 +16,13 @@ import { createNodeLogger } from "../config/logging.js";
 import { createSettings } from "../config/settings.js";
 import { createVite } from "../create-vite.js";
 import { collectErrorMetadata } from "../errors/dev/utils.js";
-import { AstroError, AstroErrorData, createSafeError, isAstroError } from "../errors/index.js";
+import {
+  AstroError,
+  AstroErrorData,
+  AstroUserError,
+  createSafeError,
+  isAstroError
+} from "../errors/index.js";
 import { formatErrorMessage } from "../messages.js";
 import { ensureProcessNodeEnv } from "../util.js";
 async function sync(inlineConfig, options) {
@@ -43,8 +49,7 @@ async function sync(inlineConfig, options) {
   try {
     await dbPackage?.typegen?.(astroConfig);
     const exitCode = await syncContentCollections(settings, { ...options, logger });
-    if (exitCode !== 0)
-      return exitCode;
+    if (exitCode !== 0) return exitCode;
     logger.info(null, `Types generated ${dim(getTimeStat(timerStart, performance.now()))}`);
     return 0;
   } catch (err) {
@@ -101,9 +106,11 @@ async function syncContentCollections(settings, { logger, fs }) {
     if (isAstroError(e)) {
       throw e;
     }
+    const hint = AstroUserError.is(e) ? e.hint : AstroErrorData.GenerateContentTypesError.hint;
     throw new AstroError(
       {
         ...AstroErrorData.GenerateContentTypesError,
+        hint,
         message: AstroErrorData.GenerateContentTypesError.message(safeError.message)
       },
       { cause: e }

package/dist/core/util.d.ts

@@ -36,7 +36,9 @@ export declare function unwrapId(id: string): string;
 export declare function resolvePages(config: AstroConfig): URL;
 export declare function isPage(file: URL, settings: AstroSettings): boolean;
 export declare function isEndpoint(file: URL, settings: AstroSettings): boolean;
+export declare function isServerLikeOutput(config: AstroConfig): boolean;
 export declare function isModeServerWithNoAdapter(settings: AstroSettings): boolean;
+export declare function isContentCollectionsCacheEnabled(config: AstroConfig): boolean;
 export declare function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string): string;
 export declare function rootRelativePath(root: URL, idOrUrl: URL | string, shouldPrependForwardSlash?: boolean): string;
 export declare function emoji(char: string, fallback: string): string;

package/dist/core/util.js

@@ -2,7 +2,6 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
-import { isServerLikeOutput } from "../prerender/utils.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
 import { prependForwardSlash, removeTrailingForwardSlash, slash } from "./path.js";
 function isObject(value) {
@@ -14,8 +13,7 @@ function isURL(value) {
 function isMarkdownFile(fileId, option) {
   const _suffix = option?.suffix ?? "";
   for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {
-    if (fileId.endsWith(`${markdownFileExtension}${_suffix}`))
-      return true;
+    if (fileId.endsWith(`${markdownFileExtension}${_suffix}`)) return true;
   }
   return false;
 }
@@ -41,8 +39,7 @@ function getOutputFilename(astroConfig, name, type) {
   return path.posix.join(name, "index.html");
 }
 function parseNpmName(spec) {
-  if (!spec || spec[0] === "." || spec[0] === "/")
-    return void 0;
+  if (!spec || spec[0] === "." || spec[0] === "/") return void 0;
   let scope;
   let name = "";
   let parts = spec.split("/");
@@ -76,8 +73,7 @@ function isInPagesDir(file, config) {
 function isInjectedRoute(file, settings) {
   let fileURL = file.toString();
   for (const route of settings.resolvedInjectedRoutes) {
-    if (route.resolvedEntryPoint && fileURL === route.resolvedEntryPoint.toString())
-      return true;
+    if (route.resolvedEntryPoint && fileURL === route.resolvedEntryPoint.toString()) return true;
   }
   return false;
 }
@@ -85,35 +81,36 @@ function isPublicRoute(file, config) {
   const pagesDir = resolvePages(config);
   const parts = file.toString().replace(pagesDir.toString(), "").split("/").slice(1);
   for (const part of parts) {
-    if (part.startsWith("_"))
-      return false;
+    if (part.startsWith("_")) return false;
   }
   return true;
 }
 function endsWithPageExt(file, settings) {
   for (const ext of settings.pageExtensions) {
-    if (file.toString().endsWith(ext))
-      return true;
+    if (file.toString().endsWith(ext)) return true;
   }
   return false;
 }
 function isPage(file, settings) {
-  if (!isInPagesDir(file, settings.config) && !isInjectedRoute(file, settings))
-    return false;
-  if (!isPublicRoute(file, settings.config))
-    return false;
+  if (!isInPagesDir(file, settings.config) && !isInjectedRoute(file, settings)) return false;
+  if (!isPublicRoute(file, settings.config)) return false;
   return endsWithPageExt(file, settings);
 }
 function isEndpoint(file, settings) {
-  if (!isInPagesDir(file, settings.config))
-    return false;
-  if (!isPublicRoute(file, settings.config))
-    return false;
+  if (!isInPagesDir(file, settings.config)) return false;
+  if (!isPublicRoute(file, settings.config)) return false;
   return !endsWithPageExt(file, settings);
 }
+function isServerLikeOutput(config) {
+  return config.output === "server" || config.output === "hybrid";
+}
 function isModeServerWithNoAdapter(settings) {
   return isServerLikeOutput(settings.config) && !settings.adapter;
 }
+function isContentCollectionsCacheEnabled(config) {
+  return config.experimental.contentCollectionCache && // contentCollectionsCache is an SSG only feature
+  !isServerLikeOutput(config);
+}
 function relativeToSrcDir(config, idOrUrl) {
   let id;
   if (typeof idOrUrl !== "string") {
@@ -186,11 +183,13 @@ export {
   emoji,
   ensureProcessNodeEnv,
   getOutputFilename,
+  isContentCollectionsCacheEnabled,
   isEndpoint,
   isMarkdownFile,
   isModeServerWithNoAdapter,
   isObject,
   isPage,
+  isServerLikeOutput,
   isURL,
   padMultilineString,
   parseNpmName,

package/dist/i18n/index.js

@@ -113,8 +113,7 @@ function getLocaleByPath(path, locales) {
     if (typeof locale !== "string") {
       if (locale.path === path) {
         const code = locale.codes.at(0);
-        if (code === void 0)
-          throw new Unreachable();
+        if (code === void 0) throw new Unreachable();
         return code;
       }
     } else if (locale === path) {
@@ -183,8 +182,7 @@ function redirectToDefaultLocale({
 }
 function notFound({ base, locales }) {
   return function(context, response) {
-    if (response?.headers.get(REROUTE_DIRECTIVE_HEADER) === "no")
-      return response;
+    if (response?.headers.get(REROUTE_DIRECTIVE_HEADER) === "no") return response;
     const url = context.url;
     const isRoot = url.pathname === base + "/" || url.pathname === base;
     if (!(isRoot || pathHasLocale(url.pathname, locales))) {

package/dist/i18n/middleware.js

@@ -7,8 +7,7 @@ import {
   requestHasLocale
 } from "./index.js";
 function createI18nMiddleware(i18n, base, trailingSlash, format) {
-  if (!i18n)
-    return (_, next) => next();
+  if (!i18n) return (_, next) => next();
   const payload = {
     ...i18n,
     trailingSlash,

package/dist/i18n/utils.js

@@ -109,8 +109,7 @@ function computeCurrentLocale(pathname, locales) {
   for (const segment of pathname.split("/")) {
     for (const locale of locales) {
       if (typeof locale === "string") {
-        if (!segment.includes(locale))
-          continue;
+        if (!segment.includes(locale)) continue;
         if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {
           return locale;
         }

package/dist/i18n/vite-plugin-i18n.js

@@ -31,8 +31,7 @@ function astroInternationalization({
     },
     resolveId(id) {
       if (id === virtualModuleId) {
-        if (i18n === void 0)
-          throw new AstroError(AstroErrorData.i18nNotEnabled);
+        if (i18n === void 0) throw new AstroError(AstroErrorData.i18nNotEnabled);
         return this.resolve("astro/virtual-modules/i18n.js");
       }
     }

package/dist/integrations/hooks.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
 import { bold } from "kleur/colors";
 import { buildClientDirectiveEntrypoint } from "../core/client-directive/index.js";
 import { mergeConfig } from "../core/config/index.js";
-import { isServerLikeOutput } from "../prerender/utils.js";
+import { isServerLikeOutput } from "../core/util.js";
 import { validateSupportedFeatures } from "./features-validation.js";
 async function withTakingALongTimeMsg({
   name,
@@ -79,6 +79,10 @@ async function runHookConfigSetup({
   if (settings.config.adapter) {
     settings.config.integrations.push(settings.config.adapter);
   }
+  if (settings.config.experimental?.actions) {
+    const { default: actionsIntegration } = await import("../actions/index.js");
+    settings.config.integrations.push(actionsIntegration());
+  }
   let updatedConfig = { ...settings.config };
   let updatedSettings = { ...settings, config: updatedConfig };
   let addedClientDirectives = /* @__PURE__ */ new Map();

package/dist/jsx/babel.d.ts

@@ -1,2 +1,5 @@
 import type { PluginObj } from '@babel/core';
+/**
+ * @deprecated This plugin is no longer used. Remove in Astro 5.0
+ */
 export default function astroJSX(): PluginObj;

package/dist/jsx/babel.js

@@ -139,13 +139,11 @@ function astroJSX() {
       },
       ImportDeclaration(path, state) {
         const source = path.node.source.value;
-        if (source.startsWith("astro/jsx-runtime"))
-          return;
+        if (source.startsWith("astro/jsx-runtime")) return;
         const specs = path.node.specifiers.map((spec) => {
           if (t.isImportDefaultSpecifier(spec))
             return { local: spec.local.name, imported: "default" };
-          if (t.isImportNamespaceSpecifier(spec))
-            return { local: spec.local.name, imported: "*" };
+          if (t.isImportNamespaceSpecifier(spec)) return { local: spec.local.name, imported: "*" };
           if (t.isIdentifier(spec.imported))
             return { local: spec.local.name, imported: spec.imported.name };
           return { local: spec.local.name, imported: spec.imported.value };
@@ -170,13 +168,10 @@ function astroJSX() {
         const parent = path.findParent((n) => t.isJSXElement(n.node));
         const parentNode = parent.node;
         const tagName = getTagName(parentNode);
-        if (!isComponent(tagName))
-          return;
-        if (!hasClientDirective(parentNode))
-          return;
+        if (!isComponent(tagName)) return;
+        if (!hasClientDirective(parentNode)) return;
         const isClientOnly = isClientOnlyComponent(parentNode);
-        if (tagName === ClientOnlyPlaceholder)
-          return;
+        if (tagName === ClientOnlyPlaceholder) return;
         const imports = state.get("imports") ?? /* @__PURE__ */ new Map();
         const namespace = tagName.split(".");
         for (const [source, specs] of imports) {
@@ -223,18 +218,14 @@ function astroJSX() {
       },
       JSXIdentifier(path, state) {
         const isAttr = path.findParent((n) => t.isJSXAttribute(n.node));
-        if (isAttr)
-          return;
+        if (isAttr) return;
         const parent = path.findParent((n) => t.isJSXElement(n.node));
         const parentNode = parent.node;
         const tagName = getTagName(parentNode);
-        if (!isComponent(tagName))
-          return;
-        if (!hasClientDirective(parentNode))
-          return;
+        if (!isComponent(tagName)) return;
+        if (!hasClientDirective(parentNode)) return;
         const isClientOnly = isClientOnlyComponent(parentNode);
-        if (tagName === ClientOnlyPlaceholder)
-          return;
+        if (tagName === ClientOnlyPlaceholder) return;
         const imports = state.get("imports") ?? /* @__PURE__ */ new Map();
         const namespace = tagName.split(".");
         for (const [source, specs] of imports) {

package/dist/jsx/rehype.d.ts

@@ -0,0 +1,11 @@
+import type { RehypePlugin } from '@astrojs/markdown-remark';
+import type { VFile } from 'vfile';
+export declare const rehypeAnalyzeAstroMetadata: RehypePlugin;
+export declare function getAstroMetadata(file: VFile): {
+    hydratedComponents: import("@astrojs/compiler/types").HydratedComponent[];
+    clientOnlyComponents: import("@astrojs/compiler/types").HydratedComponent[];
+    scripts: import("@astrojs/compiler").HoistedScript[];
+    containsHead: boolean;
+    propagation: import("../@types/astro.js").PropagationHint;
+    pageOptions: import("../vite-plugin-astro/types.js").PageOptions;
+} | undefined;