astro 4.3.4 → 4.3.5

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.3.4";
+const ASTRO_VERSION = "4.3.5";
 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.4";
+  const currentVersion = "4.3.5";
   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.4";
+  const version = "4.3.5";
   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.4"}`
+        `v${"4.3.5"}`
       )} ${headline}`
     );
   }

package/dist/i18n/middleware.js

@@ -37,7 +37,13 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
     return void 0;
   };
   const prefixOtherLocales = (url, response) => {
-    const pathnameContainsDefaultLocale = url.pathname.includes(`/${i18n.defaultLocale}`);
+    let pathnameContainsDefaultLocale = false;
+    for (const segment of url.pathname.split("/")) {
+      if (normalizeTheLocale(segment) === normalizeTheLocale(i18n.defaultLocale)) {
+        pathnameContainsDefaultLocale = true;
+        break;
+      }
+    }
     if (pathnameContainsDefaultLocale) {
       const newLocation = url.pathname.replace(`/${i18n.defaultLocale}`, "");
       response.headers.set("Location", newLocation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -96,6 +96,7 @@
     "content-types.template.d.ts",
     "content-module.template.mjs",
     "astro-jsx.d.ts",
+    "types/content.d.ts",
     "types.d.ts",
     "README.md",
     "vendor"
@@ -231,10 +232,11 @@
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
     "test:unit": "mocha --exit --timeout 30000 ./test/units/**/*.test.js",
-    "test:unit:match": "mocha --exit --timeout 30000 ./test/units/**/*.test.js -g",
-    "test": "pnpm run test:unit && mocha --exit --timeout 30000 --ignore **/lit-element.test.js && mocha --timeout 30000 **/lit-element.test.js",
+    "test:unit:match": "mocha --exit --timeout 30000 ./test/units/**/*.test.js -g --ignore **/*.nodetest.js",
+    "test": "pnpm run test:node && pnpm run test:unit && mocha --exit --timeout 30000 --ignore **/*.nodetest.js --ignore **/lit-element.test.js && mocha --timeout 30000 **/lit-element.test.js --ignore **/*.nodetest.js",
     "test:match": "mocha --timeout 30000 -g",
     "test:e2e": "playwright test",
-    "test:e2e:match": "playwright test -g"
+    "test:e2e:match": "playwright test -g",
+    "test:node": "astro-scripts test \"test/**/*.nodetest.js\""
   }
 }

package/types/content.d.ts

@@ -0,0 +1,75 @@
+declare module 'astro:content' {
+	export { z } from 'astro/zod';
+
+	// 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 extends BaseSchema> =
+		| ContentCollectionConfig<S>
+		| DataCollectionConfig<S>;
+
+	export function defineCollection<S extends BaseSchema>(
+		input: CollectionConfig<S>
+	): CollectionConfig<S>;
+
+	/** Run `astro sync` to generate high fidelity types */
+	export const getEntryBySlug: (...args: any[]) => any;
+	/** Run `astro sync` to generate high fidelity types */
+	export const getDataEntryById: (...args: any[]) => any;
+	/** Run `astro sync` to generate high fidelity types */
+	export const getCollection: (...args: any[]) => any;
+	/** Run `astro sync` to generate high fidelity types */
+	export const getEntry: (...args: any[]) => any;
+	/** Run `astro sync` to generate high fidelity types */
+	export const getEntries: (...args: any[]) => any;
+	/** Run `astro sync` to generate high fidelity types */
+	export 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;
+}