Skip to content

Commit 692d76f

Browse files
pfultonaramos-adobe
pfulton
authored and
aramos-adobe
committed
chore: rebase against main and update components to use prerelease tokens
1 parent fe7b218 commit 692d76f

File tree

21 files changed

+136
-38
lines changed

21 files changed

+136
-38
lines changed

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
21
import { Template } from "@spectrum-css/button/stories/template.js";
32

43
export default {
54
title: "Down state",
6-
=======
7-
import { Template } from "../../../components/button/stories/template";
8-
9-
export default {
10-
title: "Foundations/Down state",
11-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
125
description:
136
"Buttons allow users to perform an action or to navigate to another page. They have multiple styles for various needs, and are ideal for calling attention to where a user needs to do something in order to move forward in a flow.",
147
component: "Button",
@@ -17,22 +10,11 @@ export default {
1710
},
1811
parameters: {
1912
actions: {
20-
<<<<<<< HEAD
13+
2114
handles: ["click .spectrum-Button"],
2215
},
2316
},
2417
tags: ["!dev"],
25-
=======
26-
handles: ['click .spectrum-Button'],
27-
},
28-
status: {
29-
type: process.env.MIGRATED_PACKAGES.includes("button")
30-
? "migrated"
31-
: undefined,
32-
},
33-
},
34-
tags: ['foundation'],
35-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
3618
};
3719

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

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
21
import { Template } from "@spectrum-css/checkbox/stories/template.js";
32

43
export default {
54
title: "Down state",
6-
=======
7-
import { Template } from "../../../components/checkbox/stories/template";
8-
9-
export default {
10-
title: "Foundations/Down state",
11-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
125
description:
136
"Checkboxes allow users to select multiple items from a list of individual items, or mark one individual item as selected.",
147
component: "Checkbox",
@@ -17,22 +10,11 @@ export default {
1710
},
1811
parameters: {
1912
actions: {
20-
<<<<<<< HEAD
13+
2114
handles: ["click input[type=\"checkbox\"]"],
2215
},
2316
},
2417
tags: ["!dev"],
25-
=======
26-
handles: ['click input[type="checkbox"]'],
27-
},
28-
status: {
29-
type: process.env.MIGRATED_PACKAGES.includes("checkbox")
30-
? "migrated"
31-
: undefined,
32-
},
33-
},
34-
tags: ['foundation'],
35-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
3618
};
3719

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

‎components/button/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@
4040
"metadata/*"
4141
],
4242
"peerDependencies": {
43+
<<<<<<< HEAD
4344
"@spectrum-css/icon": ">=8.0.0-s2-foundations.0",
4445
"@spectrum-css/progresscircle": ">=4.0.0-s2-foundations.0",
46+
=======
47+
"@spectrum-css/icon": ">=7",
48+
"@spectrum-css/progresscircle": ">=3",
49+
>>>>>>> 9ff7c7bd7 (chore: rebase against main and update components to use prerelease tokens)
4550
"@spectrum-css/tokens": ">=14.0.0-next.3"
4651
},
4752
"peerDependenciesMeta": {

‎components/calendar/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/actionbutton": ">=6",
50+
"@spectrum-css/tokens": ">=14.0.0-next.3"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/checkbox/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/icon": ">=7",
50+
"@spectrum-css/tokens": ">=14.0.0-next.3"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/clearbutton/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/icon": ">=7",
50+
"@spectrum-css/tokens": ">=14.0.0-next.3"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/coachindicator/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/colorarea/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/colorhandle": ">=8",
50+
"@spectrum-css/tokens": ">=14.0.0-next.3"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/colorloupe/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/colorslider/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
"design system",
4848
"adobe"
4949
],
50+
"peerDependencies": {
51+
"@spectrum-css/colorhandle": ">=8",
52+
"@spectrum-css/opacitycheckerboard": ">=2",
53+
"@spectrum-css/tokens": ">=14.0.0-next.3"
54+
},
5055
"publishConfig": {
5156
"access": "public"
5257
},

‎components/dial/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/divider/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/dropindicator/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/icon": ">=7",
50+
"@spectrum-css/tokens": ">=14.0.0-next.3"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/floatingactionbutton/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
"design system",
4545
"adobe"
4646
],
47+
"peerDependencies": {
48+
"@spectrum-css/tokens": ">=14.0.0-next.3"
49+
},
4750
"publishConfig": {
4851
"access": "public"
4952
},

‎components/helptext/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/icon": ">=7",
50+
"@spectrum-css/tokens": ">=14.0.0-next.3"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/illustratedmessage/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
"design system",
4646
"adobe"
4747
],
48+
"peerDependencies": {
49+
"@spectrum-css/tokens": ">=14.0.0-next.3",
50+
"@spectrum-css/typography": ">=6"
51+
},
4852
"publishConfig": {
4953
"access": "public"
5054
},

‎components/link/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/opacitycheckerboard/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/page/package.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "@spectrum-css/page",
3+
"version": "8.1.0",
4+
"description": "The Spectrum CSS page component",
5+
"license": "Apache-2.0",
6+
"author": "Adobe",
7+
"homepage": "https://opensource.adobe.com/spectrum-css/page",
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/adobe/spectrum-css.git",
11+
"directory": "components/page"
12+
},
13+
"bugs": {
14+
"url": "https://github.com/adobe/spectrum-css/issues"
15+
},
16+
"main": "dist/index.css",
17+
"files": [
18+
"dist/*",
19+
"CHANGELOG.md",
20+
"package.json",
21+
"stories/template.js",
22+
"metadata/mods.md"
23+
],
24+
"keywords": [
25+
"spectrum",
26+
"css",
27+
"design system",
28+
"adobe"
29+
],
30+
"peerDependencies": {
31+
"@spectrum-css/tokens": ">=14.0.0-next.3"
32+
},
33+
"publishConfig": {
34+
"access": "public"
35+
}
36+
}

‎components/progresscircle/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"design system",
4444
"adobe"
4545
],
46+
"peerDependencies": {
47+
"@spectrum-css/tokens": ">=14.0.0-next.3"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
},

‎components/site/package.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "@spectrum-css/site",
3+
"version": "5.1.0",
4+
"description": "The Spectrum CSS Site component",
5+
"license": "Apache-2.0",
6+
"author": "Adobe",
7+
"homepage": "https://opensource.adobe.com/spectrum-css/",
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/adobe/spectrum-css.git",
11+
"directory": "components/site"
12+
},
13+
"bugs": {
14+
"url": "https://github.com/adobe/spectrum-css/issues"
15+
},
16+
"main": "dist/index.css",
17+
"files": [
18+
"dist/*",
19+
"CHANGELOG.md",
20+
"package.json",
21+
"stories/template.js",
22+
"metadata/mods.md"
23+
],
24+
"keywords": [
25+
"spectrum",
26+
"css",
27+
"design system",
28+
"adobe"
29+
],
30+
"peerDependencies": {
31+
"@spectrum-css/tokens": ">=14.0.0-next.3"
32+
},
33+
"publishConfig": {
34+
"access": "public"
35+
}
36+
}

0 commit comments

Comments
 (0)