Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit ed1351c

Browse files
henryqdineenHenry Q. Dineen
andauthored
[compiler] improve zod v3 backwards compat (#34877)
## Summary When upgrading to `babel-plugin-react-compiler@1.0.0` in a project that uses `zod@3` we are running into TypeScript errors like: ``` node_modules/babel-plugin-react-compiler/dist/index.d.ts:435:10 - error TS2694: Namespace '"/REDACTED/node_modules/zod/v3/external"' has no exported member 'core'. 435 }, z.core.$strip>>>; ~~~~ ``` This problem seems to be related to d6eb735, which introduced zod v3/v4 compatibility. Since `zod` is bundled into the compiler source this does not cause runtime issues and only manifests as TypeScript errors. My proposed solution is this PR is to use zod's [subpath versioning strategy](https://zod.dev/v4/versioning?id=versioning-in-zod-4) which allows you to support v3 and v4 APIs on both major versions. Changes in this PR include: - Updated `zod` import paths to `zod/v4` - Bumped min `zod` version to `^3.25.0` for zod which guarantees the `zod/v4` subpath is available. - Updated `zod-validation-error` import paths to `zod-validation-error/v4` - Bumped min `zod-validation-error ` version to `^3.5.0` - Updated `externals` tsup configuration where appropriate. Once the compiler drops zod v3 support we could optionally remove the `/v4` subpath from the imports. ## How did you test this change? Not totally sure the best way to test. I ran `NODE_ENV=production yarn workspace babel-plugin-react-compiler run build --dts` and diffed the `dist/` folder between my change and `v1.0.0` and it looks correct. We have a `patch-package` patch to workaround this for now and it works as expected. ```diff diff --git a/node_modules/babel-plugin-react-compiler/dist/index.d.ts b/node_modules/babel-plugin-react-compiler/dist/index.d.ts index 81c3f3d..daafc2c 100644 --- a/node_modules/babel-plugin-react-compiler/dist/index.d.ts +++ b/node_modules/babel-plugin-react-compiler/dist/index.d.ts @@ -1,7 +1,7 @@ import * as BabelCore from '@babel/core'; import { NodePath as NodePath$1 } from '@babel/core'; import * as t from '@babel/types'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { NodePath, Scope } from '@babel/traverse'; interface Result<T, E> { ``` Co-authored-by: Henry Q. Dineen <henryqdineen@gmail.com>
1 parent 93f8593 commit ed1351c

18 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎compiler/packages/babel-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"react-dom": "0.0.0-experimental-4beb1fd8-20241118",
5353
"ts-jest": "^29.1.1",
5454
"ts-node": "^10.9.2",
55-
"zod": "^3.22.4 || ^4.0.0",
56-
"zod-validation-error": "^3.0.3 || ^4.0.0"
55+
"zod": "^3.25.0 || ^4.0.0",
56+
"zod-validation-error": "^3.5.0 || ^4.0.0"
5757
},
5858
"resolutions": {
5959
"./**/@babel/parser": "7.7.4",

‎compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{
1111
CompilerDiagnostic,
1212
CompilerError,
@@ -20,7 +20,7 @@ import {
2020
tryParseExternalFunction,
2121
}from'../HIR/Environment';
2222
import{hasOwnProperty}from'../Utils/utils';
23-
import{fromZodError}from'zod-validation-error';
23+
import{fromZodError}from'zod-validation-error/v4';
2424
import{CompilerPipelineValue}from'./Pipeline';
2525

2626
constPanicThresholdOptionsSchema=z.enum([

‎compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import*astfrom'@babel/types';
9-
import{ZodError,z}from'zod';
10-
import{fromZodError}from'zod-validation-error';
9+
import{ZodError,z}from'zod/v4';
10+
import{fromZodError}from'zod-validation-error/v4';
1111
import{CompilerError}from'../CompilerError';
1212
import{Logger,ProgramContext}from'../Entrypoint';
1313
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {assertExhaustive} from '../Utils/utils';
1616
import{Environment,ReactFunctionType}from'./Environment';
1717
importtype{HookKind}from'./ObjectShape';
1818
import{Type,makeType}from'./Types';
19-
import{z}from'zod';
19+
import{z}from'zod/v4';
2020
importtype{AliasingEffect}from'../Inference/AliasingEffects';
2121
import{isReservedWord}from'../Utils/Keyword';
2222
import{Err,Ok,Result}from'../Utils/Result';

‎compiler/packages/babel-plugin-react-compiler/src/HIR/TypeSchema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import{isValidIdentifier}from'@babel/types';
9-
import{z}from'zod';
9+
import{z}from'zod/v4';
1010
import{Effect,ValueKind}from'..';
1111
import{
1212
EffectSchema,

‎compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import{fromZodError}from'zod-validation-error';
8+
import{fromZodError}from'zod-validation-error/v4';
99
import{CompilerError}from'../CompilerError';
1010
import{
1111
CompilationMode,

‎compiler/packages/eslint-plugin-react-compiler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@babel/core": "^7.24.4",
1616
"@babel/parser": "^7.24.4",
1717
"hermes-parser": "^0.25.1",
18-
"zod": "^3.22.4 || ^4.0.0",
19-
"zod-validation-error": "^3.0.3 || ^4.0.0"
18+
"zod": "^3.25.0 || ^4.0.0",
19+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2020
},
2121
"devDependencies": {
2222
"@babel/preset-env": "^7.22.4",

‎compiler/packages/eslint-plugin-react-compiler/tsup.config.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import {defineConfig} from 'tsup';
1010
exportdefaultdefineConfig({
1111
entry: ['./src/index.ts'],
1212
outDir: './dist',
13-
external: ['@babel/core','hermes-parser','zod','zod-validation-error'],
13+
external: [
14+
'@babel/core',
15+
'hermes-parser',
16+
'zod',
17+
'zod/v4',
18+
'zod-validation-error',
19+
'zod-validation-error/v4',
20+
],
1421
splitting: false,
1522
sourcemap: false,
1623
dts: false,

‎compiler/packages/react-compiler-healthcheck/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"fast-glob": "^3.3.2",
1818
"ora": "5.4.1",
1919
"yargs": "^17.7.2",
20-
"zod": "^3.22.4 || ^4.0.0",
21-
"zod-validation-error": "^3.0.3 || ^4.0.0"
20+
"zod": "^3.25.0 || ^4.0.0",
21+
"zod-validation-error": "^3.5.0 || ^4.0.0"
2222
},
2323
"devDependencies": {},
2424
"engines": {

‎compiler/packages/react-compiler-healthcheck/tsup.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export default defineConfig({
1818
'ora',
1919
'yargs',
2020
'zod',
21+
'zod/v4',
2122
'zod-validation-error',
23+
'zod-validation-error/v4',
2224
],
2325
splitting: false,
2426
sourcemap: false,

0 commit comments

Comments
 (0)