From ad9922fbb8d6540e1f4420aa12859285256377fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 13:34:18 +0000 Subject: [PATCH 1/2] chore(deps): bump yup from 0.32.11 to 1.4.0 Bumps [yup](https://github.com/jquense/yup) from 0.32.11 to 1.4.0. - [Release notes](https://github.com/jquense/yup/releases) - [Changelog](https://github.com/jquense/yup/blob/master/CHANGELOG.md) - [Commits](https://github.com/jquense/yup/compare/v0.32.11...v1.4.0) --- updated-dependencies: - dependency-name: yup dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 36 +++++++++++++++--------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff16b22ce..7eb4b2e86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "styled-components": "6.1.8", "tslib": "^2.3.0", "web-vitals": "^3.3.2", - "yup": "^0.32.11" + "yup": "^1.4.0" }, "devDependencies": { "@babel/core": "^7.23.9", @@ -10455,7 +10455,8 @@ "node_modules/@types/lodash": { "version": "4.14.202", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", - "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==", + "dev": true }, "node_modules/@types/mdx": { "version": "2.0.11", @@ -23709,11 +23710,6 @@ "multicast-dns": "cli.js" } }, - "node_modules/nanoclone": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz", - "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==" - }, "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -29321,6 +29317,11 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "node_modules/tiny-case": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz", + "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==" + }, "node_modules/tiny-invariant": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", @@ -29945,7 +29946,6 @@ "version": "2.19.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "dev": true, "engines": { "node": ">=12.20" }, @@ -32230,20 +32230,14 @@ } }, "node_modules/yup": { - "version": "0.32.11", - "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz", - "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/yup/-/yup-1.4.0.tgz", + "integrity": "sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==", "dependencies": { - "@babel/runtime": "^7.15.4", - "@types/lodash": "^4.14.175", - "lodash": "^4.17.21", - "lodash-es": "^4.17.21", - "nanoclone": "^0.2.1", - "property-expr": "^2.0.4", - "toposort": "^2.0.2" - }, - "engines": { - "node": ">=10" + "property-expr": "^2.0.5", + "tiny-case": "^1.0.3", + "toposort": "^2.0.2", + "type-fest": "^2.19.0" } }, "node_modules/z-schema": { diff --git a/package.json b/package.json index 84fa71171..ade1a5928 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "styled-components": "6.1.8", "tslib": "^2.3.0", "web-vitals": "^3.3.2", - "yup": "^0.32.11" + "yup": "^1.4.0" }, "devDependencies": { "@babel/core": "^7.23.9", From 4e82e6a585feadcc5952e9d5069d476f594daaa1 Mon Sep 17 00:00:00 2001 From: Trevor Scandalios <5877597+scandycuz@users.noreply.github.com> Date: Mon, 16 Feb 2026 21:06:16 -0800 Subject: [PATCH 2/2] makes changes for yup major version bump --- apps/studio/src/common/formUtils.ts | 8 ++++---- apps/studio/src/pages/home/profile/Profile.tsx | 4 ++-- apps/studio/src/pages/home/settings/Settings.tsx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/studio/src/common/formUtils.ts b/apps/studio/src/common/formUtils.ts index 6bc1b0726..fd01d5a2d 100644 --- a/apps/studio/src/common/formUtils.ts +++ b/apps/studio/src/common/formUtils.ts @@ -80,8 +80,8 @@ export const commonYupValidation = { audio: Yup.mixed().required("This field is required"), barcodeNumber: Yup.string().when("barcodeType", { is: (barcodeType: string) => !!barcodeType && barcodeType !== NONE_OPTION, - otherwise: Yup.string(), - then: Yup.string() + otherwise: (schema) => schema, + then: (schema) => schema .test("barcodeNumberTest", function (value = "") { const { barcodeType } = this.parent; const { regEx, message } = getBarcodeRegex(barcodeType); @@ -106,7 +106,7 @@ export const commonYupValidation = { creditors: (roles: string[]) => Yup.array().when("isMinting", { is: (value: boolean) => !!value, - then: Yup.array().test({ + then: (schema) => schema.test({ message: "Creditors must have a role", test: (creditors = []) => creditors.every(({ role }) => roles.includes(role)), @@ -197,7 +197,7 @@ export const commonYupValidation = { ), owners: Yup.array().when("isMinting", { is: (value: boolean) => !!value, - then: Yup.array() + then: (schema) => schema .min(1, "At least one owner is required when minting") .test({ message: "Owner percentages must be between 00.01% and 100%", diff --git a/apps/studio/src/pages/home/profile/Profile.tsx b/apps/studio/src/pages/home/profile/Profile.tsx index 7084359bc..de54151cb 100644 --- a/apps/studio/src/pages/home/profile/Profile.tsx +++ b/apps/studio/src/pages/home/profile/Profile.tsx @@ -156,8 +156,8 @@ const Profile: FunctionComponent = () => { companyIpRights: Yup.bool(), companyName: Yup.string().when("companyIpRights", { is: true, - otherwise: Yup.string(), - then: Yup.string() + otherwise: (schema) => schema, + then: (schema) => schema .max( MAX_CHARACTER_COUNT, `Must be ${MAX_CHARACTER_COUNT} characters or less` diff --git a/apps/studio/src/pages/home/settings/Settings.tsx b/apps/studio/src/pages/home/settings/Settings.tsx index e5c9681bc..6fa114322 100644 --- a/apps/studio/src/pages/home/settings/Settings.tsx +++ b/apps/studio/src/pages/home/settings/Settings.tsx @@ -40,7 +40,7 @@ const Settings: FunctionComponent = () => { */ const newPassword = commonYupValidation.newPassword.when("currentPassword", { is: (currentValue: string) => currentValue, - then: Yup.string() + then: (schema) => schema .required("New password is required") .notOneOf( [Yup.ref("currentPassword")], @@ -55,7 +55,7 @@ const Settings: FunctionComponent = () => { "newPassword", { is: (currentValue: string) => currentValue, - then: Yup.string().required("Must match new password"), + then: (schema) => schema.required("Must match new password"), } );