From fef043d3b4bc27ddb4b85542ee419bd105a55447 Mon Sep 17 00:00:00 2001 From: Matthew Costabile Date: Wed, 23 Jul 2025 12:33:56 -0400 Subject: [PATCH 1/5] Update package.json to modify react-is dependency Remove react-is from dependencies and add to peerDependencies --- packages/react/package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index 31d5cea5a5b..137e5ed39b4 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -93,7 +93,6 @@ "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", "@styled-system/theme-get": "^5.1.2", - "@types/react-is": "^18.2.1", "@types/styled-system": "^5.1.23", "@types/styled-system__css": "^5.0.16", "@types/styled-system__theme-get": "^5.0.1", @@ -107,7 +106,6 @@ "lodash.isobject": "^3.0.2", "react-compiler-runtime": "^19.1.0-rc.2", "react-intersection-observer": "^9.16.0", - "react-is": "^18.2.0", "styled-system": "^5.1.5", "type-check": "0.4.0" }, @@ -218,9 +216,11 @@ "peerDependencies": { "@types/react": "18.x || 19.x", "@types/react-dom": "18.x || 19.x", + "@types/react-is": "18.x || 19.x", "@types/styled-components": "^5.1.11", "react": "18.x || 19.x", "react-dom": "18.x || 19.x", + "react-is": "18.x || 19.x", "styled-components": "5.x" }, "peerDependenciesMeta": { @@ -230,6 +230,9 @@ "@types/react-dom": { "optional": true }, + "@types/react-is": { + "optional": true + }, "@types/styled-components": { "optional": true } From 105ef9e063fca0da7b8ce06e7a538e229472ec57 Mon Sep 17 00:00:00 2001 From: Matthew Costabile Date: Wed, 23 Jul 2025 16:38:19 +0000 Subject: [PATCH 2/5] packagelock --- package-lock.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 337e881a48d..2cc88bcd9c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9613,10 +9613,12 @@ }, "node_modules/@types/prop-types": { "version": "15.7.11", + "dev": true, "license": "MIT" }, "node_modules/@types/react": { "version": "18.3.11", + "dev": true, "license": "MIT", "dependencies": { "@types/prop-types": "*", @@ -9631,13 +9633,6 @@ "@types/react": "*" } }, - "node_modules/@types/react-is": { - "version": "18.2.4", - "license": "MIT", - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/react-test-renderer": { "version": "18.3.0", "dev": true, @@ -25333,6 +25328,7 @@ }, "node_modules/react-is": { "version": "18.3.1", + "dev": true, "license": "MIT" }, "node_modules/react-refresh": { @@ -31365,7 +31361,6 @@ "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", "@styled-system/theme-get": "^5.1.2", - "@types/react-is": "^18.2.1", "@types/styled-system": "^5.1.23", "@types/styled-system__css": "^5.0.16", "@types/styled-system__theme-get": "^5.0.1", @@ -31379,7 +31374,6 @@ "lodash.isobject": "^3.0.2", "react-compiler-runtime": "^19.1.0-rc.2", "react-intersection-observer": "^9.16.0", - "react-is": "^18.2.0", "styled-system": "^5.1.5", "type-check": "0.4.0" }, @@ -31494,9 +31488,11 @@ "peerDependencies": { "@types/react": "18.x || 19.x", "@types/react-dom": "18.x || 19.x", + "@types/react-is": "18.x || 19.x", "@types/styled-components": "^5.1.11", "react": "18.x || 19.x", "react-dom": "18.x || 19.x", + "react-is": "18.x || 19.x", "styled-components": "5.x" }, "peerDependenciesMeta": { @@ -31506,6 +31502,9 @@ "@types/react-dom": { "optional": true }, + "@types/react-is": { + "optional": true + }, "@types/styled-components": { "optional": true } From fb487cd1c70bdc2ca1249b6dafb1b65ae6cd55c9 Mon Sep 17 00:00:00 2001 From: Matthew Costabile Date: Wed, 23 Jul 2025 16:40:31 +0000 Subject: [PATCH 3/5] fix react-is version in dev --- package-lock.json | 1 + packages/react/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/package-lock.json b/package-lock.json index 2cc88bcd9c3..9d731632257 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31459,6 +31459,7 @@ "postcss-preset-primer": "^0.0.0", "react": "18.3.1", "react-dom": "18.3.1", + "react-is": "18.3.1", "react-test-renderer": "18.3.1", "recast": "0.23.7", "rimraf": "5.0.5", diff --git a/packages/react/package.json b/packages/react/package.json index 137e5ed39b4..f540bcdfcc1 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -191,6 +191,7 @@ "postcss-preset-primer": "^0.0.0", "react": "18.3.1", "react-dom": "18.3.1", + "react-is": "18.3.1", "react-test-renderer": "18.3.1", "recast": "0.23.7", "rimraf": "5.0.5", From e1e5f2c96618449d124cc4de1f36cbcc4829e865 Mon Sep 17 00:00:00 2001 From: Matthew Costabile Date: Wed, 23 Jul 2025 16:43:27 +0000 Subject: [PATCH 4/5] fix versions --- package-lock.json | 33 ++++++++++++++++++++++++++++----- packages/react/package.json | 5 +++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d731632257..64b2dad2b34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9633,12 +9633,14 @@ "@types/react": "*" } }, - "node_modules/@types/react-test-renderer": { - "version": "18.3.0", + "node_modules/@types/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-zts4lhQn5ia0cF/y2+3V6Riu0MAfez9/LJYavdM8TvcVl+S91A/7VWxyBT8hbRuWspmuCaiGI0F41OJYGrKhRA==", "dev": true, "license": "MIT", "dependencies": { - "@types/react": "*" + "@types/react": "^18" } }, "node_modules/@types/resolve": { @@ -31415,8 +31417,9 @@ "@types/lodash.keyby": "4.6.9", "@types/node": "20.12.11", "@types/react": "18.3.11", - "@types/react-dom": "18.3.0", - "@types/react-test-renderer": "18.3.0", + "@types/react-dom": "18.3.1", + "@types/react-is": "18.3.1", + "@types/react-test-renderer": "18.3.1", "@types/semver": "7.7.0", "@types/styled-components": "^5.1.26", "@vitejs/plugin-react": "^4.3.3", @@ -31558,6 +31561,26 @@ "storybook": "^9.0.12" } }, + "packages/react/node_modules/@types/react-dom": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz", + "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/react": "*" + } + }, + "packages/react/node_modules/@types/react-test-renderer": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.3.1.tgz", + "integrity": "sha512-vAhnk0tG2eGa37lkU9+s5SoroCsRI08xnsWFiAXOuPH2jqzMbcXvKExXViPi1P5fIklDeCvXqyrdmipFaSkZrA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/react": "^18" + } + }, "packages/react/node_modules/character-entities-legacy": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz", diff --git a/packages/react/package.json b/packages/react/package.json index f540bcdfcc1..416fcff192a 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -147,8 +147,9 @@ "@types/lodash.keyby": "4.6.9", "@types/node": "20.12.11", "@types/react": "18.3.11", - "@types/react-dom": "18.3.0", - "@types/react-test-renderer": "18.3.0", + "@types/react-dom": "18.3.1", + "@types/react-is": "18.3.1", + "@types/react-test-renderer": "18.3.1", "@types/semver": "7.7.0", "@types/styled-components": "^5.1.26", "@vitejs/plugin-react": "^4.3.3", From 93527df6465c528ead5e32691c1ef53c8fd45fcd Mon Sep 17 00:00:00 2001 From: Matthew Costabile Date: Wed, 23 Jul 2025 16:46:30 +0000 Subject: [PATCH 5/5] changeset --- .changeset/tall-pets-obey.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tall-pets-obey.md diff --git a/.changeset/tall-pets-obey.md b/.changeset/tall-pets-obey.md new file mode 100644 index 00000000000..9ca08e671f2 --- /dev/null +++ b/.changeset/tall-pets-obey.md @@ -0,0 +1,5 @@ +--- +'@primer/react': patch +--- + +corrects peer dependencies around react-is and types