astro 4.7.1 → 4.8.0

package/dist/core/config/timer.js

@@ -10,8 +10,7 @@ class AstroTimer {
    * Start a timer for a scope with a given name.
    */
   start(name) {
-    if (!this.enabled)
-      return;
+    if (!this.enabled) return;
     globalThis.gc?.();
     this.ongoingTimers.set(name, {
       startTime: performance.now(),
@@ -22,11 +21,9 @@ class AstroTimer {
    * End a timer for a scope with a given name.
    */
   end(name) {
-    if (!this.enabled)
-      return;
+    if (!this.enabled) return;
     const stat = this.ongoingTimers.get(name);
-    if (!stat)
-      return;
+    if (!stat) return;
     globalThis.gc?.();
     const endHeap = process.memoryUsage().heapUsed;
     this.stats[name] = {
@@ -40,8 +37,7 @@ class AstroTimer {
    * Write stats to `process.env.ASTRO_TIMER_PATH`
    */
   writeStats() {
-    if (!this.enabled)
-      return;
+    if (!this.enabled) return;
     fs.writeFileSync(process.env.ASTRO_TIMER_PATH, JSON.stringify(this.stats, null, 2));
   }
 }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.7.1";
+const ASTRO_VERSION = "4.8.0";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/cookies/cookies.js

@@ -17,10 +17,8 @@ class AstroCookie {
     return Number(this.value);
   }
   boolean() {
-    if (this.value === "false")
-      return false;
-    if (this.value === "0")
-      return false;
+    if (this.value === "false") return false;
+    if (this.value === "0") return false;
     return Boolean(this.value);
   }
 }
@@ -145,8 +143,7 @@ class AstroCookies {
    * @returns
    */
   *headers() {
-    if (this.#outgoing == null)
-      return;
+    if (this.#outgoing == null) return;
     for (const [, value] of this.#outgoing) {
       yield value[1];
     }

package/dist/core/dev/dev.js

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

package/dist/core/dev/restart.js

@@ -22,8 +22,7 @@ async function createRestartedContainer(container, settings) {
 const configRE = /.*astro.config.(?:mjs|cjs|js|ts)$/;
 const preferencesRE = /.*\.astro\/settings.json$/;
 function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, changedFile) {
-  if (restartInFlight)
-    return false;
+  if (restartInFlight) return false;
   let shouldRestart = false;
   if (inlineConfig.configFile) {
     shouldRestart = vite.normalizePath(inlineConfig.configFile) === vite.normalizePath(changedFile);

package/dist/core/errors/errors-data.d.ts

@@ -56,6 +56,19 @@ export declare const ClientAddressNotAvailable: {
     title: string;
     message: (adapterName: string) => string;
 };
+/**
+ * @docs
+ * @see
+ * - [Opting-in to pre-rendering](https://docs.astro.build/en/guides/server-side-rendering/#opting-in-to-pre-rendering-in-server-mode)
+ * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#astroclientaddress)
+ * @description
+ * The `Astro.clientAddress` property cannot be used inside prerendered routes.
+ */
+export declare const PrerenderClientAddressNotAvailable: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @see
@@ -1034,6 +1047,17 @@ export declare const i18nNotEnabled: {
     message: string;
     hint: string;
 };
+/**
+ * @docs
+ * @description
+ *
+ * Astro couldn't find a route matching the one provided by the user
+ */
+export declare const RouteNotFound: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @kind heading

package/dist/core/errors/errors-data.js

@@ -14,6 +14,11 @@ const ClientAddressNotAvailable = {
   title: "`Astro.clientAddress` is not available in current adapter.",
   message: (adapterName) => `\`Astro.clientAddress\` is not available in the \`${adapterName}\` adapter. File an issue with the adapter to add support.`
 };
+const PrerenderClientAddressNotAvailable = {
+  name: "PrerenderClientAddressNotAvailable",
+  title: "`Astro.clientAddress` cannot be used inside prerendered routes.",
+  message: `\`Astro.clientAddress\` cannot be used inside prerendered routes`
+};
 const StaticClientAddressNotAvailable = {
   name: "StaticClientAddressNotAvailable",
   title: "`Astro.clientAddress` is not available in static mode.",
@@ -128,8 +133,7 @@ const InvalidPrerenderExport = {
   message(prefix, suffix, isHydridOutput) {
     const defaultExpectedValue = isHydridOutput ? "false" : "true";
     let msg = `A \`prerender\` export has been detected, but its value cannot be statically analyzed.`;
-    if (prefix !== "const")
-      msg += `
+    if (prefix !== "const") msg += `
 Expected \`const\` declaration but got \`${prefix}\`.`;
     if (suffix !== "true")
       msg += `
@@ -371,6 +375,11 @@ const i18nNotEnabled = {
   message: "The `astro:i18n` module can not be used without enabling i18n in your Astro config.",
   hint: "See https://docs.astro.build/en/guides/internationalization for a guide on setting up i18n."
 };
+const RouteNotFound = {
+  name: "RouteNotFound",
+  title: "Route not found.",
+  message: `Astro could not find a route that matches the one you requested.`
+};
 const UnknownCSSError = {
   name: "UnknownCSSError",
   title: "Unknown CSS Error."
@@ -567,10 +576,12 @@ export {
   NoPrerenderedRoutesWithDomains,
   OnlyResponseCanBeReturned,
   PageNumberParamNotFound,
+  PrerenderClientAddressNotAvailable,
   PrerenderDynamicEndpointPathCollide,
   RedirectWithNoLocation,
   ReservedSlotName,
   ResponseSentError,
+  RouteNotFound,
   StaticClientAddressNotAvailable,
   StaticRedirectNotAvailable,
   UnhandledRejection,

package/dist/core/errors/errors.js

@@ -13,8 +13,7 @@ class AstroError extends Error {
     super(message, options);
     this.title = title;
     this.name = name;
-    if (message)
-      this.message = message;
+    if (message) this.message = message;
     this.stack = stack ? stack : this.stack;
     this.loc = location;
     this.hint = hint;

package/dist/core/errors/overlay.js

@@ -668,8 +668,7 @@ class ErrorOverlay extends HTMLElement {
     const el = this.root.querySelector(selector);
     if (html) {
       text = text.split(" ").map((v) => {
-        if (!v.startsWith("https://"))
-          return v;
+        if (!v.startsWith("https://")) return v;
         if (v.endsWith("."))
           return `<a target="_blank" href="${v.slice(0, -1)}">${v.slice(0, -1)}</a>.`;
         return `<a target="_blank" href="${v}">${v}</a>`;

package/dist/core/errors/printer.js

@@ -6,14 +6,12 @@ function codeFrame(src, loc) {
   const lines = normalizeLF(src).split("\n").map((ln) => ln.replace(/\t/g, "  "));
   const visibleLines = [];
   for (let n = -2; n <= 2; n++) {
-    if (lines[loc.line + n])
-      visibleLines.push(loc.line + n);
+    if (lines[loc.line + n]) visibleLines.push(loc.line + n);
   }
   let gutterWidth = 0;
   for (const lineNo of visibleLines) {
     let w = `> ${lineNo}`;
-    if (w.length > gutterWidth)
-      gutterWidth = w.length;
+    if (w.length > gutterWidth) gutterWidth = w.length;
   }
   let output = "";
   for (const lineNo of visibleLines) {

package/dist/core/errors/zod-error-map.js

@@ -51,8 +51,7 @@ const errorMap = (baseError, ctx) => {
   }
 };
 const getTypeOrLiteralMsg = (error) => {
-  if (error.received === "undefined")
-    return "Required";
+  if (error.received === "undefined") return "Required";
   const expectedDeduped = new Set(error.expected);
   switch (error.code) {
     case "invalid_type":
@@ -67,8 +66,7 @@ const getTypeOrLiteralMsg = (error) => {
 };
 const prefix = (key, msg) => key.length ? `**${key}**: ${msg}` : msg;
 const unionExpectedVals = (expectedVals) => [...expectedVals].map((expectedVal, idx) => {
-  if (idx === 0)
-    return JSON.stringify(expectedVal);
+  if (idx === 0) return JSON.stringify(expectedVal);
   const sep = " | ";
   return `${sep}${JSON.stringify(expectedVal)}`;
 }).join("");

package/dist/core/fs/index.js

@@ -9,8 +9,7 @@ function removeDir(_dir) {
 }
 function removeEmptyDirs(root) {
   const dir = fileURLToPath(root);
-  if (!fs.statSync(dir).isDirectory())
-    return;
+  if (!fs.statSync(dir).isDirectory()) return;
   let files = fs.readdirSync(dir);
   if (files.length > 0) {
     files.map((file) => {
@@ -25,8 +24,7 @@ function removeEmptyDirs(root) {
 }
 function emptyDir(_dir, skip) {
   const dir = fileURLToPath(_dir);
-  if (!fs.existsSync(dir))
-    return void 0;
+  if (!fs.existsSync(dir)) return void 0;
   for (const file of fs.readdirSync(dir)) {
     if (skip?.has(file)) {
       continue;

package/dist/core/logger/vite.js

@@ -19,17 +19,14 @@ function createViteLogger(astroLogger, viteLogLevel = "info") {
   const logger = {
     hasWarned: false,
     info(msg) {
-      if (!isLogLevelEnabled(viteLogLevel, "info"))
-        return;
+      if (!isLogLevelEnabled(viteLogLevel, "info")) return;
       const stripped = stripAnsi(msg);
       let m;
       if (m = vitePageReloadMsg.exec(stripped)) {
-        if (isAstroSrcFile(m[1]))
-          return;
+        if (isAstroSrcFile(m[1])) return;
         astroLogger.info("watch", m[1]);
       } else if (m = viteHmrUpdateMsg.exec(stripped)) {
-        if (isAstroSrcFile(m[1]))
-          return;
+        if (isAstroSrcFile(m[1])) return;
         astroLogger.info("watch", m[1]);
       } else if (viteBuildMsg.test(stripped) || viteShortcutTitleMsg.test(stripped)) {
       } else if (viteShortcutHelpMsg.test(stripped)) {
@@ -40,29 +37,23 @@ function createViteLogger(astroLogger, viteLogLevel = "info") {
       }
     },
     warn(msg) {
-      if (!isLogLevelEnabled(viteLogLevel, "warn"))
-        return;
+      if (!isLogLevelEnabled(viteLogLevel, "warn")) return;
       logger.hasWarned = true;
       astroLogger.warn("vite", msg);
     },
     warnOnce(msg) {
-      if (!isLogLevelEnabled(viteLogLevel, "warn"))
-        return;
-      if (warnedMessages.has(msg))
-        return;
+      if (!isLogLevelEnabled(viteLogLevel, "warn")) return;
+      if (warnedMessages.has(msg)) return;
       logger.hasWarned = true;
       astroLogger.warn("vite", msg);
       warnedMessages.add(msg);
     },
     error(msg, opts) {
-      if (!isLogLevelEnabled(viteLogLevel, "error"))
-        return;
+      if (!isLogLevelEnabled(viteLogLevel, "error")) return;
       logger.hasWarned = true;
       const err = opts?.error;
-      if (err)
-        loggedErrors.add(err);
-      if (err && isAstroError(err))
-        return;
+      if (err) loggedErrors.add(err);
+      if (err && isAstroError(err)) return;
       if (msg.includes("Error when evaluating SSR module") || msg.includes("Pre-transform error:")) {
         astroLogger.debug("vite", msg);
         return;

package/dist/core/messages.js

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

package/dist/core/middleware/callMiddleware.d.ts

@@ -1,4 +1,5 @@
-import type { APIContext, MiddlewareHandler } from '../../@types/astro.js';
+import type { APIContext, MiddlewareHandler, RewritePayload } from '../../@types/astro.js';
+import type { Logger } from '../logger/core.js';
 /**
  * Utility function that is in charge of calling the middleware.
  *
@@ -33,4 +34,4 @@ import type { APIContext, MiddlewareHandler } from '../../@types/astro.js';
  * @param apiContext The API context
  * @param responseFunction A callback function that should return a promise with the response
  */
-export declare function callMiddleware(onRequest: MiddlewareHandler, apiContext: APIContext, responseFunction: () => Promise<Response> | Response): Promise<Response>;
+export declare function callMiddleware(onRequest: MiddlewareHandler, apiContext: APIContext, responseFunction: (apiContext: APIContext, rewritePayload?: RewritePayload) => Promise<Response> | Response, enableRerouting: boolean, logger: Logger): Promise<Response>;

package/dist/core/middleware/callMiddleware.js

@@ -1,10 +1,20 @@
 import { AstroError, AstroErrorData } from "../errors/index.js";
-async function callMiddleware(onRequest, apiContext, responseFunction) {
+async function callMiddleware(onRequest, apiContext, responseFunction, enableRerouting, logger) {
   let nextCalled = false;
   let responseFunctionPromise = void 0;
-  const next = async () => {
+  const next = async (payload) => {
     nextCalled = true;
-    responseFunctionPromise = responseFunction();
+    if (!enableRerouting && payload) {
+      logger.warn(
+        "router",
+        "The rewrite API is experimental. To use this feature, add the `rewriting` flag to the `experimental` object in your Astro config."
+      );
+    }
+    if (enableRerouting) {
+      responseFunctionPromise = responseFunction(apiContext, payload);
+    } else {
+      responseFunctionPromise = responseFunction(apiContext);
+    }
     return responseFunctionPromise;
   };
   let middlewarePromise = onRequest(apiContext, next);

package/dist/core/middleware/index.js

@@ -1,14 +1,13 @@
+import { createGetActionResult } from "../../actions/utils.js";
 import {
   computeCurrentLocale,
   computePreferredLocale,
   computePreferredLocaleList
 } from "../../i18n/utils.js";
-import { ASTRO_VERSION } from "../constants.js";
+import { ASTRO_VERSION, clientAddressSymbol, clientLocalsSymbol } from "../constants.js";
 import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { sequence } from "./sequence.js";
-const clientAddressSymbol = Symbol.for("astro.clientAddress");
-const clientLocalsSymbol = Symbol.for("astro.locals");
 function defineMiddleware(fn) {
   return fn;
 }
@@ -22,13 +21,17 @@ function createContext({
   let currentLocale = void 0;
   const url = new URL(request.url);
   const route = url.pathname;
-  return {
+  const rewrite = (_reroutePayload) => {
+    return Promise.resolve(new Response(null));
+  };
+  const context = {
     cookies: new AstroCookies(request),
     request,
     params,
     site: void 0,
     generator: `Astro v${ASTRO_VERSION}`,
     props: {},
+    rewrite,
     redirect(path, status) {
       return new Response(null, {
         status: status || 302,
@@ -73,6 +76,9 @@ function createContext({
       }
     }
   };
+  return Object.assign(context, {
+    getActionResult: createGetActionResult(context.locals)
+  });
 }
 function isLocalsSerializable(value) {
   let type = typeof value;
@@ -91,11 +97,9 @@ function isLocalsSerializable(value) {
   return result;
 }
 function isPlainObject(value) {
-  if (typeof value !== "object" || value === null)
-    return false;
+  if (typeof value !== "object" || value === null) return false;
   let proto = Object.getPrototypeOf(value);
-  if (proto === null)
-    return true;
+  if (proto === null) return true;
   let baseProto = proto;
   while (Object.getPrototypeOf(baseProto) !== null) {
     baseProto = Object.getPrototypeOf(baseProto);

package/dist/core/middleware/sequence.js

@@ -1,22 +1,40 @@
+import { AstroCookies } from "../cookies/cookies.js";
 import { defineMiddleware } from "./index.js";
 function sequence(...handlers) {
   const filtered = handlers.filter((h) => !!h);
   const length = filtered.length;
   if (!length) {
-    const handler = defineMiddleware((context, next) => {
+    return defineMiddleware((_context, next) => {
       return next();
     });
-    return handler;
   }
   return defineMiddleware((context, next) => {
+    let carriedPayload = void 0;
     return applyHandle(0, context);
     function applyHandle(i, handleContext) {
       const handle = filtered[i];
-      const result = handle(handleContext, async () => {
+      const result = handle(handleContext, async (payload) => {
         if (i < length - 1) {
+          if (payload) {
+            let newRequest;
+            if (payload instanceof Request) {
+              newRequest = payload;
+            } else if (payload instanceof URL) {
+              newRequest = new Request(payload, handleContext.request);
+            } else {
+              newRequest = new Request(
+                new URL(payload, handleContext.url.origin),
+                handleContext.request
+              );
+            }
+            carriedPayload = payload;
+            handleContext.request = newRequest;
+            handleContext.url = new URL(newRequest.url);
+            handleContext.cookies = new AstroCookies(newRequest);
+          }
           return applyHandle(i + 1, handleContext);
         } else {
-          return next();
+          return next(payload ?? carriedPayload);
         }
       });
       return result;

package/dist/core/module-loader/vite.js

@@ -5,8 +5,7 @@ function createViteLoader(viteServer) {
   let isTsconfigUpdated = false;
   function isTsconfigUpdate(filePath) {
     const result = path.basename(filePath) === "tsconfig.json";
-    if (result)
-      isTsconfigUpdated = true;
+    if (result) isTsconfigUpdated = true;
     return result;
   }
   viteServer.watcher.on("add", (...args) => {

package/dist/core/render/params-and-props.js

@@ -34,11 +34,9 @@ async function getProps(opts) {
   return props;
 }
 function getParams(route, pathname) {
-  if (!route.params.length)
-    return {};
+  if (!route.params.length) return {};
   const paramsMatch = route.pattern.exec(decodeURIComponent(pathname));
-  if (!paramsMatch)
-    return {};
+  if (!paramsMatch) return {};
   const params = {};
   route.params.forEach((key, i) => {
     if (key.startsWith("...")) {

package/dist/core/render/slots.js

@@ -4,11 +4,9 @@ import { chunkToString } from "../../runtime/server/render/index.js";
 import { isRenderInstruction } from "../../runtime/server/render/instruction.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 function getFunctionExpression(slot) {
-  if (!slot)
-    return;
+  if (!slot) return;
   const expressions = slot?.expressions?.filter((e) => isRenderInstruction(e) === false);
-  if (expressions?.length !== 1)
-    return;
+  if (expressions?.length !== 1) return;
   return expressions[0];
 }
 class Slots {
@@ -37,13 +35,11 @@ class Slots {
     }
   }
   has(name) {
-    if (!this.#slots)
-      return false;
+    if (!this.#slots) return false;
     return Boolean(this.#slots[name]);
   }
   async render(name, args = []) {
-    if (!this.#slots || !this.has(name))
-      return;
+    if (!this.#slots || !this.has(name)) return;
     const result = this.#result;
     if (!Array.isArray(args)) {
       this.#logger.warn(

package/dist/core/render-context.d.ts

@@ -1,4 +1,5 @@
 import type { APIContext, AstroGlobal, AstroGlobalPartial, ComponentInstance, MiddlewareHandler, RouteData, SSRResult } from '../@types/astro.js';
+import type { ActionAPIContext } from '../actions/runtime/store.js';
 import { AstroCookies } from './cookies/index.js';
 import { type Pipeline } from './render/index.js';
 /**
@@ -11,13 +12,21 @@ export declare class RenderContext {
     locals: App.Locals;
     readonly middleware: MiddlewareHandler;
     readonly pathname: string;
-    readonly request: Request;
-    readonly routeData: RouteData;
+    request: Request;
+    routeData: RouteData;
     status: number;
-    readonly cookies: AstroCookies;
-    readonly params: import("../@types/astro.js").Params;
-    readonly url: URL;
+    protected cookies: AstroCookies;
+    params: import("../@types/astro.js").Params;
+    protected url: URL;
     private constructor();
+    /**
+     * A flag that tells the render content if the rewriting was triggered
+     */
+    isRewriting: boolean;
+    /**
+     * A safety net in case of loops
+     */
+    counter: number;
     static create({ locals, middleware, pathname, pipeline, request, routeData, status, }: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData'> & Partial<Pick<RenderContext, 'locals' | 'middleware' | 'status'>>): RenderContext;
     /**
      * The main function of the RenderContext.
@@ -32,6 +41,7 @@ export declare class RenderContext {
      */
     render(componentInstance: ComponentInstance | undefined): Promise<Response>;
     createAPIContext(props: APIContext['props']): APIContext;
+    createActionAPIContext(): ActionAPIContext;
     createResult(mod: ComponentInstance): Promise<SSRResult>;
     /**
      * The Astro global is sourced in 3 different phases: