From 3a6abb73c26ceeb98570cf171cc25b8680f6e837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20J=C3=A4derberg?= Date: Fri, 28 Nov 2025 10:03:29 +0000 Subject: [PATCH] Merged in fix/align-react-versions (pull request #3250) fix: align react versions * fix: align react versions Approved-by: Anton Gunnarsson --- apps/scandic-web/package.json | 4 ++-- package.json | 2 ++ yarn.lock | 33 ++++----------------------------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/apps/scandic-web/package.json b/apps/scandic-web/package.json index 89b3c07be..b206f6b79 100644 --- a/apps/scandic-web/package.json +++ b/apps/scandic-web/package.json @@ -70,10 +70,10 @@ "nanoid": "^5.1.5", "next": "^15.5.6", "next-auth": "5.0.0-beta.29", - "react": "19.1.0", + "react": "^19.1.0", "react-aria-components": "^1.8.0", "react-day-picker": "^9.6.7", - "react-dom": "19.1.0", + "react-dom": "^19.1.0", "react-feather": "^2.0.10", "react-focus-lock": "^2.13.6", "react-hook-form": "^7.56.2", diff --git a/package.json b/package.json index 49b282bd6..7e6083951 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,8 @@ "turbo": "^2.6.1" }, "resolutions": { + "react": "~19.2.0", + "react-dom": "~19.2.0", "vite": "^7.2.4", "import-in-the-middle": "^1.14.2" } diff --git a/yarn.lock b/yarn.lock index 815592d56..9310f3e6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5512,10 +5512,10 @@ __metadata: nanoid: "npm:^5.1.5" next: "npm:^15.5.6" next-auth: "npm:5.0.0-beta.29" - react: "npm:19.1.0" + react: "npm:^19.1.0" react-aria-components: "npm:^1.8.0" react-day-picker: "npm:^9.6.7" - react-dom: "npm:19.1.0" + react-dom: "npm:^19.1.0" react-feather: "npm:^2.0.10" react-focus-lock: "npm:^2.13.6" react-hook-form: "npm:^7.56.2" @@ -14537,18 +14537,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:19.1.0": - version: 19.1.0 - resolution: "react-dom@npm:19.1.0" - dependencies: - scheduler: "npm:^0.26.0" - peerDependencies: - react: ^19.1.0 - checksum: 10c0/3e26e89bb6c67c9a6aa86cb888c7a7f8258f2e347a6d2a15299c17eb16e04c19194e3452bc3255bd34000a61e45e2cb51e46292392340432f133e5a5d2dfb5fc - languageName: node - linkType: hard - -"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^19.0.0, react-dom@npm:^19.1.0": +"react-dom@npm:~19.2.0": version: 19.2.0 resolution: "react-dom@npm:19.2.0" dependencies: @@ -14710,14 +14699,7 @@ __metadata: languageName: node linkType: hard -"react@npm:19.1.0": - version: 19.1.0 - resolution: "react@npm:19.1.0" - checksum: 10c0/530fb9a62237d54137a13d2cfb67a7db6a2156faed43eecc423f4713d9b20c6f2728b026b45e28fcd72e8eadb9e9ed4b089e99f5e295d2f0ad3134251bdd3698 - languageName: node - linkType: hard - -"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react@npm:^19.0.0, react@npm:^19.1.0": +"react@npm:~19.2.0": version: 19.2.0 resolution: "react@npm:19.2.0" checksum: 10c0/1b6d64eacb9324725bfe1e7860cb7a6b8a34bc89a482920765ebff5c10578eb487e6b46b2f0df263bd27a25edbdae2c45e5ea5d81ae61404301c1a7192c38330 @@ -15272,13 +15254,6 @@ __metadata: languageName: unknown linkType: soft -"scheduler@npm:^0.26.0": - version: 0.26.0 - resolution: "scheduler@npm:0.26.0" - checksum: 10c0/5b8d5bfddaae3513410eda54f2268e98a376a429931921a81b5c3a2873aab7ca4d775a8caac5498f8cbc7d0daeab947cf923dbd8e215d61671f9f4e392d34356 - languageName: node - linkType: hard - "scheduler@npm:^0.27.0": version: 0.27.0 resolution: "scheduler@npm:0.27.0"