Upgrade to Zod 4 by matthewp · Pull Request #14956 · withastro/astro

matthewp · 2025-12-03T21:56:00Z

Changes

A lot of use of .prefault() and changing z.object(z.number()) to z.object(z.string(), z.number())

Testing

Existing tests pass
Most significant changes here are because error messages are a little different in Zod 4.

Docs

Upgrade guide: Add section on Zod 4 to v6 migration guide docs#12848

Consolidate Zod v3 to v4 upgrade with comprehensive changes: - Remove dual Zod version support, standardize on v4 - Simplify type systems and remove experimental.zod4 flag - Update dependencies: js-yaml, magic-string, magicast to latest versions - Replace kleur with piccolore for CLI colors - Refactor content layer, actions, and config to use unified Zod handling - Simplify JSON schema generation and type generation - Remove z3/z4 branching logic throughout codebase - Update error handling to work with unified Zod implementation BREAKING CHANGE: Zod v3 support removed, project now requires Zod v4+

- Remove all z3 imports and replace with z4/zod - Remove z3-specific functions (formDataToZ3Object, handleZ3FormDataGetAll/Get, unwrapBaseZ3ObjectSchema, createZ3Image) - Remove dual-version type unions, simplify to z4-only types - Remove z3ErrorMap function, keep only z4ErrorMap - Remove checkZodSchemaCompatibility calls (no longer needed) - Simplify vite-plugin-experimental-zod4/utils.ts to no-op - Update package.json to require zod ^4.0.0 - Update test files and exports to reference z4 versions

changeset-bot · 2025-12-03T21:56:05Z

🦋 Changeset detected

Latest commit: 93acc31

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

examples/blog/astro.config.mjs

florian-lefebvre · 2025-12-09T20:11:09Z

I'll check it out tomorrow morning

…endering/package.json

florian-lefebvre

Code LGTM! The changeset will probably need to be updated after the linked docs PR is approved

matthewp · 2025-12-10T13:39:55Z

@florian-lefebvre I still don't understand why 82f1de6 is necessary. can you explain?

florian-lefebvre · 2025-12-10T13:50:49Z

In my zod 3/4 PR I would replace '@@REFERENCE@@' dynamically based on the zod version, for example to export const reference: import('astro/content/config').Z4Reference.

Now that we only support v4, this codegen logic has been removed so this flag was never replaced. Instead I "inlined" Z4Reference. This diff shows it's just about updating it from zod 3 to zod 4 types:

matthewp · 2025-12-10T14:02:46Z

@florian-lefebvre why are types not coming from the implementation of reference?

florian-lefebvre · 2025-12-10T14:19:09Z

Because in this case, reference() types rely on codegen stuff. Specifically the DataEntryMap

florian-lefebvre · 2025-12-11T14:15:48Z

Let me know if you want me to handle the fonts breaking change, I made these changes very recently so I can probably untangle it quickly

.changeset/dance-ornate-keen.md

matthewp · 2025-12-11T17:09:19Z

@florian-lefebvre yes, I would appreciate it if you could do that. Thank you!

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

sarah11918

Approving for docs, and the docs PR is also good to go! Nice job, Matthew! 🎉

* feat: upgrade to Zod v4 Consolidate Zod v3 to v4 upgrade with comprehensive changes: - Remove dual Zod version support, standardize on v4 - Simplify type systems and remove experimental.zod4 flag - Update dependencies: js-yaml, magic-string, magicast to latest versions - Replace kleur with piccolore for CLI colors - Refactor content layer, actions, and config to use unified Zod handling - Simplify JSON schema generation and type generation - Remove z3/z4 branching logic throughout codebase - Update error handling to work with unified Zod implementation BREAKING CHANGE: Zod v3 support removed, project now requires Zod v4+ * Remove Zod v3 support, keep only v4 - Remove all z3 imports and replace with z4/zod - Remove z3-specific functions (formDataToZ3Object, handleZ3FormDataGetAll/Get, unwrapBaseZ3ObjectSchema, createZ3Image) - Remove dual-version type unions, simplify to z4-only types - Remove z3ErrorMap function, keep only z4ErrorMap - Remove checkZodSchemaCompatibility calls (no longer needed) - Simplify vite-plugin-experimental-zod4/utils.ts to no-op - Update package.json to require zod ^4.0.0 - Update test files and exports to reference z4 versions * Finish upgrade * skip these tests for now * skip this one too * correct mark the received item * fix config-validate tests * merge: resolve conflicts between zod4-m and next * fix remaining build error * remove references to zod4 thing * fixes * prevent the crash * switch to the native zod to json schema * oops * fix content layer tests * fix error map tests * fix actions test * fix intellisense tsts * fix schema test * fix: types * Update Svelte to exactly 5.43.8 in package and fixtures * fix svelte tests * fix more e2e * fix cloudflare tests * fix defineMiddleware issue * remove unused reference * fix examples types * pr comment stuff * changeset * remove experiemental flag * add some debugging here * remove debugging stuff * Update packages/astro/src/actions/vite-plugin-actions.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * fix * fix: import * use zod/v4 imports in core * remove createDefineAction * remove unnecessary type alias * remove unused z4reference * rename stuff * unskip tests * rename back to createImage * nit * revert markdown change * put errorMap name back * address feedback on rss * fix: exports * Update packages/astro-rss/src/index.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro-rss/src/schema.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro-rss/src/util.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/assets/fonts/config.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/assets/fonts/types.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/content/loaders/types.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/content/config.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/core/config/schemas/relative.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/test/units/config/config-validate.test.js Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/test/units/actions/form-data-to-object.test.js Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/core/config/schemas/refined.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/content/content-layer.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/content/types-generator.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Update packages/astro/src/content/utils.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Use $ZodError * Update packages/astro/src/core/csp/config.ts Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * fix the build * fix e2e test * replace z4 with z * increase vercel test timeout * pr comments * export ImageFunction * use prefault * Validate experimental features special * bring back old locales * fix test * db needs to be a patch too * fix chainability of image * update zod imports * Discard changes to packages/integrations/svelte/package.json * Discard changes to packages/integrations/svelte/test/fixtures/async-rendering/package.json * refresh lockfile * chore: changeset * fix: reference() * skip broken svelte test * Update .changeset/dance-ornate-keen.md Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com> * fix config vlaidate test --------- Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

matthewp added 3 commits December 2, 2025 14:45

Finish upgrade

0bb5419

github-actions bot added pkg: example Related to an example package (scope) pkg: astro Related to the core `astro` package (scope) docs pr labels Dec 3, 2025

matthewp added 11 commits December 3, 2025 16:59

Merge branch 'next' into zod4-m

c78a21e

skip these tests for now

9fdfe72

skip this one too

be4e226

correct mark the received item

11766e1

fix config-validate tests

beb8c67

Merge branch 'next' into zod4-m

45b6c46

merge: resolve conflicts between zod4-m and next

085e663

fix remaining build error

19a3c1b

remove references to zod4 thing

94f42c1

fixes

86b54be

prevent the crash

59e5cdf

github-actions bot added pkg: svelte Related to Svelte (scope) pkg: integration Related to any renderer integration (scope) labels Dec 4, 2025

matthewp added 7 commits December 4, 2025 15:17

switch to the native zod to json schema

bb8f885

oops

1ae84f2

fix content layer tests

8084da5

fix error map tests

62edc31

fix actions test

ef994e5

fix intellisense tsts

4f005eb

fix schema test

2ddd549

florian-lefebvre added this to the v6.0.0 milestone Dec 5, 2025

fix: types

215afa0

matthewp commented Dec 5, 2025

View reviewed changes

examples/blog/astro.config.mjs Outdated Show resolved Hide resolved

florian-lefebvre added 3 commits December 10, 2025 09:16

update zod imports

f55cfcb

Discard changes to packages/integrations/svelte/package.json

2a4b1da

Discard changes to packages/integrations/svelte/test/fixtures/async-r…

dfac302

…endering/package.json

github-actions bot removed the pkg: svelte Related to Svelte (scope) label Dec 10, 2025

florian-lefebvre added 3 commits December 10, 2025 09:18

refresh lockfile

9d03430

chore: changeset

c35609b

fix: reference()

82f1de6

florian-lefebvre approved these changes Dec 10, 2025

View reviewed changes

skip broken svelte test

787325d

github-actions bot added the pkg: svelte Related to Svelte (scope) label Dec 10, 2025

ematipico approved these changes Dec 11, 2025

View reviewed changes

sarah11918 reviewed Dec 11, 2025

View reviewed changes

.changeset/dance-ornate-keen.md Outdated Show resolved Hide resolved

Update .changeset/dance-ornate-keen.md

1e3ac98

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

florian-lefebvre mentioned this pull request Dec 11, 2025

feat: plugin hook filters (part 1) #14995

Merged

florian-lefebvre and others added 3 commits December 11, 2025 18:33

Merge branch 'next' into zod4-m

4de6372

Merge branch 'next' into zod4-m

357480d

fix config vlaidate test

64f1796

sarah11918 approved these changes Dec 11, 2025

View reviewed changes

Merge branch 'next' into zod4-m

93acc31

matthewp merged commit 0ff51df into next Dec 12, 2025
23 checks passed

matthewp deleted the zod4-m branch December 12, 2025 16:01

astrobot-houston mentioned this pull request Dec 12, 2025

[ci] release (alpha) #14757

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upgrade to Zod 4#14956

Upgrade to Zod 4#14956
matthewp merged 93 commits intonextfrom
zod4-m

matthewp commented Dec 3, 2025 •

edited

Loading

Uh oh!

changeset-bot bot commented Dec 3, 2025 •

edited

Loading

Uh oh!

Uh oh!

florian-lefebvre commented Dec 9, 2025

Uh oh!

florian-lefebvre left a comment

Uh oh!

matthewp commented Dec 10, 2025

Uh oh!

florian-lefebvre commented Dec 10, 2025

Uh oh!

matthewp commented Dec 10, 2025

Uh oh!

florian-lefebvre commented Dec 10, 2025 •

edited

Loading

Uh oh!

florian-lefebvre commented Dec 11, 2025

Uh oh!

Uh oh!

matthewp commented Dec 11, 2025

Uh oh!

sarah11918 left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

matthewp commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Testing

Docs

Uh oh!

changeset-bot bot commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

Uh oh!

florian-lefebvre commented Dec 9, 2025

Uh oh!

florian-lefebvre left a comment

Choose a reason for hiding this comment

Uh oh!

matthewp commented Dec 10, 2025

Uh oh!

florian-lefebvre commented Dec 10, 2025

Uh oh!

matthewp commented Dec 10, 2025

Uh oh!

florian-lefebvre commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

florian-lefebvre commented Dec 11, 2025

Uh oh!

Uh oh!

matthewp commented Dec 11, 2025

Uh oh!

sarah11918 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

matthewp commented Dec 3, 2025 •

edited

Loading

changeset-bot bot commented Dec 3, 2025 •

edited

Loading

florian-lefebvre commented Dec 10, 2025 •

edited

Loading