astro 5.2.3 → 5.2.5

package/dist/cli/add/index.js

@@ -322,7 +322,24 @@ async function add(names, { flags }) {
 ${list}`
         )
       );
-      logger.info("SKIP_FORMAT", msg.success("Import './src/styles/global.css' in a layout"));
+      if (integrations.find((integration) => integration.integrationName === "tailwind")) {
+        const code = boxen(
+          getDiffContent("---\n---", "---\nimport './src/styles/global.css'\n---"),
+          {
+            margin: 0.5,
+            padding: 0.5,
+            borderStyle: "round",
+            title: "src/layouts/Layout.astro"
+          }
+        );
+        logger.warn(
+          "SKIP_FORMAT",
+          msg.actionRequired(
+            "You must import your Tailwind stylesheet, e.g. in a shared layout:\n"
+          )
+        );
+        logger.info("SKIP_FORMAT", code + "\n");
+      }
     }
   }
   const updateTSConfigResult = await updateTSConfig(cwd, logger, integrations, flags);

package/dist/content/content-layer.js

@@ -153,7 +153,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.2.3") {
+    if (previousAstroVersion && previousAstroVersion !== "5.2.5") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -161,8 +161,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.2.3") {
-      await this.#store.metaStore().set("astro-version", "5.2.3");
+    if ("5.2.5") {
+      await this.#store.metaStore().set("astro-version", "5.2.5");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.2.3";
+const ASTRO_VERSION = "5.2.5";
 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 = "5.2.3";
+  const currentVersion = "5.2.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.d.ts

@@ -44,6 +44,7 @@ export declare function prerelease({ currentVersion }: {
 }): string;
 export declare function success(message: string, tip?: string): string;
 export declare function failure(message: string, tip?: string): string;
+export declare function actionRequired(message: string): string;
 export declare function cancelled(message: string, tip?: string): string;
 export declare function formatConfigErrorMessage(err: ZodError): string;
 export declare function formatErrorMessage(err: ErrorWithMetadata, showFullStacktrace: boolean): string;

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.2.3";
+  const version = "5.2.5";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -162,6 +162,11 @@ function failure(message, tip) {
   \u25B6 ${tip}` : void 0;
   return ["", `${badge} ${headline}`, footer].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
 }
+function actionRequired(message) {
+  const badge = bgYellow(black(` action required `));
+  const headline = yellow(message);
+  return ["", `${badge} ${headline}`].filter((v) => v !== void 0).map((msg) => `  ${msg}`).join("\n");
+}
 function cancelled(message, tip) {
   const badge = bgYellow(black(` cancelled `));
   const headline = yellow(message);
@@ -276,7 +281,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.2.3"}`
+        `v${"5.2.5"}`
       )} ${headline}`
     );
   }
@@ -300,6 +305,7 @@ function printHelp({
   console.log(message.join("\n") + "\n");
 }
 export {
+  actionRequired,
   cancelled,
   failure,
   formatConfigErrorMessage,

package/dist/core/render-context.js

@@ -24,7 +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 { isRoute404or500, isRouteServerIsland } from "./routing/match.js";
+import { isRoute404or500, isRouteExternalRedirect, isRouteServerIsland } from "./routing/match.js";
 import { copyRequest, getOriginPathname, setOriginPathname } from "./routing/rewrite.js";
 import { AstroSession } from "./session.js";
 const apiContextRoutesSymbol = Symbol.for("context.routes");
@@ -199,6 +199,9 @@ class RenderContext {
       }
       return response2;
     };
+    if (isRouteExternalRedirect(this.routeData)) {
+      return renderRedirect(this);
+    }
     const response = await callMiddleware(middleware, apiContext, lastNext);
     if (response.headers.get(ROUTE_TYPE_HEADER)) {
       response.headers.delete(ROUTE_TYPE_HEADER);

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

@@ -14,7 +14,7 @@ import {
   UnsupportedExternalRedirect
 } from "../../errors/errors-data.js";
 import { AstroError } from "../../errors/index.js";
-import { removeLeadingForwardSlash, slash } from "../../path.js";
+import { hasFileExtension, removeLeadingForwardSlash, slash } from "../../path.js";
 import { injectServerIslandRoute } from "../../server-islands/endpoint.js";
 import { resolvePages } from "../../util.js";
 import { ensure404Route } from "../astro-designed-error-pages.js";
@@ -145,10 +145,10 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
       } else {
         components.push(item.file);
         const component = item.file;
-        const { trailingSlash } = settings.config;
+        const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
+        const trailingSlash = trailingSlashForPath(pathname, settings.config);
         const pattern = getPattern(segments, settings.config.base, trailingSlash);
         const generate = getRouteGenerator(segments, trailingSlash);
-        const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
         const route = joinSegments(segments);
         routes.push({
           route,
@@ -178,6 +178,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
   }
   return routes;
 }
+const trailingSlashForPath = (pathname, config) => pathname && hasFileExtension(pathname) ? "ignore" : config.trailingSlash;
 function createInjectedRoutes({ settings, cwd }) {
   const { config } = settings;
   const prerender = getPrerenderDefault(config);
@@ -190,10 +191,10 @@ function createInjectedRoutes({ settings, cwd }) {
       return getParts(s, component);
     });
     const type = resolved.endsWith(".astro") ? "page" : "endpoint";
-    const { trailingSlash } = config;
+    const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
+    const trailingSlash = trailingSlashForPath(pathname, config);
     const pattern = getPattern(segments, settings.config.base, trailingSlash);
     const generate = getRouteGenerator(segments, trailingSlash);
-    const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
     const route = joinSegments(segments);
     routes.push({

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

@@ -36,3 +36,10 @@ export declare function isRequestServerIsland(request: Request, base?: string):
  * @return {boolean} Returns true if the request matches a 404 or 500 route; otherwise, returns false.
  */
 export declare function requestIs404Or500(request: Request, base?: string): boolean;
+/**
+ * Determines whether a given route is an external redirect.
+ *
+ * @param {RouteData} route - The route object to check.
+ * @return {boolean} Returns true if the route is an external redirect, otherwise false.
+ */
+export declare function isRouteExternalRedirect(route: RouteData): boolean;

package/dist/core/routing/match.js

@@ -1,3 +1,4 @@
+import { redirectIsExternal } from "../redirects/render.js";
 import { SERVER_ISLAND_BASE_PREFIX, SERVER_ISLAND_COMPONENT } from "../server-islands/endpoint.js";
 function matchRoute(pathname, manifest) {
   const decodedPathname = decodeURI(pathname);
@@ -32,11 +33,15 @@ function requestIs404Or500(request, base = "") {
   const pathname = url.pathname.slice(base.length);
   return isRoute404(pathname) || isRoute500(pathname);
 }
+function isRouteExternalRedirect(route) {
+  return !!(route.type === "redirect" && route.redirect && redirectIsExternal(route.redirect));
+}
 export {
   isRequestServerIsland,
   isRoute404,
   isRoute404or500,
   isRoute500,
+  isRouteExternalRedirect,
   isRouteServerIsland,
   matchAllRoutes,
   matchRoute,

package/dist/runtime/server/escape.d.ts

@@ -1,5 +1,4 @@
-import { escape } from 'html-escaper';
-export declare const escapeHTML: typeof escape;
+export declare const escapeHTML: (str: string) => string;
 export declare class HTMLBytes extends Uint8Array {
 }
 /**

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

@@ -4,20 +4,20 @@ import { writeHtmlResponse, writeRedirectResponse } from "./response.js";
 function trailingSlashMiddleware(settings) {
   const { trailingSlash } = settings.config;
   return function devTrailingSlash(req, res, next) {
-    const url = req.url;
-    const destination = collapseDuplicateTrailingSlashes(url, true);
-    if (url && destination !== url) {
-      return writeRedirectResponse(res, 301, destination);
-    }
+    const url = new URL(`http://localhost${req.url}`);
     let pathname;
     try {
-      pathname = decodeURI(new URL(url, "http://localhost").pathname);
+      pathname = decodeURI(url.pathname);
     } catch (e) {
       return next(e);
     }
     if (pathname.startsWith("/_") || pathname.startsWith("/@")) {
       return next();
     }
+    const destination = collapseDuplicateTrailingSlashes(pathname, true);
+    if (pathname && destination !== pathname) {
+      return writeRedirectResponse(res, 301, `${destination}${url.search}`);
+    }
     if (trailingSlash === "never" && pathname.endsWith("/") && pathname !== "/" || trailingSlash === "always" && !pathname.endsWith("/") && !hasFileExtension(pathname)) {
       const html = trailingSlashMismatchTemplate(pathname, trailingSlash);
       return writeHtmlResponse(res, 404, html);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.2.3",
+  "version": "5.2.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -139,10 +139,10 @@
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
     "p-queue": "^8.1.0",
-    "preferred-pm": "^4.1.0",
+    "preferred-pm": "^4.1.1",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
-    "semver": "^7.7.0",
+    "semver": "^7.7.1",
     "shiki": "^1.29.2",
     "tinyexec": "^0.3.2",
     "tsconfck": "^3.1.4",
@@ -152,14 +152,14 @@
     "vfile": "^6.0.3",
     "vite": "^6.0.11",
     "vitefu": "^1.0.5",
-    "which-pm": "^3.0.0",
+    "which-pm": "^3.0.1",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
     "yocto-spinner": "^0.2.0",
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.5.0",
+    "@astrojs/internal-helpers": "0.5.1",
     "@astrojs/markdown-remark": "6.1.0",
     "@astrojs/telemetry": "3.2.0"
   },
@@ -168,7 +168,7 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.50.0",
+    "@playwright/test": "^1.50.1",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
@@ -176,7 +176,7 @@
     "@types/diff": "^5.2.3",
     "@types/dlv": "^1.1.5",
     "@types/hast": "^3.0.4",
-    "@types/html-escaper": "3.0.2",
+    "@types/html-escaper": "3.0.4",
     "@types/http-cache-semantics": "^4.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/micromatch": "^4.0.9",
@@ -196,11 +196,11 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.32.1",
+    "rollup": "^4.34.2",
     "sass": "^1.83.4",
     "undici": "^7.3.0",
     "unified": "^11.0.5",
-    "vitest": "^3.0.4",
+    "vitest": "^3.0.5",
     "astro-scripts": "0.0.14"
   },
   "engines": {