astro 4.1.3 → 4.2.0

package/dist/i18n/index.d.ts

@@ -1,11 +1,12 @@
 import type { AstroConfig, Locales } from '../@types/astro.js';
+import type { RoutingStrategies } from '../core/config/schema.js';
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;
     base: string;
     locales: Locales;
     trailingSlash: AstroConfig['trailingSlash'];
     format: AstroConfig['build']['format'];
-    routing?: 'prefix-always' | 'prefix-other-locales';
+    routing?: RoutingStrategies;
     defaultLocale: string;
 };
 export type GetLocaleOptions = {
@@ -39,7 +40,7 @@ type GetLocalesBaseUrl = GetLocaleOptions & {
     locales: Locales;
     trailingSlash: AstroConfig['trailingSlash'];
     format: AstroConfig['build']['format'];
-    routing?: 'prefix-always' | 'prefix-other-locales';
+    routing?: RoutingStrategies;
     defaultLocale: string;
 };
 export declare function getLocaleRelativeUrlList({ base, locales: _locales, trailingSlash, format, path, prependWith, normalizeLocale, routing, defaultLocale, }: GetLocalesBaseUrl): string[];

package/dist/i18n/index.js

@@ -11,7 +11,7 @@ function getLocaleRelativeUrl({
   path,
   prependWith,
   normalizeLocale = true,
-  routing = "prefix-other-locales",
+  routing = "pathname-prefix-other-locales",
   defaultLocale
 }) {
   const codeToUse = peekCodePathToUse(_locales, locale);
@@ -23,7 +23,7 @@ function getLocaleRelativeUrl({
   }
   const pathsToJoin = [base, prependWith];
   const normalizedLocale = normalizeLocale ? normalizeTheLocale(codeToUse) : codeToUse;
-  if (routing === "prefix-always") {
+  if (routing === "pathname-prefix-always") {
     pathsToJoin.push(normalizedLocale);
   } else if (locale !== defaultLocale) {
     pathsToJoin.push(normalizedLocale);
@@ -51,14 +51,14 @@ function getLocaleRelativeUrlList({
   path,
   prependWith,
   normalizeLocale = false,
-  routing = "prefix-other-locales",
+  routing = "pathname-prefix-other-locales",
   defaultLocale
 }) {
   const locales = toPaths(_locales);
   return locales.map((locale) => {
     const pathsToJoin = [base, prependWith];
     const normalizedLocale = normalizeLocale ? normalizeTheLocale(locale) : locale;
-    if (routing === "prefix-always") {
+    if (routing === "pathname-prefix-always") {
       pathsToJoin.push(normalizedLocale);
     } else if (locale !== defaultLocale) {
       pathsToJoin.push(normalizedLocale);

package/dist/i18n/middleware.js

@@ -1,5 +1,6 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { getPathByLocale, normalizeTheLocale } from "./index.js";
+import { shouldAppendForwardSlash } from "../core/build/util.js";
 const routeDataSymbol = Symbol.for("astro.routeData");
 function pathnameHasLocale(pathname, locales) {
   const segments = pathname.split("/");
@@ -35,25 +36,41 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
     const response = await next();
     if (response instanceof Response) {
       const pathnameContainsDefaultLocale = url.pathname.includes(`/${defaultLocale}`);
-      if (i18n.routing === "prefix-other-locales" && pathnameContainsDefaultLocale) {
-        const newLocation = url.pathname.replace(`/${defaultLocale}`, "");
-        response.headers.set("Location", newLocation);
-        return new Response(null, {
-          status: 404,
-          headers: response.headers
-        });
-      } else if (i18n.routing === "prefix-always") {
-        if (url.pathname === base + "/" || url.pathname === base) {
-          if (trailingSlash === "always") {
-            return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
-          } else {
-            return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
+      switch (i18n.routing) {
+        case "pathname-prefix-other-locales": {
+          if (pathnameContainsDefaultLocale) {
+            const newLocation = url.pathname.replace(`/${defaultLocale}`, "");
+            response.headers.set("Location", newLocation);
+            return new Response(null, {
+              status: 404,
+              headers: response.headers
+            });
+          }
+          break;
+        }
+        case "pathname-prefix-always-no-redirect": {
+          const isRoot = url.pathname === base + "/" || url.pathname === base;
+          if (!(isRoot || pathnameHasLocale(url.pathname, i18n.locales))) {
+            return new Response(null, {
+              status: 404,
+              headers: response.headers
+            });
+          }
+          break;
+        }
+        case "pathname-prefix-always": {
+          if (url.pathname === base + "/" || url.pathname === base) {
+            if (trailingSlash === "always") {
+              return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
+            } else {
+              return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
+            }
+          } else if (!pathnameHasLocale(url.pathname, i18n.locales)) {
+            return new Response(null, {
+              status: 404,
+              headers: response.headers
+            });
           }
-        } else if (!pathnameHasLocale(url.pathname, i18n.locales)) {
-          return new Response(null, {
-            status: 404,
-            headers: response.headers
-          });
         }
       }
       if (response.status >= 300 && fallback) {
@@ -75,7 +92,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
           const fallbackLocale = fallback[urlLocale];
           const pathFallbackLocale = getPathByLocale(fallbackLocale, locales);
           let newPathname;
-          if (pathFallbackLocale === defaultLocale && routing === "prefix-other-locales") {
+          if (pathFallbackLocale === defaultLocale && routing === "pathname-prefix-other-locales") {
             newPathname = url.pathname.replace(`/${urlLocale}`, ``);
           } else {
             newPathname = url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);

package/dist/prefetch/index.js

@@ -4,6 +4,7 @@ const prefetchedUrls = /* @__PURE__ */ new Set();
 const listenedAnchors = /* @__PURE__ */ new WeakSet();
 let prefetchAll = __PREFETCH_PREFETCH_ALL__;
 let defaultStrategy = __PREFETCH_DEFAULT_STRATEGY__;
+let clientPrerender = __EXPERIMENTAL_CLIENT_PRERENDER__;
 let inited = false;
 function init(defaultOpts) {
   if (!inBrowser)
@@ -128,7 +129,9 @@ function prefetch(url, opts) {
   prefetchedUrls.add(url);
   const priority = opts?.with ?? "link";
   debug?.(`[astro] Prefetching ${url} with ${priority}`);
-  if (priority === "link") {
+  if (clientPrerender && HTMLScriptElement.supports && HTMLScriptElement.supports("speculationrules")) {
+    appendSpeculationRules(url);
+  } else if (priority === "link") {
     const link = document.createElement("link");
     link.rel = "prefetch";
     link.setAttribute("href", url);
@@ -188,6 +191,19 @@ function onPageLoad(cb) {
     cb();
   });
 }
+function appendSpeculationRules(url) {
+  const script = document.createElement("script");
+  script.type = "speculationrules";
+  script.textContent = JSON.stringify({
+    prerender: [
+      {
+        source: "list",
+        urls: [url]
+      }
+    ]
+  });
+  document.head.append(script);
+}
 export {
   init,
   prefetch

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

@@ -32,7 +32,10 @@ function astroPrefetch({ settings }) {
     },
     transform(code, id) {
       if (id.includes(prefetchInternalModuleFsSubpath)) {
-        return code.replace("__PREFETCH_PREFETCH_ALL__", JSON.stringify(prefetch?.prefetchAll)).replace("__PREFETCH_DEFAULT_STRATEGY__", JSON.stringify(prefetch?.defaultStrategy));
+        return code.replace("__PREFETCH_PREFETCH_ALL__", JSON.stringify(prefetch?.prefetchAll)).replace("__PREFETCH_DEFAULT_STRATEGY__", JSON.stringify(prefetch?.defaultStrategy)).replace(
+          "__EXPERIMENTAL_CLIENT_PRERENDER__",
+          JSON.stringify(settings.config.experimental.clientPrerender)
+        );
       }
     }
   };

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

@@ -330,13 +330,61 @@ const a11y = [
   },
   {
     code: "a11y-missing-content",
-    title: "Missing content on element important for accessibility",
-    message: "Headings and anchors must have content to be accessible.",
+    title: "Missing content",
+    message: "Headings and anchors must have an accessible name, which can come from: inner text, aria-label, aria-labelledby, an img with alt property, or an svg with a tag <title></title>.",
     selector: a11y_required_content.join(","),
     match(element) {
       const innerText = element.innerText.trim();
-      if (innerText === "")
-        return true;
+      if (innerText !== "")
+        return false;
+      const ariaLabel = element.getAttribute("aria-label")?.trim();
+      if (ariaLabel && ariaLabel !== "")
+        return false;
+      const ariaLabelledby = element.getAttribute("aria-labelledby")?.trim();
+      if (ariaLabelledby) {
+        const ids = ariaLabelledby.split(" ");
+        for (const id of ids) {
+          const referencedElement = document.getElementById(id);
+          if (referencedElement && referencedElement.innerText.trim() !== "")
+            return false;
+        }
+      }
+      const imgElements = element.querySelectorAll("img");
+      for (const img of imgElements) {
+        const altAttribute = img.getAttribute("alt");
+        if (altAttribute && altAttribute.trim() !== "")
+          return false;
+      }
+      const svgElements = element.querySelectorAll("svg");
+      for (const svg of svgElements) {
+        const titleText = svg.querySelector("title");
+        if (titleText && titleText.textContent && titleText.textContent.trim() !== "")
+          return false;
+      }
+      const inputElements = element.querySelectorAll("input");
+      for (const input of inputElements) {
+        if (input.type === "image") {
+          const altAttribute = input.getAttribute("alt");
+          if (altAttribute && altAttribute.trim() !== "")
+            return false;
+        }
+        const inputAriaLabel = input.getAttribute("aria-label")?.trim();
+        if (inputAriaLabel && inputAriaLabel !== "")
+          return false;
+        const inputAriaLabelledby = input.getAttribute("aria-labelledby")?.trim();
+        if (inputAriaLabelledby) {
+          const ids = inputAriaLabelledby.split(" ");
+          for (const id of ids) {
+            const referencedElement = document.getElementById(id);
+            if (referencedElement && referencedElement.innerText.trim() !== "")
+              return false;
+          }
+        }
+        const title = input.getAttribute("title")?.trim();
+        if (title && title !== "")
+          return false;
+      }
+      return true;
     }
   },
   {

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

@@ -50,10 +50,6 @@ const $$url = ${JSON.stringify(
       i++;
     }
   }
-  if (!compileProps.viteConfig.isProduction) {
-    SUFFIX += `
-if (import.meta.hot) { import.meta.hot.decline() }`;
-  }
   return {
     ...transformResult,
     code: esbuildResult.code + SUFFIX,

package/dist/vite-plugin-astro/hmr.d.ts

@@ -1,11 +1,12 @@
-import type { HmrContext, ModuleNode } from 'vite';
+import type { HmrContext } from 'vite';
 import type { AstroConfig } from '../@types/astro.js';
 import type { cachedCompilation } from '../core/compile/index.js';
 import type { Logger } from '../core/logger/core.js';
 export interface HandleHotUpdateOptions {
     config: AstroConfig;
     logger: Logger;
+    astroFileToCssAstroDeps: Map<string, Set<string>>;
     compile: () => ReturnType<typeof cachedCompilation>;
     source: string;
 }
-export declare function handleHotUpdate(ctx: HmrContext, { config, logger, compile, source }: HandleHotUpdateOptions): Promise<ModuleNode[] | undefined>;
+export declare function handleHotUpdate(ctx: HmrContext, { config, logger, astroFileToCssAstroDeps, compile, source }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;

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

@@ -1,7 +1,7 @@
+import path from "node:path";
+import { appendForwardSlash } from "@astrojs/internal-helpers/path";
 import { invalidateCompilation, isCached } from "../core/compile/index.js";
-import { isAstroSrcFile } from "../core/logger/vite.js";
-import { isAstroScript } from "./query.js";
-async function handleHotUpdate(ctx, { config, logger, compile, source }) {
+async function handleHotUpdate(ctx, { config, logger, astroFileToCssAstroDeps, compile, source }) {
   let isStyleOnlyChange = false;
   if (ctx.file.endsWith(".astro") && isCached(config, ctx.file)) {
     const oldResult = await compile();
@@ -15,51 +15,27 @@ async function handleHotUpdate(ctx, { config, logger, compile, source }) {
   } else {
     invalidateCompilation(config, ctx.file);
   }
-  if (isAstroSrcFile(ctx.file)) {
-    return;
-  }
-  const filtered = new Set(ctx.modules);
-  const files = /* @__PURE__ */ new Set();
-  for (const mod of ctx.modules) {
-    if (isAstroSrcFile(mod.id ?? mod.file)) {
-      filtered.delete(mod);
-      continue;
-    }
-    if (mod.file && isCached(config, mod.file)) {
-      filtered.add(mod);
-      files.add(mod.file);
-    }
-    for (const imp of mod.importers) {
-      if (imp.file && isCached(config, imp.file)) {
-        filtered.add(imp);
-        files.add(imp.file);
-      }
-    }
-  }
-  for (const file of files) {
-    if (isStyleOnlyChange && file === ctx.file)
-      continue;
-    invalidateCompilation(config, file);
-    if (file.endsWith(".astro")) {
-      ctx.server.moduleGraph.onFileChange(file);
-    }
-  }
-  const mods = [...filtered].filter((m) => !m.url.endsWith("="));
   if (isStyleOnlyChange) {
     logger.debug("watch", "style-only change");
-    return mods.filter((mod) => mod.id?.includes("astro&type=style"));
-  }
-  for (const mod of mods) {
-    for (const imp of mod.importedModules) {
-      if (imp.id && isAstroScript(imp.id)) {
-        mods.push(imp);
+    return ctx.modules.filter((mod) => mod.id?.includes("astro&type=style"));
+  }
+  for (const [astroFile, cssAstroDeps] of astroFileToCssAstroDeps) {
+    if (cssAstroDeps.has(ctx.file)) {
+      logger.info("watch", getShortName(ctx.file, ctx.server.config.root));
+      const parentModules = ctx.server.moduleGraph.getModulesByFile(astroFile);
+      if (parentModules) {
+        for (const mod of parentModules) {
+          ctx.server.moduleGraph.invalidateModule(mod);
+        }
       }
+      ctx.server.ws.send({ type: "full-reload", path: "*" });
     }
   }
-  return mods;
 }
 function isStyleOnlyChanged(oldResult, newResult) {
-  return normalizeCode(oldResult.code) === normalizeCode(newResult.code) && !isArrayEqual(oldResult.css, newResult.css);
+  return normalizeCode(oldResult.code) === normalizeCode(newResult.code) && // If style tags are added/removed, we need to regenerate the main Astro file
+  // so that its CSS imports are also added/removed
+  oldResult.css.length === newResult.css.length && !isArrayEqual(oldResult.css, newResult.css);
 }
 const astroStyleImportRE = /import\s*"[^"]+astro&type=style[^"]+";/g;
 const sourceMappingUrlRE = /\/\/# sourceMappingURL=[^ ]+$/gm;
@@ -77,6 +53,9 @@ function isArrayEqual(a, b) {
   }
   return true;
 }
+function getShortName(file, root) {
+  return file.startsWith(appendForwardSlash(root)) ? path.posix.relative(root, file) : file;
+}
 export {
   handleHotUpdate
 };

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

@@ -1,7 +1,8 @@
 import { normalizePath } from "vite";
 import {
   cachedCompilation,
-  getCachedCompileResult
+  getCachedCompileResult,
+  invalidateCompilation
 } from "../core/compile/index.js";
 import { isRelativePath } from "../core/path.js";
 import { normalizeFilename } from "../vite-plugin-utils/index.js";
@@ -13,6 +14,7 @@ function astro({ settings, logger }) {
   const { config } = settings;
   let resolvedConfig;
   let server;
+  let astroFileToCssAstroDeps = /* @__PURE__ */ new Map();
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb) && srcRootWeb !== "/";
   const prePlugin = {
@@ -25,6 +27,9 @@ function astro({ settings, logger }) {
     configureServer(_server) {
       server = _server;
     },
+    buildStart() {
+      astroFileToCssAstroDeps = /* @__PURE__ */ new Map();
+    },
     async load(id, opts) {
       const parsedId = parseAstroRequest(id);
       const query = parsedId.query;
@@ -127,10 +132,27 @@ File: ${id}`
         filename: normalizePath(parsedId.filename),
         source
       };
+      invalidateCompilation(config, compileProps.filename);
       const transformResult = await cachedFullCompilation({ compileProps, logger });
+      const astroDeps = /* @__PURE__ */ new Set();
       for (const dep of transformResult.cssDeps) {
+        if (dep.endsWith(".astro")) {
+          astroDeps.add(dep);
+        }
         this.addWatchFile(dep);
       }
+      astroFileToCssAstroDeps.set(id, astroDeps);
+      if (server) {
+        const mods = server.moduleGraph.getModulesByFile(compileProps.filename);
+        if (mods) {
+          const seen = new Set(mods);
+          for (const mod of mods) {
+            if (mod.url.includes("?astro")) {
+              server.moduleGraph.invalidateModule(mod, seen);
+            }
+          }
+        }
+      }
       const astroMetadata = {
         clientOnlyComponents: transformResult.clientOnlyComponents,
         hydratedComponents: transformResult.hydratedComponents,
@@ -167,6 +189,7 @@ File: ${id}`
       return handleHotUpdate(context, {
         config,
         logger,
+        astroFileToCssAstroDeps,
         compile,
         source
       });

package/dist/vite-plugin-astro/query.d.ts

@@ -11,4 +11,3 @@ export interface ParsedRequestResult {
     query: AstroQuery;
 }
 export declare function parseAstroRequest(id: string): ParsedRequestResult;
-export declare function isAstroScript(id: string): boolean;

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

@@ -18,11 +18,6 @@ function parseAstroRequest(id) {
     query
   };
 }
-function isAstroScript(id) {
-  const parsed = parseAstroRequest(id);
-  return parsed.query.type === "script";
-}
 export {
-  isAstroScript,
   parseAstroRequest
 };

package/dist/vite-plugin-markdown/images.js

@@ -1,30 +1,57 @@
 function getMarkdownCodeForImages(imagePaths, html) {
   return `
-		import { getImage } from "astro:assets";
-		${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
+			import { getImage } from "astro:assets";
+			${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
 
-		const images = async function() {
-			return {
-				${imagePaths.map((entry) => `"${entry.raw}": await getImage({src: Astro__${entry.safeName}})`).join(",\n")}
-				}
-			}
+			const images = async function(html) {
+					const imageSources = {};
+					${imagePaths.map((entry) => {
+    const rawUrl = JSON.stringify(entry.raw);
+    return `{
+											const regex = new RegExp('__ASTRO_IMAGE_="([^"]*' + ${rawUrl} + '[^"]*)"', 'g');
+											let match;
+											let occurrenceCounter = 0;
+											while ((match = regex.exec(html)) !== null) {
+													const matchKey = ${rawUrl} + '_' + occurrenceCounter;
+													const imageProps = JSON.parse(match[1].replace(/"/g, '"'));
+													const { src, ...props } = imageProps;
+
+													imageSources[matchKey] = await getImage({src: Astro__${entry.safeName}, ...props});
+													occurrenceCounter++;
+											}
+									}`;
+  }).join("\n")}
+					return imageSources;
+			};
 
 			async function updateImageReferences(html) {
-				return images().then((images) => {
-					return html.replaceAll(/__ASTRO_IMAGE_="([^"]+)"/gm, (full, imagePath) =>
-					spreadAttributes({
-						src: images[imagePath].src,
-						...images[imagePath].attributes,
-					})
-					);
+				return images(html).then((imageSources) => {
+						return html.replaceAll(/__ASTRO_IMAGE_="([^"]+)"/gm, (full, imagePath) => {
+								const decodedImagePath = JSON.parse(imagePath.replace(/"/g, '"'));
+		
+								// Use the 'index' property for each image occurrence
+								const srcKey = decodedImagePath.src + '_' + decodedImagePath.index;
+		
+								if (imageSources[srcKey].srcSet && imageSources[srcKey].srcSet.values.length > 0) {
+										imageSources[srcKey].attributes.srcset = imageSources[srcKey].srcSet.attribute;
+								}
+		
+								const { index, ...attributesWithoutIndex } = imageSources[srcKey].attributes;
+		
+								return spreadAttributes({
+										src: imageSources[srcKey].src,
+										...attributesWithoutIndex,
+								});
+						});
 				});
-			}
+		}
+		
 
-			// NOTE: This causes a top-level await to appear in the user's code, which can break very easily due to a Rollup
-			// bug and certain adapters not supporting it correctly. See: https://github.com/rollup/rollup/issues/4708
-			// Tread carefully!
+		// NOTE: This causes a top-level await to appear in the user's code, which can break very easily due to a Rollup
+	  // bug and certain adapters not supporting it correctly. See: https://github.com/rollup/rollup/issues/4708
+	  // Tread carefully!
 			const html = await updateImageReferences(${JSON.stringify(html)});
-		`;
+	`;
 }
 export {
   getMarkdownCodeForImages

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -150,7 +150,7 @@
     "resolve": "^1.22.4",
     "semver": "^7.5.4",
     "server-destroy": "^1.0.1",
-    "shikiji": "^0.6.13",
+    "shikiji": "^0.9.18",
     "string-width": "^7.0.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.0.0",
@@ -162,7 +162,7 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "4.0.1",
+    "@astrojs/markdown-remark": "4.1.0",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
@@ -210,6 +210,7 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.5.0",
     "sass": "^1.69.5",
+    "shikiji-core": "^0.9.18",
     "srcset-parse": "^1.1.0",
     "unified": "^11.0.4",
     "astro-scripts": "0.0.14"