Skip to content

fix: declare optional React type peers for published packages #10953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sophran-fbj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: declare optional React type peers for published packages #10953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/@react-types/shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"peerDependencies": {
"@types/react": "*",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
}
6 changes: 6 additions & 0 deletions packages/react-aria-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,15 @@
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"peerDependencies": {
"@types/react": "*",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
},
"targets": {
"main": false,
"module": false,
Expand Down
48 changes: 27 additions & 21 deletions packages/react-aria/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,24 @@
"version": "3.53.1",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/adobe/react-spectrum"
},
"source": "exports/index.ts",
"files": [
"*",
"!docs/**",
"!exports/**",
"!intl/**",
"!src/**",
"!stories/**",
"!test/**"
],
"sideEffects": false,
"main": "./dist/exports/index.cjs",
"module": "./dist/exports/index.js",
"types": "./dist/types/exports/index.d.ts",
"exports": {
".": {
"source": "./exports/index.ts",
Expand All @@ -31,21 +47,8 @@
"require": "./dist/exports/*.cjs"
}
},
"types": "./dist/types/exports/index.d.ts",
"source": "exports/index.ts",
"files": [
"*",
"!docs/**",
"!exports/**",
"!intl/**",
"!src/**",
"!stories/**",
"!test/**"
],
"sideEffects": false,
"repository": {
"type": "git",
"url": "https://github.com/adobe/react-spectrum"
"publishConfig": {
"access": "public"
},
"dependencies": {
"@internationalized/date": "^3.12.4",
Expand All @@ -58,18 +61,21 @@
"react-stately": "3.51.0",
"use-sync-external-store": "^1.6.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"devDependencies": {
"@babel/cli": "^7.24.1",
"@babel/core": "^7.24.3",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"publishConfig": {
"access": "public"
"peerDependencies": {
"@types/react": "*",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
},
"targets": {
"main": false,
Expand Down
46 changes: 26 additions & 20 deletions packages/react-stately/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,24 @@
"version": "3.51.0",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/adobe/react-spectrum"
},
"source": "exports/index.ts",
"files": [
"*",
"!docs/**",
"!exports/**",
"!intl/**",
"!src/**",
"!stories/**",
"!test/**"
],
"sideEffects": false,
"main": "./dist/exports/index.cjs",
"module": "./dist/exports/index.js",
"types": "./dist/types/exports/index.d.ts",
"exports": {
".": {
"source": "./exports/index.ts",
Expand All @@ -21,21 +37,8 @@
"require": "./dist/exports/*.cjs"
}
},
"types": "./dist/types/exports/index.d.ts",
"source": "exports/index.ts",
"files": [
"*",
"!docs/**",
"!exports/**",
"!intl/**",
"!src/**",
"!stories/**",
"!test/**"
],
"sideEffects": false,
"repository": {
"type": "git",
"url": "https://github.com/adobe/react-spectrum"
"publishConfig": {
"access": "public"
},
"dependencies": {
"@internationalized/date": "^3.12.4",
Expand All @@ -45,16 +48,19 @@
"@swc/helpers": "^0.5.0",
"use-sync-external-store": "^1.6.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"devDependencies": {
"@babel/cli": "^7.24.1",
"@babel/core": "^7.24.3",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"publishConfig": {
"access": "public"
"peerDependencies": {
"@types/react": "*",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
},
"targets": {
"main": false,
Expand Down
6 changes: 5 additions & 1 deletion yarn.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,11 @@ function enforceWorkspaceDependencies({Yarn}) {
// workspace tree has the same peer dependency.
let seen = new Map();
for (const dependency of Yarn.dependencies()) {
if (dependency.type === 'peerDependencies') {
// Do not turn optional peers into required peers of dependent workspaces.
if (
dependency.type === 'peerDependencies' &&
!dependency.workspace.manifest.peerDependenciesMeta?.[dependency.ident]?.optional
) {
for (const workspace of Yarn.workspaces()) {
if (
// must check in manifest because yarn is reporting all peer in workspace.pkg.dependencies
Expand Down
16 changes: 16 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9257,7 +9257,11 @@ __metadata:
dependencies:
react: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
peerDependencies:
"@types/react": "*"
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
peerDependenciesMeta:
"@types/react":
optional: true
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -25177,8 +25181,12 @@ __metadata:
react-stately: "npm:3.51.0"
use-sync-external-store: "npm:^1.6.0"
peerDependencies:
"@types/react": "*"
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
peerDependenciesMeta:
"@types/react":
optional: true
languageName: unknown
linkType: soft

Expand All @@ -25200,8 +25208,12 @@ __metadata:
react-stately: "npm:3.51.0"
use-sync-external-store: "npm:^1.6.0"
peerDependencies:
"@types/react": "*"
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
peerDependenciesMeta:
"@types/react":
optional: true
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -25478,7 +25490,11 @@ __metadata:
react: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
use-sync-external-store: "npm:^1.6.0"
peerDependencies:
"@types/react": "*"
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
peerDependenciesMeta:
"@types/react":
optional: true
languageName: unknown
linkType: soft

Expand Down
Loading