Skip to content

Commit 17f1b22

Browse files
bernhard-adobebernhard-adobe
committed
chore: merge branch 'main'
* main: (65 commits) chore(release): release chore!: use latest CSS tokens dependency refactor(swatch)!: remap core token aliases & rename aliases refactor(helptext)!: remap core token aliases & rename aliases refactor(radio)!: remap core token aliases & rename aliases refactor(checkbox)!: remap core token aliases & rename aliases refactor(switch)!: remap core token aliases & rename aliases refactor(actionbutton)!: remap core token aliases & rename aliases refactor(closebutton)!: remap core token aliases & rename aliases feat(tokens)!: use latest beta release chore(release): release refactor(inlinealert)!: migrate to core tokens (#1519) chore(release): release fix(checkbox): whcm focus states (#1527) chore(release): release feat(fieldlabel)!: migrate to core tokens (CSS-102) (#1476) chore(release): release feat(swatchgroup)!: migrate swatchgroup to core tokens (#1505) chore(release): release feat(swatch)!: migrate swatch to core tokens (#1501) ...
2 parents ac51843 + f2f1c19 commit 17f1b22

File tree

134 files changed

+6312
-4068
lines changed

Some content is hidden

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

134 files changed

+6312
-4068
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ npm-debug.log*
1616
/backstop_data/packageDependentMap.json
1717
.idea
1818
lerna-debug.log
19+
yarn-error.log

‎README.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,19 @@ The following tasks are available:
335335
336336
- `gulp build` - Performs a build of all components and the top level package
337337
- `gulp buildComponents` - Performs a build of all components
338-
- `gulp dev` - Performs a lite build (custom properties only), opens your browser with the documentation site, then starts watching components and website files
338+
- `gulp dev` - Performs a lite build (custom properties only), runs browsersync and serves the documentation on the default port (3000), then starts watching components and website files
339339
- `gulp clean` - Cleans all output files for the project and all components
340-
- `gulp watch` - Assuming a build has already been performed, immediately opens your browser with the documentation site, then starts watching components and website files
340+
- `gulp watch` - Assuming a build has already been performed, re-starts starts watching components and website files. Presumes a browser is already open to your locally served docs
341+
- `gulp watch-relaunch` - Restarts watch and opens a new browser for the docs URL
341342
- `gulp buildCombined` - Builds the combined output files (`dist/spectrum-*.css`)
342343
- `gulp buildStandalone` - Builds the standalone output files (`dist/standalone/spectrum-*.css`)
343344
- `gulp release` - Performs a release of the top-level package
344345
- `gulp packageLint` - Lint the `package.json` file for each component in the monorepo
345346
- `gulp readmeLint` - Generate a generic `README.md` file for each component in the monorepo
346347
348+
Note: `yarn run dev` will run `gulp dev` above but trigger browsersync to open the documentation URL. You can set `BROWSERSYNC_OPEN=true` to change dev and watch to always open the URL.
349+
350+
You can set a new port for `watch` by setting `BROWSERSYNC_PORT=<port number>`, e.g. `export BROWSERSYNC_PORT=9000; gulp watch` to set the port to `9000`.
347351
348352
349353
## Testing
@@ -414,6 +418,16 @@ To publish prerelease versions:
414418
415419
* First, be sure that you're working on a branch other than `main`.
416420
* Once your change(s) are ready to be committed, be aware of the severity of the change(s), and be sure to author your commit message so that Lerna understands how to increase the version number(s) of the affected components.
417-
* Once your changes are committed, run the following command to bump the version numbers (a `beta` release is shown in this example): `npx lerna publish --conventional-prerelease --preid beta --pre-dist-tag beta`
418-
* Depending on the severity of your change(s), Lerna should show a preview of your version numbers that look something like: `@spectrum-css/tag: 3.3.8 => 3.3.9-beta.0`
419-
* If the version number(s) look correct, you should be ready to publish to npm by running: `npm publish`
421+
* Once your changes are committed, you **must** build the affected package(s) locally **before** publishing them to npm. An npm task for cleaning, building, and beta publishing is available, and it can be run via the following command: `yarn run release:beta-from-package`. This command will perform a full `clean` (via the `clean` task), a full `build` (via the `build` task), and will attempt to bump the version numbers in the affected package(s) (via `npx lerna publish --conventional-prerelease --preid beta --pre-dist-tag beta`).
422+
* Depending on the severity of your change(s), and before publishing to npm, Lerna should show a preview of the affected package version numbers that look something like: `@spectrum-css/tag: 3.3.8 => 3.3.9-beta.0`. Additionally, at this time, Lerna will ask if you would like to continue with publishing the changes or cancel.
423+
* Selecting `y` to publish will publish the affected package(s) to npm.
424+
425+
### Manual prerelease versioning & publishing:
426+
Occasionally, you may want to run a prerelease for an individual package and skip a version bump for consuming packages. It's possible to manually change a package's version number to achieve this.
427+
* For the package that you want to prerelease, manually alter the version number in the package's `package.json` file.
428+
* For example, let's say you'd like to release a `beta` version of the Switch component. In the Switch's `package.json`, manually change the `version` number from its current number (`"version": "1.0.23"`) to the next appropriate semver version number (`"version": "2.0.0-beta.0"`).
429+
* Save your changes, and commit them with the appropriate conventional commit-style commit message: `chore(switch): manual version bump for beta release` or something similar.
430+
* You **must** run a build **before** continuing with the prerelease. An npm task for cleaning, building, and beta publishing is available, and it can be run via the following command: `yarn run release:beta-from-package`. This command will perform a full `clean` (via the `clean` task), a full `build` (via the `build` task), and will attempt to publish the package (via `npx lerna publish --conventional-prerelease --preid beta --pre-dist-tag beta`).
431+
* Depending on the severity of your change(s), and before publishing to npm, Lerna should show a preview of the affected package version number that looks something like: `@spectrum-css/switch: 1.0.23 => 2.0.0-beta.0`. Additionally, at this time, Lerna will ask if you would like to continue with publishing the changes or cancel.
432+
* Selecting `y` to publish will publish the affected package(s) to npm.
433+

‎components/actionbutton/CHANGELOG.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,97 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="3.0.0"></a>
7+
# 3.0.0
8+
🗓 2022-10-13 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.8...@spectrum-css/actionbutton@3.0.0)
9+
10+
* refactor(actionbutton)!: remap core token aliases & rename aliases ([5966f9b](https://github.com/adobe/spectrum-css/commit/5966f9b))
11+
12+
13+
### 🛑 BREAKING CHANGES
14+
15+
* remaps existing aliases to new/renamed core token values
16+
17+
* `--spectrum-focus-ring-thickness` renamed to `--spectrum-focus-indicator-thickness`
18+
* `--spectrum-focus-ring-gap` renamed to `--spectrum-focus-indicator-gap`
19+
* `--spectrum-focus-ring-color` renamed to `--spectrum-focus-indicator-color`
20+
* `--spectrum-static-white-focus-ring-color` renamed to `--spectrum-static-white-focus-indicator-color`
21+
* `--spectrum-static-black-focus-ring-color` renamed to `--spectrum-static-black-focus-indicator-color`
22+
23+
24+
25+
26+
27+
<a name="2.1.8"></a>
28+
## 2.1.8
29+
🗓 2022-09-16 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.7...@spectrum-css/actionbutton@2.1.8)
30+
31+
**Note:** Version bump only for package @spectrum-css/actionbutton
32+
33+
34+
35+
36+
37+
<a name="2.1.7"></a>
38+
## 2.1.7
39+
🗓 2022-09-13 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.6...@spectrum-css/actionbutton@2.1.7)
40+
41+
**Note:** Version bump only for package @spectrum-css/actionbutton
42+
43+
44+
45+
46+
47+
<a name="2.1.6"></a>
48+
## 2.1.6
49+
🗓 2022-09-13 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.5...@spectrum-css/actionbutton@2.1.6)
50+
51+
**Note:** Version bump only for package @spectrum-css/actionbutton
52+
53+
54+
55+
56+
57+
<a name="2.1.5"></a>
58+
## 2.1.5
59+
🗓 2022-09-12 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.4...@spectrum-css/actionbutton@2.1.5)
60+
61+
**Note:** Version bump only for package @spectrum-css/actionbutton
62+
63+
64+
65+
66+
67+
<a name="2.1.4"></a>
68+
## 2.1.4
69+
🗓 2022-08-26 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.3...@spectrum-css/actionbutton@2.1.4)
70+
71+
**Note:** Version bump only for package @spectrum-css/actionbutton
72+
73+
74+
75+
76+
77+
<a name="2.1.3"></a>
78+
## 2.1.3
79+
🗓 2022-08-17 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.2...@spectrum-css/actionbutton@2.1.3)
80+
81+
**Note:** Version bump only for package @spectrum-css/actionbutton
82+
83+
84+
85+
86+
87+
<a name="2.1.2"></a>
88+
## 2.1.2
89+
🗓 2022-08-16 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.1...@spectrum-css/actionbutton@2.1.2)
90+
91+
**Note:** Version bump only for package @spectrum-css/actionbutton
92+
93+
94+
95+
96+
697
<a name="2.1.1"></a>
798
## 2.1.1
899
🗓 2022-08-02 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbutton@2.1.0...@spectrum-css/actionbutton@2.1.1)

‎components/actionbutton/index.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ governing permissions and limitations under the License.
1717
--spectrum-actionbutton-border-radius: var(--spectrum-corner-radius-100);
1818
--spectrum-actionbutton-border-width: var(--spectrum-border-width-100);
1919

20-
--spectrum-actionbutton-focus-ring-gap: var(--spectrum-focus-ring-gap);
21-
--spectrum-actionbutton-focus-ring-thickness: var(--spectrum-focus-ring-thickness);
22-
--spectrum-actionbutton-focus-ring-color: var(--spectrum-focus-ring-color);
23-
--spectrum-actionbutton-focus-ring-border-radius: calc(var(--spectrum-actionbutton-border-radius) + var(--spectrum-actionbutton-focus-ring-gap));
20+
--spectrum-actionbutton-focus-indicator-gap: var(--spectrum-focus-indicator-gap);
21+
--spectrum-actionbutton-focus-indicator-thickness: var(--spectrum-focus-indicator-thickness);
22+
--spectrum-actionbutton-focus-indicator-color: var(--spectrum-focus-indicator-color);
23+
--spectrum-actionbutton-focus-indicator-border-radius: calc(var(--spectrum-actionbutton-border-radius) + var(--spectrum-actionbutton-focus-indicator-gap));
2424
}
2525

2626
.spectrum-ActionButton--sizeXS {
@@ -96,7 +96,7 @@ governing permissions and limitations under the License.
9696
}
9797

9898
/* force a more visible focus-ring color */
99-
--highcontrast-actionbutton-focus-ring-color: ButtonText;
99+
--highcontrast-actionbutton-focus-indicator-color: ButtonText;
100100

101101
&.is-selected {
102102
--highcontrast-actionbutton-background-color-default: Highlight;
@@ -234,9 +234,9 @@ a.spectrum-ActionButton {
234234
position: absolute;
235235
inset: 0;
236236

237-
margin: calc((var(--mod-actionbutton-focus-ring-gap, var(--spectrum-actionbutton-focus-ring-gap)) + var(--mod-actionbutton-border-width, var(--spectrum-actionbutton-border-width))) * -1);
237+
margin: calc((var(--mod-actionbutton-focus-indicator-gap, var(--spectrum-actionbutton-focus-indicator-gap)) + var(--mod-actionbutton-border-width, var(--spectrum-actionbutton-border-width))) * -1);
238238

239-
border-radius: var(--mod-actionbutton-focus-ring-border-radius, var(--spectrum-actionbutton-focus-ring-border-radius));
239+
border-radius: var(--mod-actionbutton-focus-indicator-border-radius, var(--spectrum-actionbutton-focus-indicator-border-radius));
240240

241241
transition: box-shadow var(--mod-actionbutton-animation-duration, var(--spectrum-actionbutton-animation-duration)) ease-in-out;
242242

@@ -249,7 +249,7 @@ a.spectrum-ActionButton {
249249
box-shadow: none;
250250

251251
&:after {
252-
box-shadow: 0 0 0 var(--mod-actionbutton-focus-ring-thickness, var(--spectrum-actionbutton-focus-ring-thickness)) var(--highcontrast-actionbutton-focus-ring-color, var(--mod-actionbutton-focus-ring-color, var(--spectrum-actionbutton-focus-ring-color)));
252+
box-shadow: 0 0 0 var(--mod-actionbutton-focus-indicator-thickness, var(--spectrum-actionbutton-focus-indicator-thickness)) var(--highcontrast-actionbutton-focus-indicator-color, var(--mod-actionbutton-focus-indicator-color, var(--spectrum-actionbutton-focus-indicator-color)));
253253
}
254254
}
255255
}

‎components/actionbutton/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/actionbutton",
3-
"version": "2.1.1",
3+
"version": "3.0.0",
44
"description": "The Spectrum CSS action button component",
55
"license": "Apache-2.0",
66
"main": "dist/index-vars.css",
@@ -17,12 +17,12 @@
1717
},
1818
"peerDependencies": {
1919
"@spectrum-css/icon": "^3.0.22",
20-
"@spectrum-css/tokens": "^1.0.1"
20+
"@spectrum-css/tokens": "^4.0.0"
2121
},
2222
"devDependencies": {
23-
"@spectrum-css/component-builder-simple": "^1.0.0",
23+
"@spectrum-css/component-builder-simple": "^2.0.0",
2424
"@spectrum-css/icon": "^3.0.23",
25-
"@spectrum-css/tokens": "^1.0.4",
25+
"@spectrum-css/tokens": "^4.0.0",
2626
"gulp": "^4.0.0"
2727
},
2828
"publishConfig": {

‎components/actionbutton/themes/spectrum.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ governing permissions and limitations under the License.
101101
--spectrum-actionbutton-content-color-down: var(--spectrum-black);
102102
--spectrum-actionbutton-content-color-focus: var(--spectrum-black);
103103

104-
--spectrum-actionbutton-focus-ring-color: var(--spectrum-static-black-focus-ring-color);
104+
--spectrum-actionbutton-focus-indicator-color: var(--spectrum-static-black-focus-indicator-color);
105105

106106
--spectrum-actionbutton-background-color-disabled: transparent;
107107
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-static-black-border-color);
@@ -140,7 +140,7 @@ governing permissions and limitations under the License.
140140
--spectrum-actionbutton-content-color-down: var(--spectrum-white);
141141
--spectrum-actionbutton-content-color-focus: var(--spectrum-white);
142142

143-
--spectrum-actionbutton-focus-ring-color: var(--spectrum-static-white-focus-ring-color);
143+
--spectrum-actionbutton-focus-indicator-color: var(--spectrum-static-white-focus-indicator-color);
144144

145145
--spectrum-actionbutton-background-color-disabled: transparent;
146146
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-static-white-border-color);

‎components/actiongroup/CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="3.0.1"></a>
7+
## 3.0.1
8+
🗓 2022-10-13 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actiongroup@3.0.0...@spectrum-css/actiongroup@3.0.1)
9+
10+
**Note:** Version bump only for package @spectrum-css/actiongroup
11+
12+
13+
14+
15+
16+
<a name="3.0.0"></a>
17+
# 3.0.0
18+
🗓 2022-09-22 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actiongroup@2.0.0...@spectrum-css/actiongroup@3.0.0)
19+
20+
* feat(actiongroup)!: migrate to core tokens (#1492) ([be1d629](https://github.com/adobe/spectrum-css/commit/be1d629)), closes [#1492](https://github.com/adobe/spectrum-css/issues/1492)
21+
22+
23+
### 🛑 BREAKING CHANGES
24+
25+
* migrates the ActionGroup to core tokens
26+
27+
* feat: migrates the component to core tokens
28+
* feat: adds t-shirt sizes & requires the addition of a `.spectrum-ActionGroup--size*` class.
29+
30+
31+
32+
33+
634
<a name="2.0.0"></a>
735
# 2.0.0
836
🗓 2022-06-16 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actiongroup@1.0.26...@spectrum-css/actiongroup@2.0.0)

‎components/actiongroup/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('@spectrum-css/component-builder');
1+
module.exports = require('@spectrum-css/component-builder-simple');

0 commit comments

Comments
 (0)