Skip to content

Commit 7c86724

Browse files
pfultonpfulton
committed
chore: rebase against main and update components to use prerelease tokens
1 parent 2ab8e3a commit 7c86724

File tree

85 files changed

+87
-97
lines changed

Some content is hidden

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

85 files changed

+87
-97
lines changed

‎.storybook/foundations/down-state/button-down-state.stories.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@ export default {
1010
},
1111
parameters: {
1212
actions: {
13-
handles: ['click .spectrum-Button'],
14-
},
15-
status: {
16-
type: process.env.MIGRATED_PACKAGES.includes("button")
17-
? "migrated"
18-
: undefined,
13+
handles: ["click .spectrum-Button"],
1914
},
2015
},
21-
tags: ['foundation'],
16+
tags: ["foundation"],
2217
};
2318

2419
export const ButtonDownState = Template.bind({});

‎.storybook/foundations/down-state/checkbox-down-state.stories.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@ export default {
1010
},
1111
parameters: {
1212
actions: {
13-
handles: ['click input[type="checkbox"]'],
14-
},
15-
status: {
16-
type: process.env.MIGRATED_PACKAGES.includes("checkbox")
17-
? "migrated"
18-
: undefined,
13+
handles: ["click input[type=\"checkbox\"]"],
1914
},
2015
},
21-
tags: ['foundation'],
16+
tags: ["foundation"],
2217
};
2318

2419
export const CheckboxDownState = Template.bind({});

‎components/accordion/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/actionbar/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@spectrum-css/closebutton": ">=4",
2020
"@spectrum-css/fieldlabel": ">=7",
2121
"@spectrum-css/popover": ">=6",
22-
"@spectrum-css/tokens": ">=13"
22+
"@spectrum-css/tokens": "^14.0.0-next.3"
2323
},
2424
"publishConfig": {
2525
"access": "public"

‎components/actionbutton/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"peerDependenciesMeta": {
2222
"@spectrum-css/icon": {

‎components/actiongroup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/actionbutton": ">=5",
19-
"@spectrum-css/tokens": "14.0.0-next.0"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"peerDependenciesMeta": {
2222
"@spectrum-css/actionbutton": {

‎components/actionmenu/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@spectrum-css/icon": ">=4",
2020
"@spectrum-css/menu": ">=5",
2121
"@spectrum-css/popover": ">=6",
22-
"@spectrum-css/tokens": ">=13"
22+
"@spectrum-css/tokens": "^14.0.0-next.3"
2323
},
2424
"publishConfig": {
2525
"access": "public"

‎components/alertbanner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@spectrum-css/closebutton": ">=4",
2020
"@spectrum-css/divider": ">=2",
2121
"@spectrum-css/icon": ">=4",
22-
"@spectrum-css/tokens": ">=13"
22+
"@spectrum-css/tokens": "^14.0.0-next.3"
2323
},
2424
"peerDependenciesMeta": {
2525
"@spectrum-css/icon": {

‎components/alertdialog/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@spectrum-css/divider": ">=2",
2020
"@spectrum-css/icon": ">=4",
2121
"@spectrum-css/modal": ">=4",
22-
"@spectrum-css/tokens": ">=13",
22+
"@spectrum-css/tokens": "^14.0.0-next.3",
2323
"@spectrum-css/underlay": ">=3"
2424
},
2525
"peerDependenciesMeta": {

‎components/asset/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "dist/index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/assetcard/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/checkbox": ">=7",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"peerDependenciesMeta": {
2222
"@spectrum-css/checkbox": {

‎components/assetlist/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"peerDependencies": {
1818
"@spectrum-css/checkbox": ">=8",
1919
"@spectrum-css/icon": ">=4",
20-
"@spectrum-css/tokens": ">=13"
20+
"@spectrum-css/tokens": "^14.0.0-next.3"
2121
},
2222
"peerDependenciesMeta": {
2323
"@spectrum-css/checkbox": {

‎components/avatar/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "dist/index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/badge/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"peerDependenciesMeta": {
2222
"@spectrum-css/icon": {

‎components/breadcrumb/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"peerDependencies": {
1818
"@spectrum-css/actionbutton": ">=5",
1919
"@spectrum-css/icon": ">=4",
20-
"@spectrum-css/tokens": ">=13"
20+
"@spectrum-css/tokens": "^14.0.0-next.3"
2121
},
2222
"peerDependenciesMeta": {
2323
"@spectrum-css/actionbutton": {

‎components/button/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=6",
1919
"@spectrum-css/progresscircle": ">=2",
20-
"@spectrum-css/tokens": ">=13"
20+
"@spectrum-css/tokens": "^14.0.0-next.3"
2121
},
2222
"peerDependenciesMeta": {
2323
"@spectrum-css/icon": {

‎components/buttongroup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/button": ">=11",
19-
"@spectrum-css/tokens": "14.0.0-next.0"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/calendar/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/actionbutton": ">=5",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/card/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@spectrum-css/asset": ">=3",
2020
"@spectrum-css/icon": ">=4",
2121
"@spectrum-css/quickaction": ">=3",
22-
"@spectrum-css/tokens": ">=13",
22+
"@spectrum-css/tokens": "^14.0.0-next.3",
2323
"@spectrum-css/typography": ">=4 <=5"
2424
},
2525
"peerDependenciesMeta": {

‎components/checkbox/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/clearbutton/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/closebutton/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": "^14.0.0-next.0"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"devDependencies": {
2222
"@spectrum-css/commons": "^9.1.4-next.0"

‎components/coachindicator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "dist/index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/coachmark/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@spectrum-css/buttongroup": ">=6",
2222
"@spectrum-css/menu": ">=5",
2323
"@spectrum-css/popover": ">=6",
24-
"@spectrum-css/tokens": ">=13"
24+
"@spectrum-css/tokens": "^14.0.0-next.3"
2525
},
2626
"peerDependenciesMeta": {
2727
"@spectrum-css/button": {

‎components/colorarea/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/colorhandle": ">=7",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/colorhandle/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"peerDependencies": {
1818
"@spectrum-css/colorloupe": ">=4",
1919
"@spectrum-css/opacitycheckerboard": ">=1",
20-
"@spectrum-css/tokens": ">=13"
20+
"@spectrum-css/tokens": "^14.0.0-next.3"
2121
},
2222
"peerDependenciesMeta": {
2323
"@spectrum-css/colorloupe": {

‎components/colorloupe/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "dist/index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/colorslider/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"peerDependencies": {
1818
"@spectrum-css/colorhandle": ">=7",
1919
"@spectrum-css/opacitycheckerboard": ">=1",
20-
"@spectrum-css/tokens": ">=13"
20+
"@spectrum-css/tokens": "^14.0.0-next.3"
2121
},
2222
"publishConfig": {
2323
"access": "public"

‎components/colorwheel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@spectrum-css/colorarea": ">=4",
1919
"@spectrum-css/colorhandle": ">=7",
2020
"@spectrum-css/colorloupe": ">=4",
21-
"@spectrum-css/tokens": ">=13"
21+
"@spectrum-css/tokens": "^14.0.0-next.3"
2222
},
2323
"peerDependenciesMeta": {
2424
"@spectrum-css/colorarea": {

‎components/combobox/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@spectrum-css/popover": ">=6",
2121
"@spectrum-css/progresscircle": ">=2",
2222
"@spectrum-css/textfield": ">=6",
23-
"@spectrum-css/tokens": ">=13"
23+
"@spectrum-css/tokens": "^14.0.0-next.3"
2424
},
2525
"peerDependenciesMeta": {
2626
"@spectrum-css/progresscircle": {

‎components/commons/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/contextualhelp/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@spectrum-css/actionbutton": ">=5",
1919
"@spectrum-css/link": ">=4",
2020
"@spectrum-css/popover": ">=6",
21-
"@spectrum-css/tokens": ">=13"
21+
"@spectrum-css/tokens": "^14.0.0-next.3"
2222
},
2323
"peerDependenciesMeta": {
2424
"@spectrum-css/link": {

‎components/datepicker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@spectrum-css/pickerbutton": ">=4",
2020
"@spectrum-css/popover": ">=6",
2121
"@spectrum-css/textfield": ">=6",
22-
"@spectrum-css/tokens": ">=13"
22+
"@spectrum-css/tokens": "^14.0.0-next.3"
2323
},
2424
"publishConfig": {
2525
"access": "public"

‎components/dial/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "dist/index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/dialog/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@spectrum-css/closebutton": ">=4",
1919
"@spectrum-css/divider": ">=2",
2020
"@spectrum-css/modal": ">=4",
21-
"@spectrum-css/tokens": ">=13",
21+
"@spectrum-css/tokens": "^14.0.0-next.3",
2222
"@spectrum-css/underlay": ">=3"
2323
},
2424
"peerDependenciesMeta": {

‎components/divider/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"main": "dist/index.css",
1717
"peerDependencies": {
18-
"@spectrum-css/tokens": ">=13"
18+
"@spectrum-css/tokens": "^14.0.0-next.3"
1919
},
2020
"publishConfig": {
2121
"access": "public"

‎components/dropindicator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/dropzone/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@spectrum-css/actionbutton": ">=5",
1919
"@spectrum-css/illustratedmessage": ">=6",
2020
"@spectrum-css/link": ">=4",
21-
"@spectrum-css/tokens": ">=13"
21+
"@spectrum-css/tokens": "^14.0.0-next.3"
2222
},
2323
"peerDependenciesMeta": {
2424
"@spectrum-css/actionbutton": {

‎components/fieldgroup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@spectrum-css/checkbox": ">=8",
1919
"@spectrum-css/helptext": ">=4",
2020
"@spectrum-css/radio": ">=8",
21-
"@spectrum-css/tokens": ">=13"
21+
"@spectrum-css/tokens": "^14.0.0-next.3"
2222
},
2323
"peerDependenciesMeta": {
2424
"@spectrum-css/checkbox": {

‎components/fieldlabel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": "^14.0.0-next.0"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/floatingactionbutton/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"main": "dist/index.css",
1818
"peerDependencies": {
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

‎components/helptext/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "dist/index.css",
1717
"peerDependencies": {
1818
"@spectrum-css/icon": ">=4",
19-
"@spectrum-css/tokens": ">=13"
19+
"@spectrum-css/tokens": "^14.0.0-next.3"
2020
},
2121
"publishConfig": {
2222
"access": "public"

0 commit comments

Comments
 (0)