astro 4.11.3 → 4.11.4

package/dist/@types/astro.d.ts

@@ -648,10 +648,12 @@ export interface AstroUserConfig {
      * @default `true`
      * @description
      *
-     * This is an option to minify your HTML output and reduce the size of your HTML files, occuring both in development mode and in the final build.
-     * By default, Astro removes whitespace from your HTML, including line breaks, from .astro components in a lossless manner.
-     * It is important to note that some whitespace may be kept to preserve the visual rendering of your HTML.
-     * To disable HTML compression, set the compressHTML flag to false.
+     * This is an option to minify your HTML output and reduce the size of your HTML files.
+     *
+     * By default, Astro removes whitespace from your HTML, including line breaks, from `.astro` components in a lossless manner.
+     * Some whitespace may be kept as needed to preserve the visual rendering of your HTML. This occurs both in development mode and in the final build.
+     *
+     * To disable HTML compression, set `compressHTML` to false.
      *
      * ```js
      * {

package/dist/core/constants.js

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

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

package/dist/core/errors/overlay.js

@@ -76,7 +76,7 @@ const style = (
   --astro-code-token-parameter: #aa0000;
   --astro-code-token-function: #4ca48f;
   --astro-code-token-string-expression: #9f722a;
-  --astro-code-token-punctuation: #ffffff;
+  --astro-code-token-punctuation: #000000;
   --astro-code-token-link: #9f722a;
 }
 

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.11.3";
+  const version = "4.11.4";
   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.11.3"}`
+        `v${"4.11.4"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -113,8 +113,9 @@ class RenderContext {
           this.routeData = routeData;
           componentInstance = component;
           this.isRewriting = true;
+          this.status = 200;
         } else {
-          this.pipeline.logger.warn(
+          this.pipeline.logger.error(
             "router",
             "The rewrite API is experimental. To use this feature, add the `rewriting` flag to the `experimental` object in your Astro config."
           );
@@ -179,30 +180,47 @@ class RenderContext {
       getActionResult: createGetActionResult(context.locals)
     });
   }
+  async #executeRewrite(reroutePayload) {
+    this.pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
+    if (!this.pipeline.manifest.rewritingEnabled) {
+      this.pipeline.logger.error(
+        "router",
+        "The rewrite API is experimental. To use this feature, add the `rewriting` flag to the `experimental` object in your Astro config."
+      );
+      return new Response(
+        "The rewrite API is experimental. To use this feature, add the `rewriting` flag to the `experimental` object in your Astro config.",
+        {
+          status: 500,
+          statusText: "The rewrite API is experimental. To use this feature, add the `rewriting` flag to the `experimental` object in your Astro config."
+        }
+      );
+    }
+    const [routeData, component, newURL] = await this.pipeline.tryRewrite(
+      reroutePayload,
+      this.request,
+      this.originalRoute
+    );
+    this.routeData = routeData;
+    if (reroutePayload instanceof Request) {
+      this.request = reroutePayload;
+    } else {
+      this.request = this.#copyRequest(newURL, this.request);
+    }
+    this.url = new URL(this.request.url);
+    this.cookies = new AstroCookies(this.request);
+    this.params = getParams(routeData, this.url.pathname);
+    this.pathname = this.url.pathname;
+    this.isRewriting = true;
+    this.status = 200;
+    return await this.render(component);
+  }
   createActionAPIContext() {
     const renderContext = 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);
-      const [routeData, component, newURL] = await pipeline.tryRewrite(
-        reroutePayload,
-        this.request,
-        this.originalRoute
-      );
-      this.routeData = routeData;
-      if (reroutePayload instanceof Request) {
-        this.request = reroutePayload;
-      } else {
-        this.request = this.#copyRequest(newURL, this.request);
-      }
-      this.url = newURL;
-      this.cookies = new AstroCookies(this.request);
-      this.params = getParams(routeData, this.url.pathname);
-      this.isRewriting = true;
-      this.pathname = this.url.pathname;
-      return await this.render(component);
+      return await this.#executeRewrite(reroutePayload);
     };
     return {
       cookies,
@@ -345,24 +363,7 @@ class RenderContext {
       return new Response(null, { status, headers: { Location: path } });
     };
     const rewrite = async (reroutePayload) => {
-      pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
-      const [routeData, component, newURL] = await pipeline.tryRewrite(
-        reroutePayload,
-        this.request,
-        this.originalRoute
-      );
-      this.routeData = routeData;
-      if (reroutePayload instanceof Request) {
-        this.request = reroutePayload;
-      } else {
-        this.request = this.#copyRequest(newURL, this.request);
-      }
-      this.url = new URL(this.request.url);
-      this.cookies = new AstroCookies(this.request);
-      this.params = getParams(routeData, this.url.pathname);
-      this.pathname = this.url.pathname;
-      this.isRewriting = true;
-      return await this.render(component);
+      return await this.#executeRewrite(reroutePayload);
     };
     return {
       generator: astroStaticPartial.generator,

package/dist/runtime/server/render/util.js

@@ -2,8 +2,6 @@ import { clsx } from "clsx";
 import { HTMLString, markHTMLString } from "../escape.js";
 const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
 const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|itemscope)$/i;
-const htmlEnumAttributes = /^(?:contenteditable|draggable|spellcheck|value)$/i;
-const svgEnumAttributes = /^(?:autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
@@ -38,12 +36,6 @@ function addAttribute(value, key, shouldEscape = true) {
   if (value == null) {
     return "";
   }
-  if (value === false) {
-    if (htmlEnumAttributes.test(key) || svgEnumAttributes.test(key)) {
-      return markHTMLString(` ${key}="false"`);
-    }
-    return "";
-  }
   if (STATIC_DIRECTIVES.has(key)) {
     console.warn(`[astro] The "${key}" directive cannot be applied dynamically at runtime. It will not be rendered as an attribute.
 
@@ -73,11 +65,13 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
   if (typeof value === "string" && value.includes("&") && isHttpUrl(value)) {
     return markHTMLString(` ${key}="${toAttributeString(value, false)}"`);
   }
-  if (value === true && (key.startsWith("data-") || htmlBooleanAttributes.test(key))) {
+  if (htmlBooleanAttributes.test(key)) {
+    return markHTMLString(value ? ` ${key}` : "");
+  }
+  if (value === "") {
     return markHTMLString(` ${key}`);
-  } else {
-    return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
   }
+  return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
 }
 function internalSpreadAttributes(values, shouldEscape = true) {
   let output = "";

package/dist/virtual-modules/i18n.js

@@ -9,7 +9,7 @@ const { trailingSlash, format, site, i18n, isBuild } = (
 );
 const { defaultLocale, locales, domains, fallback, routing } = i18n;
 const base = import.meta.env.BASE_URL;
-const strategy = toRoutingStrategy(routing, domains);
+let strategy = toRoutingStrategy(routing, domains);
 const noop = (method) => function() {
   throw new AstroError({
     ...IncorrectStrategyForI18n,
@@ -123,10 +123,11 @@ if (i18n?.routing === "manual") {
 let middleware;
 if (i18n?.routing === "manual") {
   middleware = (customOptions) => {
+    strategy = toRoutingStrategy(customOptions, {});
     const manifest = {
       ...i18n,
       fallback: void 0,
-      strategy: toRoutingStrategy(customOptions, {}),
+      strategy,
       domainLookupTable: {}
     };
     return I18nInternals.createMiddleware(manifest, base, trailingSlash, format);

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

@@ -11,9 +11,8 @@ import { getProps } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { default404Page } from "../core/routing/astro-designed-error-pages.js";
 import { matchAllRoutes } from "../core/routing/index.js";
-import { normalizeTheLocale } from "../i18n/index.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
-import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
+import { writeSSRResult, writeWebResponse } from "./response.js";
 function isLoggedRequest(url) {
   return url !== "/favicon.ico";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.11.3",
+  "version": "4.11.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -156,13 +156,13 @@
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
     "semver": "^7.6.2",
-    "shiki": "^1.9.0",
-    "string-width": "^7.1.0",
+    "shiki": "^1.10.0",
+    "string-width": "^7.2.0",
     "strip-ansi": "^7.1.0",
-    "tsconfck": "^3.1.0",
+    "tsconfck": "^3.1.1",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.3.1",
+    "vite": "^5.3.2",
     "vitefu": "^0.2.5",
     "which-pm": "^2.2.0",
     "yargs-parser": "^21.1.1",
@@ -177,7 +177,7 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.7.0",
-    "@playwright/test": "^1.44.1",
+    "@playwright/test": "^1.45.0",
     "@types/aria-query": "^5.0.4",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.6",