astro 4.3.2 → 4.3.4

package/client.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="vite/types/import-meta.d.ts" />
+/// <reference path="./types/content.d.ts" />
 
 // eslint-disable-next-line  @typescript-eslint/no-namespace
 declare namespace App {

package/components/Picture.astro

@@ -51,11 +51,11 @@ const fallbackImage = await getImage({
 });
 
 const imgAdditionalAttributes: HTMLAttributes<'img'> = {};
-const sourceAdditionaAttributes: HTMLAttributes<'source'> = {};
+const sourceAdditionalAttributes: HTMLAttributes<'source'> = {};
 
 // Propagate the `sizes` attribute to the `source` elements
 if (props.sizes) {
-	sourceAdditionaAttributes.sizes = props.sizes;
+	sourceAdditionalAttributes.sizes = props.sizes;
 }
 
 if (fallbackImage.srcSet.values.length > 0) {
@@ -74,7 +74,7 @@ if (fallbackImage.srcSet.values.length > 0) {
 				<source
 					srcset={srcsetAttribute}
 					type={'image/' + image.options.format}
-					{...sourceAdditionaAttributes}
+					{...sourceAdditionalAttributes}
 				/>
 			);
 		})

package/content-types.template.d.ts

@@ -9,8 +9,6 @@ declare module 'astro:content' {
 }
 
 declare module 'astro:content' {
-	export { z } from 'astro/zod';
-
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
 
 	export type CollectionKey = keyof AnyEntryMap;
@@ -19,53 +17,6 @@ declare module 'astro:content' {
 	export type ContentCollectionKey = keyof ContentEntryMap;
 	export type DataCollectionKey = keyof DataEntryMap;
 
-	// This needs to be in sync with ImageMetadata
-	export type ImageFunction = () => import('astro/zod').ZodObject<{
-		src: import('astro/zod').ZodString;
-		width: import('astro/zod').ZodNumber;
-		height: import('astro/zod').ZodNumber;
-		format: import('astro/zod').ZodUnion<
-			[
-				import('astro/zod').ZodLiteral<'png'>,
-				import('astro/zod').ZodLiteral<'jpg'>,
-				import('astro/zod').ZodLiteral<'jpeg'>,
-				import('astro/zod').ZodLiteral<'tiff'>,
-				import('astro/zod').ZodLiteral<'webp'>,
-				import('astro/zod').ZodLiteral<'gif'>,
-				import('astro/zod').ZodLiteral<'svg'>,
-				import('astro/zod').ZodLiteral<'avif'>,
-			]
-		>;
-	}>;
-
-	type BaseSchemaWithoutEffects =
-		| import('astro/zod').AnyZodObject
-		| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
-		| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
-		| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
-
-	type BaseSchema =
-		| BaseSchemaWithoutEffects
-		| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;
-
-	export type SchemaContext = { image: ImageFunction };
-
-	type DataCollectionConfig<S extends BaseSchema> = {
-		type: 'data';
-		schema?: S | ((context: SchemaContext) => S);
-	};
-
-	type ContentCollectionConfig<S extends BaseSchema> = {
-		type?: 'content';
-		schema?: S | ((context: SchemaContext) => S);
-	};
-
-	type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>;
-
-	export function defineCollection<S extends BaseSchema>(
-		input: CollectionConfig<S>
-	): CollectionConfig<S>;
-
 	type AllValuesOf<T> = T extends any ? T[keyof T] : never;
 	type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
 		ContentEntryMap[C]

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

@@ -467,7 +467,7 @@ export interface AstroUserConfig {
      *
      * Specifies the output target for builds.
      *
-     * - `'static'` - Building a static site to be deploy to any static host.
+     * - `'static'` - Building a static site to be deployed to any static host.
      * - `'server'` - Building an app to be deployed to a host supporting SSR (server-side rendering).
      * - `'hybrid'` - Building a static site with a few server-side rendered pages.
      *
@@ -1410,7 +1410,7 @@ export interface AstroUserConfig {
              * @version 3.7.0
              * @description
              *
-             * - `"pathanme": The strategy is applied to the pathname of the URLs
+             * - `"pathname": The strategy is applied to the pathname of the URLs
              */
             strategy: 'pathname';
             /**

package/dist/assets/services/vendor/squoosh/codecs.js

@@ -211,6 +211,8 @@ const codecs = {
   avif: {
     name: "AVIF",
     extension: "avif",
+    // Disable eslint rule to not touch the original code
+    // eslint-disable-next-line no-control-regex, regexp/control-character-escape
     detectors: [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/],
     dec: () => instantiateEmscriptenWasm(avifDec, avifDecWasm),
     enc: async () => {
@@ -240,6 +242,8 @@ const codecs = {
   oxipng: {
     name: "OxiPNG",
     extension: "png",
+    // Disable eslint rule to not touch the original code
+    // eslint-disable-next-line no-control-regex, regexp/control-character-escape
     detectors: [/^\x89PNG\x0D\x0A\x1A\x0A/],
     dec: async () => {
       await pngEncDecInit();

package/dist/cli/add/index.js

@@ -316,7 +316,7 @@ async function parseAstroConfig(configURL) {
   return result;
 }
 const toIdent = (name) => {
-  const ident = name.trim().replace(/[-_\.\/]?astro(?:js)?[-_\.]?/g, "").replace(/\.js/, "").replace(/(?:[\.\-\_\/]+)([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "");
+  const ident = name.trim().replace(/[-_./]?astro(?:js)?[-_.]?/g, "").replace(/\.js/, "").replace(/[.\-_/]+([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "");
   return `${ident[0].toLowerCase()}${ident.slice(1)}`;
 };
 function createPrettyError(err) {

package/dist/content/utils.js

@@ -71,7 +71,7 @@ async function getEntryData(entry, collectionConfig, pluginContext) {
       });
     }
     let formattedError;
-    const parsed = await schema.safeParseAsync(entry.unvalidatedData, {
+    const parsed = await schema.safeParseAsync(data, {
       errorMap(error, ctx) {
         if (error.code === "custom" && error.params?.isHoistedAstroError) {
           formattedError = error.params?.astroError;

package/dist/content/vite-plugin-content-assets.js

@@ -49,12 +49,22 @@ function astroContentAssetPropagationPlugin({
           if (!devModuleLoader.getModuleById(basePath)?.ssrModule) {
             await devModuleLoader.import(basePath);
           }
-          const { styles, urls } = await getStylesForURL(pathToFileURL(basePath), devModuleLoader);
-          const hoistedScripts = await getScriptsForURL(
-            pathToFileURL(basePath),
-            settings.config.root,
-            devModuleLoader
-          );
+          const {
+            styles,
+            urls,
+            crawledFiles: styleCrawledFiles
+          } = await getStylesForURL(pathToFileURL(basePath), devModuleLoader);
+          const { scripts: hoistedScripts, crawledFiles: scriptCrawledFiles } = await getScriptsForURL(pathToFileURL(basePath), settings.config.root, devModuleLoader);
+          for (const file of styleCrawledFiles) {
+            if (!file.includes("node_modules")) {
+              this.addWatchFile(file);
+            }
+          }
+          for (const file of scriptCrawledFiles) {
+            if (!file.includes("node_modules")) {
+              this.addWatchFile(file);
+            }
+          }
           stringifiedLinks = JSON.stringify([...urls]);
           stringifiedStyles = JSON.stringify(styles.map((s) => s.content));
           stringifiedScripts = JSON.stringify([...hoistedScripts]);

package/dist/core/build/css-asset-name.js

@@ -70,7 +70,7 @@ function getFirstParentId(parents) {
   }
   return parents[0]?.[0].id;
 }
-const charsToReplaceRe = /[.\[\]]/g;
+const charsToReplaceRe = /[.[\]]/g;
 const underscoresRe = /_+/g;
 function prettifyBaseName(str) {
   return str.replace(charsToReplaceRe, "_").replace(underscoresRe, "_");

package/dist/core/build/plugins/plugin-manifest.js

@@ -10,7 +10,7 @@ import { getOutFile, getOutFolder } from "../common.js";
 import { cssOrder, mergeInlineCss } from "../internal.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
-const replaceExp = new RegExp(`['"](${manifestReplace})['"]`, "g");
+const replaceExp = new RegExp(`['"]${manifestReplace}['"]`, "g");
 const SSR_MANIFEST_VIRTUAL_MODULE_ID = "@astrojs-manifest";
 const RESOLVED_SSR_MANIFEST_VIRTUAL_MODULE_ID = "\0" + SSR_MANIFEST_VIRTUAL_MODULE_ID;
 function vitePluginManifest(options, internals) {

package/dist/core/build/static-build.js

@@ -382,7 +382,7 @@ function makeAstroPageEntryPointFileName(prefix, facadeModuleId, routes) {
   const pageModuleId = facadeModuleId.replace(prefix, "").replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".");
   const route = routes.find((routeData) => routeData.component === pageModuleId);
   const name = route?.route ?? pageModuleId;
-  return `pages${name.replace(/\/$/, "/index").replaceAll(/[\[\]]/g, "_").replaceAll("...", "---")}.astro.mjs`;
+  return `pages${name.replace(/\/$/, "/index").replaceAll(/[[\]]/g, "_").replaceAll("...", "---")}.astro.mjs`;
 }
 function makeSplitEntryPointFileName(facadeModuleId, routes) {
   const filePath = `${makeAstroPageEntryPointFileName(

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.3.2";
+const ASTRO_VERSION = "4.3.4";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/create-vite.js

@@ -62,7 +62,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
         // Attempt: package relies on `astro`. ✅ Definitely an Astro package
         pkgJson.peerDependencies?.astro || pkgJson.dependencies?.astro || // Attempt: package is tagged with `astro` or `astro-component`. ✅ Likely a community package
         pkgJson.keywords?.includes("astro") || pkgJson.keywords?.includes("astro-component") || // Attempt: package is named `astro-something` or `@scope/astro-something`. ✅ Likely a community package
-        /^(@[^\/]+\/)?astro\-/.test(pkgJson.name)
+        /^(?:@[^/]+\/)?astro-/.test(pkgJson.name)
       );
     },
     isFrameworkPkgByName(pkgName) {

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.3.2";
+  const currentVersion = "4.3.4";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/dev/restart.js

@@ -19,8 +19,8 @@ async function createRestartedContainer(container, settings) {
   await startContainer(newContainer);
   return newContainer;
 }
-const configRE = new RegExp(`.*astro.config.((mjs)|(cjs)|(js)|(ts))$`);
-const preferencesRE = new RegExp(`.*.astro/settings.json$`);
+const configRE = /.*astro.config.(?:mjs|cjs|js|ts)$/;
+const preferencesRE = /.*\.astro\/settings.json$/;
 function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, changedFile) {
   if (restartInFlight)
     return false;

package/dist/core/errors/dev/utils.js

@@ -81,7 +81,7 @@ function collectErrorMetadata(e, rootFolder) {
 }
 function generateHint(err) {
   const commonBrowserAPIs = ["document", "window"];
-  if (/Unknown file extension \"\.(jsx|vue|svelte|astro|css)\" for /.test(err.message)) {
+  if (/Unknown file extension "\.(?:jsx|vue|svelte|astro|css)" for /.test(err.message)) {
     return "You likely need to add this package to `vite.ssr.noExternal` in your astro config file.";
   } else if (commonBrowserAPIs.some((api) => err.toString().includes(api))) {
     const hint = `Browser APIs are not available on the server.
@@ -107,8 +107,8 @@ function collectInfoFromStacktrace(error) {
     const possibleFilePath = error.loc?.file || error.pluginCode || error.id || // TODO: this could be better, `src` might be something else
     stackText.split("\n").find((ln) => ln.includes("src") || ln.includes("node_modules"));
     const source = possibleFilePath?.replace(/^[^(]+\(([^)]+).*$/, "$1").replace(/^\s+at\s+/, "");
-    let file = source?.replace(/(:[0-9]+)/g, "");
-    const location = /:([0-9]+):([0-9]+)/g.exec(source) ?? [];
+    let file = source?.replace(/:\d+/g, "");
+    const location = /:(\d+):(\d+)/.exec(source) ?? [];
     const line = location[1];
     const column = location[2];
     if (file && line && column) {
@@ -124,13 +124,13 @@ function collectInfoFromStacktrace(error) {
     }
   }
   if (!stackInfo.plugin) {
-    stackInfo.plugin = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)?.at(1) || /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)?.at(1) || void 0;
+    stackInfo.plugin = /withastro\/astro\/packages\/integrations\/([\w-]+)/i.exec(stackText)?.at(1) || /(@astrojs\/[\w-]+)\/(server|client|index)/i.exec(stackText)?.at(1) || void 0;
   }
   stackInfo.stack = cleanErrorStack(error.stack);
   return stackInfo;
 }
 function cleanErrorStack(stack) {
-  return stack.split(/\n/g).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
+  return stack.split(/\n/).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
 }
 function getDocsForError(err) {
   if (err.name !== "UnknownError" && err.name in AstroErrorData) {
@@ -142,10 +142,10 @@ function getDocsForError(err) {
   }
 }
 function renderErrorMarkdown(markdown, target) {
-  const linkRegex = /\[([^\[]+)\]\((.*)\)/gm;
-  const boldRegex = /\*\*(.+)\*\*/gm;
-  const urlRegex = / (\b(https?|ftp):\/\/[-A-Z0-9+&@#\\/%?=~_|!:,.;]*[-A-Z0-9+&@#\\/%=~_|])/gim;
-  const codeRegex = /`([^`]+)`/gim;
+  const linkRegex = /\[([^[]+)\]\((.*)\)/g;
+  const boldRegex = /\*\*(.+)\*\*/g;
+  const urlRegex = / ((?:https?|ftp):\/\/[-\w+&@#\\/%?=~|!:,.;]*[-\w+&@#\\/%=~|])/gi;
+  const codeRegex = /`([^`]+)`/g;
   if (target === "html") {
     return escape(markdown).replace(linkRegex, `<a href="$2" target="_blank">$1</a>`).replace(boldRegex, "<b>$1</b>").replace(urlRegex, ' <a href="$1" target="_blank">$1</a>').replace(codeRegex, "<code>$1</code>");
   } else {

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

@@ -184,7 +184,7 @@ const PrerenderDynamicEndpointPathCollide = {
   name: "PrerenderDynamicEndpointPathCollide",
   title: "Prerendered dynamic endpoint has path collision.",
   message: (pathname) => `Could not render \`${pathname}\` with an \`undefined\` param as the generated path will collide during prerendering. Prevent passing \`undefined\` as \`params\` for the endpoint's \`getStaticPaths()\` function, or add an additional extension to the endpoint's filename.`,
-  hint: (filename) => `Rename \`${filename}\` to \`${filename.replace(/\.(js|ts)/, (m) => `.json` + m)}\``
+  hint: (filename) => `Rename \`${filename}\` to \`${filename.replace(/\.(?:js|ts)/, (m) => `.json` + m)}\``
 };
 const ExpectedImage = {
   name: "ExpectedImage",

package/dist/core/logger/vite.js

@@ -8,11 +8,11 @@ const E2E_PREFIX = fileURLToPath(new URL("../../../e2e", import.meta.url));
 function isAstroSrcFile(id) {
   return id?.startsWith(PKG_PREFIX) && !id.startsWith(E2E_PREFIX);
 }
-const vitePageReloadMsg = /page reload (.*)( \(.*\))?/;
+const vitePageReloadMsg = /page reload (.*)/;
 const viteHmrUpdateMsg = /hmr update (.*)/;
 const viteBuildMsg = /vite.*building.*for production/;
-const viteShortcutTitleMsg = /^\s*Shortcuts\s*$/s;
-const viteShortcutHelpMsg = /press\s+(.*?)\s+to\s+(.*)$/s;
+const viteShortcutTitleMsg = /^\s*Shortcuts\s*$/;
+const viteShortcutHelpMsg = /press (.+?) to (.+)$/s;
 function createViteLogger(astroLogger, viteLogLevel = "info") {
   const warnedMessages = /* @__PURE__ */ new Set();
   const loggedErrors = /* @__PURE__ */ new WeakSet();
@@ -26,8 +26,7 @@ function createViteLogger(astroLogger, viteLogLevel = "info") {
       if (m = vitePageReloadMsg.exec(stripped)) {
         if (isAstroSrcFile(m[1]))
           return;
-        const extra = m[2] ?? "";
-        astroLogger.info("watch", m[1] + extra);
+        astroLogger.info("watch", m[1]);
       } else if (m = viteHmrUpdateMsg.exec(stripped)) {
         if (isAstroSrcFile(m[1]))
           return;

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.3.2";
+  const version = "4.3.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -180,7 +180,7 @@ ${errorList.join(
   )}`;
 }
 const STACK_LINE_REGEXP = /^\s+at /g;
-const IRRELEVANT_STACK_REGEXP = /(node_modules|astro[\/\\]dist)/g;
+const IRRELEVANT_STACK_REGEXP = /node_modules|astro[/\\]dist/g;
 function formatErrorStackTrace(err, showFullStacktrace) {
   const stackLines = (err.stack || "").split("\n").filter((line) => STACK_LINE_REGEXP.test(line));
   if (showFullStacktrace) {
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.3.2"}`
+        `v${"4.3.4"}`
       )} ${headline}`
     );
   }

package/dist/core/module-loader/loader.d.ts

@@ -31,6 +31,7 @@ export interface ModuleLoader {
 export interface ModuleNode {
     id: string | null;
     url: string;
+    file: string | null;
     ssrModule: Record<string, any> | null;
     ssrTransformResult: {
         deps?: string[];

package/dist/core/preview/vite-plugin-astro-preview.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
 import { notFoundTemplate, subpathNotUsedTemplate } from "../../template/4xx.js";
 import { cleanUrl } from "../../vite-plugin-utils/index.js";
 import { stripBase } from "./util.js";
-const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
+const HAS_FILE_EXTENSION_REGEXP = /\.[^/]+$/;
 function vitePluginAstroPreview(settings) {
   const { base, outDir, trailingSlash } = settings.config;
   function handle404(req, res) {

package/dist/core/render/context.js

@@ -154,15 +154,24 @@ function computeCurrentLocale(request, locales, routingStrategy, defaultLocale)
   if (!routeData) {
     return defaultLocale;
   }
-  for (const segment of routeData.route.split("/")) {
+  const pathname = routeData.pathname ?? new URL(request.url).pathname;
+  for (const segment of pathname.split("/").filter(Boolean)) {
     for (const locale of locales) {
       if (typeof locale === "string") {
+        if (!segment.includes(locale))
+          continue;
         if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {
           return locale;
         }
       } else {
         if (locale.path === segment) {
           return locale.codes.at(0);
+        } else {
+          for (const code of locale.codes) {
+            if (normalizeTheLocale(code) === normalizeTheLocale(segment)) {
+              return code;
+            }
+          }
         }
       }
     }

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

@@ -26,7 +26,7 @@ function getParts(part, file) {
       return;
     const dynamic = i % 2 === 1;
     const [, content] = dynamic ? /([^(]+)$/.exec(str) || [null, null] : [null, str];
-    if (!content || dynamic && !/^(\.\.\.)?[a-zA-Z0-9_$]+$/.test(content)) {
+    if (!content || dynamic && !/^(?:\.\.\.)?[\w$]+$/.test(content)) {
       throw new Error(`Invalid route ${file} \u2014 parameter name must match /^[a-zA-Z0-9_$]+$/`);
     }
     result.push({

package/dist/events/error.js

@@ -1,6 +1,6 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 const EVENT_ERROR = "ASTRO_CLI_ERROR";
-const ANONYMIZE_MESSAGE_REGEX = /^(\w| )+/;
+const ANONYMIZE_MESSAGE_REGEX = /^(?:\w| )+/;
 function anonymizeErrorMessage(msg) {
   const matchedMessage = msg.match(ANONYMIZE_MESSAGE_REGEX);
   if (!matchedMessage?.[0]) {
@@ -48,7 +48,7 @@ function getSafeErrorMessage(message) {
   function extractStringFromFunction(func) {
     const arrowIndex = func.indexOf("=>") + "=>".length;
     return func.slice(arrowIndex).trim().slice(1, -1).replace(
-      /\${([^}]+)}/gm,
+      /\$\{([^}]+)\}/g,
       (str, match1) => `${match1.split(/\.?(?=[A-Z])/).join("_").toUpperCase()}`
     ).replace(/\\`/g, "`");
   }

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

@@ -221,7 +221,7 @@ const a11y = [
     title: "Redundant text in alt attribute",
     message: 'Screen readers already announce `img` elements as an image. There is no need to use words such as "image", "photo", and/or "picture".',
     selector: "img[alt]:not([aria-hidden])",
-    match: (img) => /\b(image|picture|photo)\b/i.test(img.alt)
+    match: (img) => /\b(?:image|picture|photo)\b/i.test(img.alt)
   },
   {
     code: "a11y-incorrect-aria-attribute-type",

package/dist/runtime/server/index.js

@@ -35,12 +35,9 @@ import { markHTMLString as markHTMLString2 } from "./escape.js";
 import { addAttribute as addAttribute2, Renderer as Renderer2 } from "./render/index.js";
 function mergeSlots(...slotted) {
   const slots = {};
-  for (let slot of slotted) {
+  for (const slot of slotted) {
     if (!slot)
       continue;
-    if (Array.isArray(slot)) {
-      slot = mergeSlots(...slot);
-    }
     if (typeof slot === "object") {
       Object.assign(slots, slot);
     } else if (typeof slot === "function") {

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

@@ -47,8 +47,8 @@ function isFragmentComponent(Component) {
 function isHTMLComponent(Component) {
   return Component && Component["astro:html"] === true;
 }
-const ASTRO_SLOT_EXP = /\<\/?astro-slot\b[^>]*>/g;
-const ASTRO_STATIC_SLOT_EXP = /\<\/?astro-static-slot\b[^>]*>/g;
+const ASTRO_SLOT_EXP = /<\/?astro-slot\b[^>]*>/g;
+const ASTRO_STATIC_SLOT_EXP = /<\/?astro-static-slot\b[^>]*>/g;
 function removeStaticAstroSlot(html, supportsAstroStaticSlot) {
   const exp = supportsAstroStaticSlot ? ASTRO_STATIC_SLOT_EXP : ASTRO_SLOT_EXP;
   return html.replace(exp, "");
@@ -305,7 +305,7 @@ ${serializeProps(
   };
 }
 function sanitizeElementName(tag) {
-  const unsafe = /[&<>'"\s]+/g;
+  const unsafe = /[&<>'"\s]+/;
   if (!unsafe.test(tag))
     return tag;
   return tag.trim().split(unsafe)[0].trim();

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

@@ -1,12 +1,12 @@
 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 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 STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
-const toIdent = (k) => k.trim().replace(/(?:(?!^)\b\w|\s+|[^\w]+)/g, (match, index) => {
-  if (/[^\w]|\s/.test(match))
+const toIdent = (k) => k.trim().replace(/(?!^)\b\w|\s+|\W+/g, (match, index) => {
+  if (/\W/.test(match))
     return "";
   return index === 0 ? match : match.toUpperCase();
 });

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

@@ -1,7 +1,7 @@
 import { transformWithEsbuild } from "vite";
 import { compile } from "../core/compile/index.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
-const FRONTMATTER_PARSE_REGEXP = /^\-\-\-(.*)^\-\-\-/ms;
+import { frontmatterRE } from "./utils.js";
 async function compileAstro({
   compileProps,
   astroFileToCompileMetadata,
@@ -68,7 +68,7 @@ async function enhanceCompileError({
   source
 }) {
   const lineText = err.loc?.lineText;
-  const scannedFrontmatter = FRONTMATTER_PARSE_REGEXP.exec(source);
+  const scannedFrontmatter = frontmatterRE.exec(source);
   if (scannedFrontmatter) {
     const frontmatter = scannedFrontmatter[1].replace(/\breturn\b/g, "throw");
     if (lineText && !frontmatter.includes(lineText))

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

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { appendForwardSlash } from "@astrojs/internal-helpers/path";
+import { frontmatterRE } from "./utils.js";
 async function handleHotUpdate(ctx, { logger, compile, astroFileToCssAstroDeps, astroFileToCompileMetadata }) {
   const oldCode = astroFileToCompileMetadata.get(ctx.file)?.originalCode;
   const newCode = await ctx.read();
@@ -21,7 +22,6 @@ async function handleHotUpdate(ctx, { logger, compile, astroFileToCssAstroDeps,
     }
   }
 }
-const frontmatterRE = /^\-\-\-.*?^\-\-\-/ms;
 const scriptRE = /<script(?:\s.*?)?>.*?<\/script>/gs;
 const styleRE = /<style(?:\s.*?)?>.*?<\/style>/gs;
 function isStyleOnlyChanged(oldCode, newCode) {

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

@@ -0,0 +1 @@
+export declare const frontmatterRE: RegExp;

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

@@ -0,0 +1,4 @@
+const frontmatterRE = /^---(.*?)^---/ms;
+export {
+  frontmatterRE
+};

package/dist/vite-plugin-astro-server/css.d.ts

@@ -8,5 +8,6 @@ interface ImportedStyle {
 export declare function getStylesForURL(filePath: URL, loader: ModuleLoader): Promise<{
     urls: Set<string>;
     styles: ImportedStyle[];
+    crawledFiles: Set<string>;
 }>;
 export {};

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

@@ -4,7 +4,11 @@ import { crawlGraph } from "./vite.js";
 async function getStylesForURL(filePath, loader) {
   const importedCssUrls = /* @__PURE__ */ new Set();
   const importedStylesMap = /* @__PURE__ */ new Map();
+  const crawledFiles = /* @__PURE__ */ new Set();
   for await (const importedModule of crawlGraph(loader, viteID(filePath), true)) {
+    if (importedModule.file) {
+      crawledFiles.add(importedModule.file);
+    }
     if (isBuildableCSSRequest(importedModule.url)) {
       let css = "";
       if (typeof importedModule.ssrModule?.default === "string") {
@@ -32,7 +36,8 @@ async function getStylesForURL(filePath, loader) {
   }
   return {
     urls: importedCssUrls,
-    styles: [...importedStylesMap.values()]
+    styles: [...importedStylesMap.values()],
+    crawledFiles
   };
 }
 export {

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

@@ -64,7 +64,7 @@ async function matchRoute(pathname, manifestData, pipeline) {
       throw e;
     }
   }
-  const altPathname = pathname.replace(/(index)?\.html$/, "");
+  const altPathname = pathname.replace(/(?:index)?\.html$/, "");
   if (altPathname !== pathname) {
     return await matchRoute(altPathname, manifestData, pipeline);
   }
@@ -159,6 +159,8 @@ async function handleRoute({
           return "";
         },
         params: [],
+        // Disable eslint as we only want to generate an empty RegExp
+        // eslint-disable-next-line prefer-regex-literals
         pattern: new RegExp(""),
         prerender: false,
         segments: [],
@@ -296,7 +298,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
   const moduleLoader = pipeline.getModuleLoader();
   const settings = pipeline.getSettings();
   const mode = pipeline.getEnvironment().mode;
-  const scripts = await getScriptsForURL(filePath, settings.config.root, moduleLoader);
+  const { scripts } = await getScriptsForURL(filePath, settings.config.root, moduleLoader);
   if (isPage(filePath, settings) && mode === "development") {
     scripts.add({
       props: { type: "module", src: "/@vite/client" },

package/dist/vite-plugin-astro-server/scripts.d.ts

@@ -1,3 +1,6 @@
 import type { SSRElement } from '../@types/astro.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
-export declare function getScriptsForURL(filePath: URL, root: URL, loader: ModuleLoader): Promise<Set<SSRElement>>;
+export declare function getScriptsForURL(filePath: URL, root: URL, loader: ModuleLoader): Promise<{
+    scripts: Set<SSRElement>;
+    crawledFiles: Set<string>;
+}>;

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

@@ -3,17 +3,21 @@ import { rootRelativePath, viteID } from "../core/util.js";
 import { crawlGraph } from "./vite.js";
 async function getScriptsForURL(filePath, root, loader) {
   const elements = /* @__PURE__ */ new Set();
+  const crawledFiles = /* @__PURE__ */ new Set();
   const rootID = viteID(filePath);
   const modInfo = loader.getModuleInfo(rootID);
   addHoistedScripts(elements, modInfo, root);
   for await (const moduleNode of crawlGraph(loader, rootID, true)) {
+    if (moduleNode.file) {
+      crawledFiles.add(moduleNode.file);
+    }
     const id = moduleNode.id;
     if (id) {
       const info = loader.getModuleInfo(id);
       addHoistedScripts(elements, info, root);
     }
   }
-  return elements;
+  return { scripts: elements, crawledFiles };
 }
 function addHoistedScripts(set, info, root) {
   if (!info?.meta?.astro) {

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

@@ -3,7 +3,7 @@ import { loadEnv } from "vite";
 import { transform } from "esbuild";
 import MagicString from "magic-string";
 const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
-const isValidIdentifierRe = /^[_$a-zA-Z][_$a-zA-Z0-9]*$/;
+const isValidIdentifierRe = /^[_$a-zA-Z][\w$]*$/;
 const exportConstPrerenderRe = /\bexport\s+const\s+prerender\s*=\s*import\.meta\.env\.(.+?)\b/;
 function getPrivateEnv(viteConfig, astroConfig) {
   let envPrefixes = ["PUBLIC_"];

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

@@ -1,6 +1,6 @@
 import { getTopLevelPages, walkParentInfos } from "../core/build/graph.js";
 import { getAstroMetadata } from "../vite-plugin-astro/index.js";
-const injectExp = /(^\/\/|\/\/!)\s*astro-head-inject/;
+const injectExp = /(?:^\/\/|\/\/!)\s*astro-head-inject/;
 function configHeadVitePlugin() {
   let server;
   function propagateMetadata(id, prop, value, seen = /* @__PURE__ */ new Set()) {

package/dist/vite-plugin-html/transform/utils.js

@@ -1,4 +1,4 @@
-const splitAttrsTokenizer = /([\$\{\}\@a-z0-9_\:\-]*)\s*?=\s*?(['"]?)(.*?)\2\s+/gim;
+const splitAttrsTokenizer = /([${}@\w:\-]*)\s*=\s*?(['"]?)(.*?)\2\s+/g;
 function replaceAttribute(s, node, key, newValue) {
   splitAttrsTokenizer.lastIndex = 0;
   const text = s.original.slice(node.position?.start.offset ?? 0, node.position?.end.offset ?? 0).toString();
@@ -7,7 +7,7 @@ function replaceAttribute(s, node, key, newValue) {
     return;
   const start = node.position.start.offset + offset;
   const tokens = text.slice(offset).split(splitAttrsTokenizer);
-  const token = tokens[0].replace(/([^>])(\>[\s\S]*$)/gim, "$1");
+  const token = tokens[0].replace(/([^>])>[\s\S]*$/gm, "$1");
   if (token.trim() === key) {
     const end = start + key.length;
     return s.overwrite(start, end, newValue, { contentOnly: true });

package/dist/vite-plugin-scanner/scan.js

@@ -37,7 +37,7 @@ async function scan(code, id, settings) {
     const { n: name, le: endOfLocalName } = _export;
     if (BOOLEAN_EXPORTS.has(name)) {
       const prefix = code.slice(0, endOfLocalName).split("export").pop().trim().replace("prerender", "").trim();
-      const suffix = code.slice(endOfLocalName).trim().replace(/\=/, "").trim().split(/[;\n]/)[0];
+      const suffix = code.slice(endOfLocalName).trim().replace(/=/, "").trim().split(/[;\n]/)[0];
       if (prefix !== "const" || !(isTruthy(suffix) || isFalsy(suffix))) {
         throw new AstroError({
           ...AstroErrorData.InvalidPrerenderExport,

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

@@ -11,7 +11,7 @@ function getFileInfo(id, config) {
     config.site ? new URL(config.base, config.site).pathname : config.base
   );
   const fileId = id.split("?")[0];
-  let fileUrl = fileId.includes("/pages/") ? fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(\/index)?\.(md|markdown|mdown|mkdn|mkd|mdwn|md|astro)$/, "") : void 0;
+  let fileUrl = fileId.includes("/pages/") ? fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(?:\/index)?\.(?:md|markdown|mdown|mkdn|mkd|mdwn|astro)$/, "") : void 0;
   if (fileUrl && config.trailingSlash === "always") {
     fileUrl = appendForwardSlash(fileUrl);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -101,7 +101,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.5.0",
+    "@astrojs/compiler": "^2.5.3",
     "@babel/core": "^7.23.3",
     "@babel/generator": "^7.23.3",
     "@babel/parser": "^7.23.3",