From 17e975185359e43928cdb4167a9abfc981da219b Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Sun, 15 Dec 2024 08:42:49 +0100 Subject: [PATCH 1/9] feat(dependencies): bump `react-remove-scroll` to v2.6.1 Updated react-remove-scroll from version 2.6.0 to 2.6.1 This version resolves the peer dependency error encountered during installation when using React 19 --- packages/react/menu/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/menu/package.json b/packages/react/menu/package.json index 8d4aca8bc..63e89fa7d 100644 --- a/packages/react/menu/package.json +++ b/packages/react/menu/package.json @@ -45,7 +45,7 @@ "@radix-ui/react-slot": "workspace:*", "@radix-ui/react-use-callback-ref": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.0" + "react-remove-scroll": "2.6.1" }, "peerDependencies": { "@types/react": "*", From ee0ba799ccad1cd196970ed19a9ce6c3bf55b926 Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Sun, 15 Dec 2024 09:11:55 +0100 Subject: [PATCH 2/9] feat(dependencies): upgrade `react-remove-scroll` to v2.6.1 --- packages/react/dialog/package.json | 2 +- packages/react/dismissable-layer/package.json | 2 +- packages/react/popover/package.json | 2 +- packages/react/select/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react/dialog/package.json b/packages/react/dialog/package.json index 96a71116c..7625d4589 100644 --- a/packages/react/dialog/package.json +++ b/packages/react/dialog/package.json @@ -41,7 +41,7 @@ "@radix-ui/react-slot": "workspace:*", "@radix-ui/react-use-controllable-state": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.0" + "react-remove-scroll": "2.6.1" }, "peerDependencies": { "@types/react": "*", diff --git a/packages/react/dismissable-layer/package.json b/packages/react/dismissable-layer/package.json index 6217b1f90..633a0048d 100644 --- a/packages/react/dismissable-layer/package.json +++ b/packages/react/dismissable-layer/package.json @@ -35,7 +35,7 @@ "@radix-ui/react-use-escape-keydown": "workspace:*" }, "devDependencies": { - "react-remove-scroll": "2.6.0" + "react-remove-scroll": "2.6.1" }, "peerDependencies": { "@types/react": "*", diff --git a/packages/react/popover/package.json b/packages/react/popover/package.json index c16d09b6e..25f0a73e8 100644 --- a/packages/react/popover/package.json +++ b/packages/react/popover/package.json @@ -42,7 +42,7 @@ "@radix-ui/react-slot": "workspace:*", "@radix-ui/react-use-controllable-state": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.0" + "react-remove-scroll": "2.6.1" }, "peerDependencies": { "@types/react": "*", diff --git a/packages/react/select/package.json b/packages/react/select/package.json index 7ea0e00eb..73dc605fa 100644 --- a/packages/react/select/package.json +++ b/packages/react/select/package.json @@ -48,7 +48,7 @@ "@radix-ui/react-use-previous": "workspace:*", "@radix-ui/react-visually-hidden": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.0" + "react-remove-scroll": "2.6.1" }, "peerDependencies": { "@types/react": "*", From 252728d3b4bf66dbc28cac06c7e3675fe85a08d8 Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Sun, 15 Dec 2024 09:14:28 +0100 Subject: [PATCH 3/9] update yarn.lock --- yarn.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/yarn.lock b/yarn.lock index a7cfce031..6b1ff803a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2246,7 +2246,7 @@ __metadata: "@radix-ui/react-slot": "workspace:*" "@radix-ui/react-use-controllable-state": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.0" + react-remove-scroll: "npm:2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2281,7 +2281,7 @@ __metadata: "@radix-ui/react-primitive": "workspace:*" "@radix-ui/react-use-callback-ref": "workspace:*" "@radix-ui/react-use-escape-keydown": "workspace:*" - react-remove-scroll: "npm:2.6.0" + react-remove-scroll: "npm:2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2453,7 +2453,7 @@ __metadata: "@radix-ui/react-slot": "workspace:*" "@radix-ui/react-use-callback-ref": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.0" + react-remove-scroll: "npm:2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2543,7 +2543,7 @@ __metadata: "@radix-ui/react-slot": "workspace:*" "@radix-ui/react-use-controllable-state": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.0" + react-remove-scroll: "npm:2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2764,7 +2764,7 @@ __metadata: "@radix-ui/react-use-previous": "workspace:*" "@radix-ui/react-visually-hidden": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.0" + react-remove-scroll: "npm:2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -11870,38 +11870,38 @@ __metadata: languageName: node linkType: hard -"react-remove-scroll-bar@npm:^2.3.6": - version: 2.3.6 - resolution: "react-remove-scroll-bar@npm:2.3.6" +"react-remove-scroll-bar@npm:^2.3.7": + version: 2.3.8 + resolution: "react-remove-scroll-bar@npm:2.3.8" dependencies: - react-style-singleton: "npm:^2.2.1" + react-style-singleton: "npm:^2.2.2" tslib: "npm:^2.0.0" peerDependencies: - "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 + "@types/react": "*" + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: 10/5ab8eda61d5b10825447d11e9c824486c929351a471457c22452caa19b6898e18c3af6a46c3fa68010c713baed1eb9956106d068b4a1058bdcf97a1a9bbed734 + checksum: 10/6c0f8cff98b9f49a4ee2263f1eedf12926dced5ce220fbe83bd93544460e2a7ec8ec39b35d1b2a75d2fced0b2d64afeb8e66f830431ca896e05a20585f9fc350 languageName: node linkType: hard -"react-remove-scroll@npm:2.6.0": - version: 2.6.0 - resolution: "react-remove-scroll@npm:2.6.0" +"react-remove-scroll@npm:2.6.1": + version: 2.6.1 + resolution: "react-remove-scroll@npm:2.6.1" dependencies: - react-remove-scroll-bar: "npm:^2.3.6" + react-remove-scroll-bar: "npm:^2.3.7" react-style-singleton: "npm:^2.2.1" tslib: "npm:^2.1.0" use-callback-ref: "npm:^1.3.0" use-sidecar: "npm:^1.1.2" peerDependencies: - "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 + "@types/react": "*" + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc peerDependenciesMeta: "@types/react": optional: true - checksum: 10/9fac79e1c2ed2c85729bfe82f61ef4ae5ce51f478736a13892a9a11e05cbd4e9599f9f0e012cb5fc0719e18dc1dd687ab61f516193228615df636db8b851245e + checksum: 10/ee7d2ea0b1225d43c1102488f29f855a639e4589a086d5e56d656517495fe3ffbc235e2045893e23c44f60aa93281f882199d01ea2a68139adba9713bf3500a9 languageName: node linkType: hard From 8d201ba541a88215966707ea7439d4b2b3a5fc70 Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:39:16 +0100 Subject: [PATCH 4/9] Update packages/react/dialog/package.json Co-authored-by: Chance Strickland --- packages/react/dialog/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/dialog/package.json b/packages/react/dialog/package.json index 7625d4589..4ed73d136 100644 --- a/packages/react/dialog/package.json +++ b/packages/react/dialog/package.json @@ -41,7 +41,7 @@ "@radix-ui/react-slot": "workspace:*", "@radix-ui/react-use-controllable-state": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.1" + "react-remove-scroll": "^2.6.1" }, "peerDependencies": { "@types/react": "*", From e9a1fd769a142610f22feed6e0920127595ebfb6 Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:39:23 +0100 Subject: [PATCH 5/9] Update packages/react/dismissable-layer/package.json Co-authored-by: Chance Strickland --- packages/react/dismissable-layer/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/dismissable-layer/package.json b/packages/react/dismissable-layer/package.json index 633a0048d..ca22e40fa 100644 --- a/packages/react/dismissable-layer/package.json +++ b/packages/react/dismissable-layer/package.json @@ -35,7 +35,7 @@ "@radix-ui/react-use-escape-keydown": "workspace:*" }, "devDependencies": { - "react-remove-scroll": "2.6.1" + "react-remove-scroll": "^2.6.1" }, "peerDependencies": { "@types/react": "*", From 8a65fbd8dc2c56509b7bf3cb48c192354742eab1 Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:39:27 +0100 Subject: [PATCH 6/9] Update packages/react/popover/package.json Co-authored-by: Chance Strickland --- packages/react/popover/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/popover/package.json b/packages/react/popover/package.json index 25f0a73e8..ad67821ed 100644 --- a/packages/react/popover/package.json +++ b/packages/react/popover/package.json @@ -42,7 +42,7 @@ "@radix-ui/react-slot": "workspace:*", "@radix-ui/react-use-controllable-state": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.1" + "react-remove-scroll": "^2.6.1" }, "peerDependencies": { "@types/react": "*", From 79836c85843a753f0d2ba0af63e55a5a80432f26 Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:39:36 +0100 Subject: [PATCH 7/9] Update packages/react/select/package.json Co-authored-by: Chance Strickland --- packages/react/select/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/select/package.json b/packages/react/select/package.json index 73dc605fa..193855563 100644 --- a/packages/react/select/package.json +++ b/packages/react/select/package.json @@ -48,7 +48,7 @@ "@radix-ui/react-use-previous": "workspace:*", "@radix-ui/react-visually-hidden": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.1" + "react-remove-scroll": "^2.6.1" }, "peerDependencies": { "@types/react": "*", From 1af5035dddb0f8a619de1a254655f568195afa4b Mon Sep 17 00:00:00 2001 From: zayn <59846591+zbigniewstefaniuk@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:39:42 +0100 Subject: [PATCH 8/9] Update packages/react/menu/package.json Co-authored-by: Chance Strickland --- packages/react/menu/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/menu/package.json b/packages/react/menu/package.json index 63e89fa7d..6846907c2 100644 --- a/packages/react/menu/package.json +++ b/packages/react/menu/package.json @@ -45,7 +45,7 @@ "@radix-ui/react-slot": "workspace:*", "@radix-ui/react-use-callback-ref": "workspace:*", "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.1" + "react-remove-scroll": "^2.6.1" }, "peerDependencies": { "@types/react": "*", From ab395b8c8e4e55551d6470895eae349e2862653c Mon Sep 17 00:00:00 2001 From: Chance Strickland Date: Mon, 16 Dec 2024 15:28:24 -0800 Subject: [PATCH 9/9] update lockfile --- yarn.lock | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6b1ff803a..87e556c8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2246,7 +2246,7 @@ __metadata: "@radix-ui/react-slot": "workspace:*" "@radix-ui/react-use-controllable-state": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.1" + react-remove-scroll: "npm:^2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2281,7 +2281,7 @@ __metadata: "@radix-ui/react-primitive": "workspace:*" "@radix-ui/react-use-callback-ref": "workspace:*" "@radix-ui/react-use-escape-keydown": "workspace:*" - react-remove-scroll: "npm:2.6.1" + react-remove-scroll: "npm:^2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2453,7 +2453,7 @@ __metadata: "@radix-ui/react-slot": "workspace:*" "@radix-ui/react-use-callback-ref": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.1" + react-remove-scroll: "npm:^2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2543,7 +2543,7 @@ __metadata: "@radix-ui/react-slot": "workspace:*" "@radix-ui/react-use-controllable-state": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.1" + react-remove-scroll: "npm:^2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -2764,7 +2764,7 @@ __metadata: "@radix-ui/react-use-previous": "workspace:*" "@radix-ui/react-visually-hidden": "workspace:*" aria-hidden: "npm:^1.1.1" - react-remove-scroll: "npm:2.6.1" + react-remove-scroll: "npm:^2.6.1" peerDependencies: "@types/react": "*" "@types/react-dom": "*" @@ -11886,7 +11886,7 @@ __metadata: languageName: node linkType: hard -"react-remove-scroll@npm:2.6.1": +"react-remove-scroll@npm:^2.6.1": version: 2.6.1 resolution: "react-remove-scroll@npm:2.6.1" dependencies: @@ -11934,6 +11934,22 @@ __metadata: languageName: node linkType: hard +"react-style-singleton@npm:^2.2.2": + version: 2.2.3 + resolution: "react-style-singleton@npm:2.2.3" + dependencies: + get-nonce: "npm:^1.0.0" + tslib: "npm:^2.0.0" + peerDependencies: + "@types/react": "*" + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/62498094ff3877a37f351b29e6cad9e38b2eb1ac3c0cb27ebf80aee96554f80b35e17bdb552bcd7ac8b7cb9904fea93ea5668f2057c73d38f90b5d46bb9b27ab + languageName: node + linkType: hard + "react-test-renderer@npm:^18.0.0": version: 18.3.1 resolution: "react-test-renderer@npm:18.3.1"