Skip to content

Commit 210a25e

Browse files
committed
fixes
1 parent 64c336a commit 210a25e

6 files changed

Lines changed: 21 additions & 27 deletions

File tree

apps/webapp/app/routes/confirm-basic-details.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,10 @@ export default function Page() {
316316
</InputGroup>
317317
) : (
318318
<>
319-
<input {...getInputProps(confirmEmail, { type: "hidden", value: false })} value={user.email} />
319+
<input
320+
{...getInputProps(confirmEmail, { type: "hidden", value: false })}
321+
value={user.email}
322+
/>
320323
</>
321324
)}
322325

apps/webapp/app/routes/login._index/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getFormProps, getInputProps, useForm } from "@conform-to/react";
2-
import { parseWithZod } from "@conform-to/zod";
2+
import { parseWithZod } from "@conform-to/zod/v4";
33
import { EnvelopeIcon, LockClosedIcon } from "@heroicons/react/20/solid";
44
import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
55
import { Form, useNavigation } from "@remix-run/react";

apps/webapp/app/routes/login.sso/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getFormProps, getInputProps, useForm } from "@conform-to/react";
2-
import { parseWithZod } from "@conform-to/zod";
2+
import { parseWithZod } from "@conform-to/zod/v4";
33
import { ArrowLeftIcon, ArrowUpRightIcon } from "@heroicons/react/20/solid";
44
import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
55
import { Form, useNavigation } from "@remix-run/react";

packages/schema-to-json/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
},
4343
"dependencies": {
4444
"@trigger.dev/core": "workspace:*",
45-
"zod-to-json-schema": "^3.24.0",
45+
"zod-to-json-schema": "^3.25.0",
4646
"@sodaru/yup-to-json-schema": "^2",
47-
"zod": "3.25.76",
47+
"zod": "4.4.3",
4848
"effect": "^3"
4949
},
5050
"devDependencies": {

packages/schema-to-json/src/index.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@ export function schemaToJsonSchema(
4343
): ConversionResult | undefined {
4444
const parser = schema as any;
4545

46-
// Check if schema has a built-in toJsonSchema method (e.g., ArkType, Zod 4)
47-
if (typeof parser.toJsonSchema === "function") {
48-
try {
49-
const jsonSchema = parser.toJsonSchema();
46+
if (isZodSchema(parser)) {
47+
const jsonSchema = convertZodSchema(parser, options);
5048

49+
if (jsonSchema) {
5150
return {
52-
jsonSchema,
51+
jsonSchema: jsonSchema,
5352
};
54-
} catch (_error) {
55-
// If toJsonSchema fails, continue to other checks
5653
}
5754
}
5855

59-
if (isZodSchema(parser)) {
60-
const jsonSchema = convertZodSchema(parser, options);
56+
// Check if schema has a built-in toJsonSchema method (e.g., ArkType)
57+
if (typeof parser.toJsonSchema === "function") {
58+
try {
59+
const jsonSchema = parser.toJsonSchema();
6160

62-
if (jsonSchema) {
6361
return {
64-
jsonSchema: jsonSchema,
62+
jsonSchema,
6563
};
64+
} catch (_error) {
65+
// If toJsonSchema fails, continue to other checks
6666
}
6767
}
6868

pnpm-lock.yaml

Lines changed: 2 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)