feat!: consolidate zod export

.changeset/social-maps-shine.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Deprecates `astro:schema` and `z` from `astro:content` in favor of `astro/zod` - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#deprecated-astroschema-and-z-from-astrocontent))

benchmark/make-project/markdown-cc1.js

@@ -55,7 +55,8 @@ const { Content } = await render(entry);
 	await fs.writeFile(
 		new URL(`./src/content.config.ts`, projectDir),
 		`\
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

benchmark/make-project/markdown-cc2.js

@@ -30,7 +30,8 @@ ${loremIpsumMd}
 	await fs.writeFile(
 		new URL(`./src/content.config.ts`, projectDir),
 		/*ts */ `
-		import { defineCollection, z } from 'astro:content';
+		import { defineCollection } from 'astro:content';
+		import { z } from 'astro/zod';
 		import { glob } from 'astro/loaders';
 
 		const blog = defineCollection({

benchmark/make-project/mdx-cc1.js

@@ -55,7 +55,8 @@ const { Content } = await render(entry);
 	await fs.writeFile(
 		new URL(`./src/content.config.ts`, projectDir),
 		`\
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

benchmark/make-project/mdx-cc2.js

@@ -30,8 +30,8 @@ ${loremIpsumMd}
 	await fs.writeFile(
 		new URL(`./src/content.config.ts`, projectDir),
 		/*ts */ `
-		import { defineCollection, z } from 'astro:content';
-		import { glob } from 'astro/loaders';
+		import { defineCollection } from 'astro:content';
+		import { z } from 'astro/zod';
 
 		const blog = defineCollection({
 			loader: glob({ pattern: '*', base: './data/blog' }),

benchmark/make-project/memory-default.js

@@ -71,7 +71,8 @@ const { Content } = await render(entry);
 	await fs.writeFile(
 		new URL(`./src/content.config.ts`, projectDir),
 		`\
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

examples/blog/src/content.config.ts

@@ -1,5 +1,6 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
 import { glob } from 'astro/loaders';
+import { z } from 'astro/zod';
 
 const blog = defineCollection({
 	// Load Markdown and MDX files in the `src/content/blog/` directory.

examples/portfolio/src/content.config.ts

@@ -1,5 +1,6 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
 import { glob } from 'astro/loaders';
+import { z } from 'astro/zod';
 
 export const collections = {
 	work: defineCollection({

examples/starlog/src/content.config.ts

@@ -1,5 +1,6 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
 import { glob } from 'astro/loaders';
+import { z } from 'astro/zod';
 
 const releases = defineCollection({
 	// Load Markdown files in the src/content/releases directory.

packages/astro/client.d.ts

@@ -193,8 +193,22 @@ declare module 'astro:components' {
 	export * from 'astro/components';
 }
 
+// TODO: remove in Astro 7
+/**
+ * @deprecated
+ * `import { z } from 'astro:schema'` is deprecated and will be removed
+ * in Astro 7. Use `import { z } from 'astro/zod'` instead.
+ */
 declare module 'astro:schema' {
 	export * from 'astro/zod';
+	import zod from 'astro/zod';
+
+	/**
+	 * @deprecated
+	 * `import { z } from 'astro:schema'` is deprecated and will be removed
+	 * in Astro 7. Use `import { z } from 'astro/zod'` instead.
+	 */
+	export const z = zod.z;
 }
 
 type MD = import('./dist/types/public/content.js').MarkdownInstance<Record<string, any>>;

packages/astro/e2e/fixtures/actions-blog/src/actions/index.ts

@@ -1,6 +1,6 @@
 import { db, Comment, Likes, eq, sql } from 'astro:db';
 import { ActionError, defineAction } from 'astro:actions';
-import { z } from 'astro:schema';
+import { z } from 'astro/zod';
 import { getCollection } from 'astro:content';
 
 export const server = {

packages/astro/e2e/fixtures/actions-blog/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/e2e/fixtures/actions-react-19/src/actions/index.ts

@@ -1,6 +1,6 @@
 import { db, Likes, eq, sql } from 'astro:db';
 import { defineAction, type SafeResult } from 'astro:actions';
-import { z } from 'astro:schema';
+import { z } from 'astro/zod';
 import { getActionState } from '@astrojs/react/actions';
 
 export const server = {

packages/astro/e2e/fixtures/actions-react-19/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/src/core/create-vite.ts

@@ -213,6 +213,7 @@ export async function createVite(
 					find: 'astro:middleware',
 					replacement: 'astro/virtual-modules/middleware.js',
 				},
+				// TODO: remove in Astro 7
 				{
 					find: 'astro:schema',
 					replacement: 'astro/zod',

packages/astro/templates/content/module.mjs

@@ -14,6 +14,7 @@ export {
 	defineLiveCollection,
 	renderEntry as render,
 } from 'astro/content/runtime';
+// TODO: remove in Astro 7
 export { z } from 'astro/zod';
 
 /* @@LIVE_CONTENT_CONFIG@@ */

packages/astro/test/fixtures/actions/src/actions/index.ts

@@ -1,5 +1,5 @@
 import { defineAction, ActionError } from 'astro:actions';
-import { z } from 'astro:schema';
+import { z } from 'astro/zod';
 
 const passwordSchema = z
 	.string()

packages/astro/test/fixtures/astro-assets-dir/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({

packages/astro/test/fixtures/astro-assets-prefix/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({

packages/astro/test/fixtures/astro-env-content-collections/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { FOO } from "astro:env/client"
 
 console.log({ FOO, BAR: import.meta.env.BAR })

packages/astro/test/fixtures/content with spaces in folder name/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const withCustomSlugs = defineCollection({

packages/astro/test/fixtures/content-collection-references/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, reference, z } from 'astro:content';
+import { defineCollection, reference } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const banners = defineCollection({

packages/astro/test/fixtures/content-collections-base/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 

packages/astro/test/fixtures/content-collections-cache-invalidation/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/content-collections-empty-dir/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/content-collections-empty-md-file/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/content-collections-mutation/src/content.config.ts

@@ -1,5 +1,6 @@
 // 1. Import utilities from `astro:content`
-import { z, defineCollection } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 // 2. Define a `type` and `schema` for each collection

packages/astro/test/fixtures/content-collections-number-id/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 
 const data = defineCollection({
 	loader: async () => ([

packages/astro/test/fixtures/content-collections-same-contents/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 

packages/astro/test/fixtures/content-collections-with-config-mjs/src/content/config.mjs

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/content-collections/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const withData = defineCollection({

packages/astro/test/fixtures/content-intellisense/src/content.config.ts

@@ -1,5 +1,6 @@
 import { glob, file } from 'astro/loaders';
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 
 const blogCC = defineCollection({
 	loader: glob({ pattern: "**/*.{md,mdx,mdoc}", base: "./src/content/blog-cc" }),

packages/astro/test/fixtures/content-layer-remark-plugins/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const docs = defineCollection({

packages/astro/test/fixtures/content-layer-rendering/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z, reference } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const reptiles = defineCollection({

packages/astro/test/fixtures/content-layer/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z, reference } from 'astro:content';
+import { defineCollection, reference } from 'astro:content';
+import { z } from 'astro/zod';
 import { file, glob } from 'astro/loaders';
 import { loader } from './loaders/post-loader.js';
 import { readFile } from 'fs/promises';

packages/astro/test/fixtures/content-layer/src/loaders/post-loader.ts

@@ -1,4 +1,4 @@
-import { z } from 'astro:content';
+import { z } from 'astro/zod';
 import type { Loader } from "astro/loaders"
 
 export interface PostLoaderConfig {

packages/astro/test/fixtures/content-ssr-integration/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/content-static-paths-integration/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/content/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/core-image-base/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({

packages/astro/test/fixtures/core-image-deletion/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/core-image-errors/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({

packages/astro/test/fixtures/core-image-ssg/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({

packages/astro/test/fixtures/core-image-svg/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({

packages/astro/test/fixtures/core-image/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from "astro:content";
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({

packages/astro/test/fixtures/data-collections-schema/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const docs = defineCollection({

packages/astro/test/fixtures/data-collections/src/content.config.ts

@@ -1,4 +1,5 @@
-import { defineCollection, z } from 'astro:content';
+import { defineCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import { glob } from 'astro/loaders';
 
 const docs = defineCollection({

packages/astro/test/fixtures/live-loaders/src/live.config.ts

@@ -1,4 +1,5 @@
-import { defineLiveCollection, z } from 'astro:content';
+import { defineLiveCollection } from 'astro:content';
+import { z } from 'astro/zod';
 import type { LiveLoader } from 'astro/loaders';
 
 type Entry = {

packages/astro/test/fixtures/sessions/src/actions/index.ts

@@ -1,5 +1,5 @@
 import { defineAction } from 'astro:actions';
-import { z } from 'astro:schema';
+import { z } from 'astro/zod';
 
 export const server = {
 	addToCart: defineAction({

packages/astro/test/units/content-collections/frontmatter.test.js

@@ -11,7 +11,8 @@ describe('frontmatter', () => {
 					---
 				`,
 			'/src/content.config.ts': `\
-					import { defineCollection, z } from 'astro:content';
+					import { defineCollection } from 'astro:content';
+					import { z } from 'astro/zod';
 					import { glob } from 'astro/loaders';
 
 					const posts = defineCollection({