astro 4.16.3 → 4.16.4

package/dist/content/content-layer.js

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

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.16.3";
+const ASTRO_VERSION = "4.16.4";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

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

package/dist/core/messages.js

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

package/dist/core/middleware/index.js

@@ -7,6 +7,7 @@ import {
 import { ASTRO_VERSION, clientAddressSymbol, clientLocalsSymbol } from "../constants.js";
 import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
+import { getClientIpAddress } from "../routing/request.js";
 import { sequence } from "./sequence.js";
 function defineMiddleware(fn) {
   return fn;
@@ -20,6 +21,7 @@ function createContext({
   let preferredLocale = void 0;
   let preferredLocaleList = void 0;
   let currentLocale = void 0;
+  let clientIpAddress;
   const url = new URL(request.url);
   const route = url.pathname;
   const rewrite = (_reroutePayload) => {
@@ -52,10 +54,14 @@ function createContext({
     },
     url,
     get clientAddress() {
-      if (clientAddressSymbol in request) {
-        return Reflect.get(request, clientAddressSymbol);
+      if (clientIpAddress) {
+        return clientIpAddress;
       }
-      throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
+      clientIpAddress = getClientIpAddress(request);
+      if (!clientIpAddress) {
+        throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
+      }
+      return clientIpAddress;
     },
     get locals() {
       let locals = Reflect.get(request, clientLocalsSymbol);

package/dist/core/render-context.js

@@ -428,7 +428,17 @@ class RenderContext {
     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, defaultLocale) ?? computeCurrentLocale(url.pathname, locales, defaultLocale) ?? fallbackTo;
+    if (this.#currentLocale) {
+      return this.#currentLocale;
+    }
+    let computedLocale;
+    if (routeData.pathname) {
+      computedLocale = computeCurrentLocale(routeData.pathname, locales, defaultLocale);
+    } else {
+      computedLocale = computeCurrentLocale(url.pathname, locales, defaultLocale);
+    }
+    this.#currentLocale = computedLocale ?? fallbackTo;
+    return this.#currentLocale;
   }
   #preferredLocale;
   computePreferredLocale() {

package/dist/core/routing/request.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Utilities for extracting information from `Request`
+ */
+export declare function getFirstForwardedValue(multiValueHeader?: string | string[] | null): string | undefined;
+/**
+ * Returns the first value associated to the `x-forwarded-for` header.
+ *
+ * @param {Request} request
+ */
+export declare function getClientIpAddress(request: Request): string | undefined;

package/dist/core/routing/request.js

@@ -0,0 +1,10 @@
+function getFirstForwardedValue(multiValueHeader) {
+  return multiValueHeader?.toString()?.split(",").map((e) => e.trim())?.[0];
+}
+function getClientIpAddress(request) {
+  return getFirstForwardedValue(request.headers.get("x-forwarded-for"));
+}
+export {
+  getClientIpAddress,
+  getFirstForwardedValue
+};

package/dist/runtime/client/dev-toolbar/apps/audit/rules/a11y.js

@@ -53,7 +53,7 @@ const interactiveElements = [
   "textarea",
   ...MAYBE_INTERACTIVE.keys()
 ];
-const labellableElements = ["input", "meter", "output", "progress", "select", "textarea"];
+const labellableElements = ["button", "input", "meter", "output", "progress", "select", "textarea"];
 const aria_non_interactive_roles = [
   "alert",
   "alertdialog",

package/dist/vite-plugin-astro-server/plugin.js

@@ -59,6 +59,9 @@ function createVitePluginAstroServer({
         );
       }
       process.on("unhandledRejection", handleUnhandledRejection);
+      viteServer.httpServer?.on("close", () => {
+        process.off("unhandledRejection", handleUnhandledRejection);
+      });
       return () => {
         viteServer.middlewares.stack.unshift({
           route: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.16.3",
+  "version": "4.16.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -109,9 +109,9 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.10.3",
-    "@babel/core": "^7.25.7",
+    "@babel/core": "^7.25.8",
     "@babel/plugin-transform-react-jsx": "^7.25.7",
-    "@babel/types": "^7.25.7",
+    "@babel/types": "^7.25.8",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.2",
     "@types/babel__core": "^7.20.5",
@@ -142,7 +142,7 @@
     "http-cache-semantics": "^4.1.1",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.11",
+    "magic-string": "^0.30.12",
     "magicast": "^0.3.5",
     "micromatch": "^4.0.8",
     "mrmime": "^2.0.0",
@@ -156,11 +156,11 @@
     "semver": "^7.6.3",
     "shiki": "^1.22.0",
     "tinyexec": "^0.3.0",
-    "tsconfck": "^3.1.3",
+    "tsconfck": "^3.1.4",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
-    "vite": "^5.4.8",
-    "vitefu": "^1.0.2",
+    "vite": "^5.4.9",
+    "vitefu": "^1.0.3",
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.0.2",
     "yargs-parser": "^21.1.1",
@@ -176,12 +176,12 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.47.2",
+    "@playwright/test": "^1.48.0",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",
-    "@types/diff": "^5.2.2",
+    "@types/diff": "^5.2.3",
     "@types/dlv": "^1.1.4",
     "@types/hast": "^3.0.4",
     "@types/html-escaper": "^3.0.2",
@@ -194,10 +194,10 @@
     "cheerio": "1.0.0",
     "eol": "^0.10.0",
     "execa": "^8.0.1",
-    "expect-type": "^1.0.0",
+    "expect-type": "^1.1.0",
+    "fs-fixture": "^2.4.0",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.1.3",
-    "memfs": "^4.12.0",
     "node-mocks-http": "^1.16.1",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
@@ -205,8 +205,8 @@
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.24.0",
-    "sass": "^1.79.4",
-    "undici": "^6.19.8",
+    "sass": "^1.79.5",
+    "undici": "^6.20.1",
     "unified": "^11.0.5",
     "astro-scripts": "0.0.14"
   },
@@ -223,13 +223,14 @@
     "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc",
     "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm",
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
-    "test": "pnpm run test:node && pnpm run test:types",
-    "test:match": "pnpm run test:node --match",
+    "test": "pnpm run test:unit && pnpm run test:integration && pnpm run test:types",
+    "test:match": "astro-scripts test \"test/**/*.test.js\" --match",
     "test:e2e": "pnpm test:e2e:chrome && pnpm test:e2e:firefox",
     "test:e2e:match": "playwright test -g",
     "test:e2e:chrome": "playwright test",
     "test:e2e:firefox": "playwright test --config playwright.firefox.config.js",
     "test:types": "tsc --project tsconfig.tests.json",
-    "test:node": "astro-scripts test \"test/**/*.test.js\""
+    "test:unit": "astro-scripts test \"test/units/**/*.test.js\" --teardown ./test/units/teardown.js",
+    "test:integration": "astro-scripts test \"test/*.test.js\""
   }
 }