Skip to content

Commit c7ca097

Browse files
snowystingersnowystinger
committed
Merge branch 'fix-some-peers' into yarn-upgrade
# Conflicts: # packages/@react-spectrum/accordion/package.json # packages/@react-spectrum/actionbar/package.json # packages/@react-spectrum/actiongroup/package.json # packages/@react-spectrum/autocomplete/package.json # packages/@react-spectrum/avatar/package.json # packages/@react-spectrum/badge/package.json # packages/@react-spectrum/breadcrumbs/package.json # packages/@react-spectrum/button/package.json # packages/@react-spectrum/buttongroup/package.json # packages/@react-spectrum/calendar/package.json # packages/@react-spectrum/card/package.json # packages/@react-spectrum/checkbox/package.json # packages/@react-spectrum/color/package.json # packages/@react-spectrum/combobox/package.json # packages/@react-spectrum/datepicker/package.json # packages/@react-spectrum/dialog/package.json # packages/@react-spectrum/divider/package.json # packages/@react-spectrum/dnd/package.json # packages/@react-spectrum/dropzone/package.json # packages/@react-spectrum/filetrigger/package.json # packages/@react-spectrum/form/package.json # packages/@react-spectrum/icon/package.json # packages/@react-spectrum/illustratedmessage/package.json # packages/@react-spectrum/image/package.json # packages/@react-spectrum/inlinealert/package.json # packages/@react-spectrum/label/package.json # packages/@react-spectrum/labeledvalue/package.json # packages/@react-spectrum/layout/package.json # packages/@react-spectrum/link/package.json # packages/@react-spectrum/list/package.json # packages/@react-spectrum/listbox/package.json # packages/@react-spectrum/menu/package.json # packages/@react-spectrum/meter/package.json # packages/@react-spectrum/numberfield/package.json # packages/@react-spectrum/overlays/package.json # packages/@react-spectrum/picker/package.json # packages/@react-spectrum/progress/package.json # packages/@react-spectrum/provider/package.json # packages/@react-spectrum/radio/package.json # packages/@react-spectrum/searchfield/package.json # packages/@react-spectrum/slider/package.json # packages/@react-spectrum/statuslight/package.json # packages/@react-spectrum/steplist/package.json # packages/@react-spectrum/story-utils/package.json # packages/@react-spectrum/switch/package.json # packages/@react-spectrum/table/package.json # packages/@react-spectrum/tabs/package.json # packages/@react-spectrum/tag/package.json # packages/@react-spectrum/test-utils/package.json # packages/@react-spectrum/text/package.json # packages/@react-spectrum/textfield/package.json # packages/@react-spectrum/theme-dark/package.json # packages/@react-spectrum/theme-default/package.json # packages/@react-spectrum/theme-express/package.json # packages/@react-spectrum/theme-light/package.json # packages/@react-spectrum/toast/package.json # packages/@react-spectrum/tooltip/package.json # packages/@react-spectrum/tree/package.json # packages/@react-spectrum/view/package.json # packages/@react-spectrum/well/package.json # packages/dev/test-utils/package.json # yarn.lock
2 parents d176995 + dcaf5f4 commit c7ca097

File tree

65 files changed

+217
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+217
-358
lines changed

‎packages/@react-spectrum/accordion/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,15 @@
3737
"@adobe/react-spectrum": "^3.46.2",
3838
"@swc/helpers": "^0.5.0"
3939
},
40-
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
42-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
43-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
44-
},
4540
"peerDependencies": {
4641
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4742
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4843
},
4944
"publishConfig": {
5045
"access": "public"
46+
},
47+
"devDependencies": {
48+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
49+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5150
}
5251
}

‎packages/@react-spectrum/actionbar/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
43-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
44-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
45-
},
4641
"peerDependencies": {
4742
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4843
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4944
},
5045
"publishConfig": {
5146
"access": "public"
47+
},
48+
"devDependencies": {
49+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
50+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5251
}
5352
}

‎packages/@react-spectrum/actiongroup/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
43-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
44-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
45-
},
4641
"peerDependencies": {
4742
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4843
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4944
},
5045
"publishConfig": {
5146
"access": "public"
47+
},
48+
"devDependencies": {
49+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
50+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5251
}
5352
}

‎packages/@react-spectrum/autocomplete/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
43-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
44-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
45-
},
4641
"peerDependencies": {
4742
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4843
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4944
},
5045
"publishConfig": {
5146
"access": "public"
47+
},
48+
"devDependencies": {
49+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
50+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5251
}
5352
}

‎packages/@react-spectrum/avatar/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,15 @@
3737
"@adobe/react-spectrum": "^3.46.2",
3838
"@swc/helpers": "^0.5.0"
3939
},
40-
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
42-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
43-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
44-
},
4540
"peerDependencies": {
4641
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4742
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4843
},
4944
"publishConfig": {
5045
"access": "public"
46+
},
47+
"devDependencies": {
48+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
49+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5150
}
5251
}

‎packages/@react-spectrum/badge/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,15 @@
3737
"@adobe/react-spectrum": "^3.46.2",
3838
"@swc/helpers": "^0.5.0"
3939
},
40-
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
42-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
43-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
44-
},
4540
"peerDependencies": {
4641
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4742
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4843
},
4944
"publishConfig": {
5045
"access": "public"
46+
},
47+
"devDependencies": {
48+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
49+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5150
}
5251
}

‎packages/@react-spectrum/breadcrumbs/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
43-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
44-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
45-
},
4641
"peerDependencies": {
4742
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4843
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4944
},
5045
"publishConfig": {
5146
"access": "public"
47+
},
48+
"devDependencies": {
49+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
50+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5251
}
5352
}

‎packages/@react-spectrum/button/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"@swc/helpers": "^0.5.0"
3939
},
4040
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
4241
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4342
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4443
},

‎packages/@react-spectrum/buttongroup/package.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@
3737
"@adobe/react-spectrum": "^3.46.2",
3838
"@swc/helpers": "^0.5.0"
3939
},
40-
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
42-
"@spectrum-icons/workflow": "^4.0.0",
43-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
44-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
45-
},
4640
"peerDependencies": {
4741
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4842
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4943
},
5044
"publishConfig": {
5145
"access": "public"
46+
},
47+
"devDependencies": {
48+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
49+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5250
}
5351
}

‎packages/@react-spectrum/calendar/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,15 @@
3737
"@adobe/react-spectrum": "^3.46.2",
3838
"@swc/helpers": "^0.5.0"
3939
},
40-
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
42-
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
43-
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
44-
},
4540
"peerDependencies": {
4641
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4742
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
4843
},
4944
"publishConfig": {
5045
"access": "public"
46+
},
47+
"devDependencies": {
48+
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
49+
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
5150
}
5251
}

0 commit comments

Comments
 (0)