diff --git a/packages/discloud.app/package.json b/packages/discloud.app/package.json index 75ff2be73..f8f7871dc 100644 --- a/packages/discloud.app/package.json +++ b/packages/discloud.app/package.json @@ -34,7 +34,7 @@ "@discloudapp/util": "^1.2.2", "source-map-support": "^0.5.21", "tslib": "^2.8.1", - "zod": "^3.25.76" + "zod": "^4.0.5" }, "engines": { "node": ">=16.17" diff --git a/packages/discloud.app/src/@types/index.ts b/packages/discloud.app/src/@types/index.ts index c378bff4f..19d315dbb 100644 --- a/packages/discloud.app/src/@types/index.ts +++ b/packages/discloud.app/src/@types/index.ts @@ -15,7 +15,7 @@ export interface DiscloudAppOptions { } export const ProfileOptions = z.object({ - avatarURL: z.coerce.string().url().regex(/^((?:s?ftp|https?):\/\/\S+\.(?:gif|jpe?g|png|webp))(?:[?#]\S*)?$/), + avatarURL: z.url().regex(/^((?:https?):\/\/\S+\.(?:gif|jpe?g|png|webp))(?:[?#]\S*)?$/), name: z.string().max(30), }).partial(); diff --git a/packages/util/package.json b/packages/util/package.json index ae925b991..8390a2482 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -31,7 +31,7 @@ "globify-gitignore": "^1.0.3", "source-map-support": "^0.5.21", "tslib": "^2.8.1", - "zod": "^3.25.76", + "zod": "^4.0.5", "zod-validation-error": "^3.5.2" }, "publishConfig": { diff --git a/packages/util/src/config/assertions.ts b/packages/util/src/config/assertions.ts index 3c97d864d..b706ccac8 100644 --- a/packages/util/src/config/assertions.ts +++ b/packages/util/src/config/assertions.ts @@ -19,7 +19,7 @@ const DiscloudConfigCommonRequiredPredicate = z.object({ const DiscloudConfigOptionalPredicate = z.object({ [DiscloudConfigScopes.APT]: APTPredicate, [DiscloudConfigScopes.AUTORESTART]: z.coerce.boolean(), - [DiscloudConfigScopes.AVATAR]: z.string().trim().url().or(EmptyStringPredicate), + [DiscloudConfigScopes.AVATAR]: z.url().or(EmptyStringPredicate), [DiscloudConfigScopes.HOSTNAME]: z.string(), [DiscloudConfigScopes.ID]: z.string(), [DiscloudConfigScopes.MAIN]: z.string(), diff --git a/yarn.lock b/yarn.lock index 3a61f5b2f..5aaf6db03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2732,7 +2732,7 @@ zod-validation-error@^3.5.2: resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-3.5.2.tgz#5af463c1acd4662e6b2610a75260931dbcb43a56" integrity sha512-mdi7YOLtram5dzJ5aDtm1AG9+mxRma1iaMrZdYIpFO7epdKBUwLHIxTF8CPDeCQ828zAXYtizrKlEJAtzgfgrw== -zod@^3.25.76: - version "3.25.76" - resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34" - integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ== +zod@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/zod/-/zod-4.0.5.tgz#b47825f318e7884d94bcd6f5385a1de805ccfb1c" + integrity sha512-/5UuuRPStvHXu7RS+gmvRf4NXrNxpSllGwDnCBcJZtQsKrviYXm54yDGV2KYNLT5kq0lHGcl7lqWJLgSaG+tgA==