astro 4.3.2 → 4.3.3

package/client.d.ts

@@ -160,6 +160,10 @@ declare module 'astro:components' {
 	export * from 'astro/components';
 }
 
+declare module 'astro:content' {
+	export * from 'astro/virtual-modules/content.js';
+}
+
 type MD = import('./dist/@types/astro.js').MarkdownInstance<Record<string, any>>;
 interface ExportedMarkdownModuleEntities {
 	frontmatter: MD['frontmatter'];

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

@@ -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/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/constants.js

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

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.3";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.3.2";
+  const version = "4.3.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.3.2"}`
+        `v${"4.3.3"}`
       )} ${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/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/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/virtual-modules/content.d.ts

@@ -0,0 +1,54 @@
+import { z } from 'zod';
+export { z };
+export type ImageFunction = () => z.ZodObject<{
+    src: z.ZodString;
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    format: z.ZodUnion<[
+        z.ZodLiteral<'png'>,
+        z.ZodLiteral<'jpg'>,
+        z.ZodLiteral<'jpeg'>,
+        z.ZodLiteral<'tiff'>,
+        z.ZodLiteral<'webp'>,
+        z.ZodLiteral<'gif'>,
+        z.ZodLiteral<'svg'>,
+        z.ZodLiteral<'avif'>
+    ]>;
+}>;
+type BaseSchemaWithoutEffects = z.AnyZodObject | z.ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]> | z.ZodDiscriminatedUnion<string, z.AnyZodObject[]> | z.ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
+type BaseSchema = BaseSchemaWithoutEffects | z.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 extends BaseSchema> = ContentCollectionConfig<S> | DataCollectionConfig<S>;
+export declare function defineCollection<S extends BaseSchema>(input: CollectionConfig<S>): CollectionConfig<S>;
+/** Run `astro sync` to generate high fidelity types */
+export declare const getEntryBySlug: (...args: any[]) => any;
+/** Run `astro sync` to generate high fidelity types */
+export declare const getDataEntryById: (...args: any[]) => any;
+/** Run `astro sync` to generate high fidelity types */
+export declare const getCollection: (...args: any[]) => any;
+/** Run `astro sync` to generate high fidelity types */
+export declare const getEntry: (...args: any[]) => any;
+/** Run `astro sync` to generate high fidelity types */
+export declare const getEntries: (...args: any[]) => any;
+/** Run `astro sync` to generate high fidelity types */
+export declare const reference: (...args: any[]) => any;
+/** Run `astro sync` to generate high fidelity types */
+export type CollectionKey = any;
+/** Run `astro sync` to generate high fidelity types */
+export type CollectionEntry<C> = any;
+/** Run `astro sync` to generate high fidelity types */
+export type ContentCollectionKey = any;
+/** Run `astro sync` to generate high fidelity types */
+export type DataCollectionKey = any;
+/** Run `astro sync` to generate high fidelity types */
+export type ContentConfig = any;

package/dist/virtual-modules/content.js

@@ -0,0 +1,23 @@
+import { defineCollection as _defineCollection } from "../content/runtime.js";
+import { z } from "zod";
+function defineCollection(input) {
+  return _defineCollection(input);
+}
+const noop = () => {
+};
+const getEntryBySlug = noop;
+const getDataEntryById = noop;
+const getCollection = noop;
+const getEntry = noop;
+const getEntries = noop;
+const reference = noop;
+export {
+  defineCollection,
+  getCollection,
+  getDataEntryById,
+  getEntries,
+  getEntry,
+  getEntryBySlug,
+  reference,
+  z
+};

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

@@ -296,7 +296,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "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",