Skip to content

Commit 0d547ff

Browse files
aramos-adobearamos-adobe
committed
chore(progresscircle): merging spectrum-two
2 parents 8dd9bb7 + f020018 commit 0d547ff

File tree

466 files changed

+19595
-15612
lines changed

Some content is hidden

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

466 files changed

+19595
-15612
lines changed

‎.changeset/pre.json

Lines changed: 102 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -2,102 +2,106 @@
22
"mode": "pre",
33
"tag": "next",
44
"initialVersions": {
5-
"@spectrum-tools/gh-action-file-diff": "2.0.5",
6-
"@spectrum-css/preview": "8.1.0-next.1",
7-
"@spectrum-css/accordion": "4.2.7-next.2",
8-
"@spectrum-css/actionbar": "7.2.5-next.2",
9-
"@spectrum-css/actionbutton": "5.2.7-next.2",
10-
"@spectrum-css/actiongroup": "5.0.0-next.3",
11-
"@spectrum-css/actionmenu": "5.1.4-next.2",
12-
"@spectrum-css/alertbanner": "1.1.42-next.2",
13-
"@spectrum-css/alertdialog": "1.2.5-next.2",
14-
"@spectrum-css/asset": "4.0.1-next.2",
15-
"@spectrum-css/assetcard": "3.1.5-next.2",
16-
"@spectrum-css/assetlist": "5.2.5-next.2",
17-
"@spectrum-css/avatar": "6.1.6-next.2",
18-
"@spectrum-css/badge": "3.2.6-next.2",
19-
"@spectrum-css/breadcrumb": "8.2.6-next.2",
20-
"@spectrum-css/button": "14.0.0-next.4",
21-
"@spectrum-css/buttongroup": "7.0.0-next.3",
22-
"@spectrum-css/calendar": "4.2.6-next.2",
23-
"@spectrum-css/card": "7.0.3-next.2",
24-
"@spectrum-css/checkbox": "14.0.0-next.4",
25-
"@spectrum-css/clearbutton": "5.1.5-next.2",
26-
"@spectrum-css/closebutton": "5.0.0-next.2",
27-
"@spectrum-css/coachindicator": "1.1.6-next.2",
28-
"@spectrum-css/coachmark": "6.1.6-next.2",
29-
"@spectrum-css/colorarea": "4.1.6-next.2",
30-
"@spectrum-css/colorhandle": "7.1.5-next.2",
31-
"@spectrum-css/colorloupe": "4.2.5-next.2",
32-
"@spectrum-css/colorslider": "5.1.6-next.2",
33-
"@spectrum-css/colorwheel": "3.1.6-next.2",
34-
"@spectrum-css/combobox": "2.1.7-next.2",
35-
"@spectrum-css/commons": "9.1.4-next.1",
36-
"@spectrum-css/contextualhelp": "2.1.6-next.2",
37-
"@spectrum-css/datepicker": "2.1.5-next.2",
38-
"@spectrum-css/dial": "2.2.5-next.2",
39-
"@spectrum-css/dialog": "9.2.5-next.2",
40-
"@spectrum-css/divider": "2.2.6-next.2",
41-
"@spectrum-css/dropindicator": "4.1.5-next.2",
42-
"@spectrum-css/dropzone": "5.2.6-next.2",
43-
"@spectrum-css/fieldgroup": "4.2.5-next.2",
44-
"@spectrum-css/fieldlabel": "8.0.0-next.2",
45-
"@spectrum-css/floatingactionbutton": "1.2.6-next.2",
46-
"@spectrum-css/helptext": "4.1.6-next.2",
47-
"@spectrum-css/icon": "6.0.6-next.2",
48-
"@spectrum-css/illustratedmessage": "6.1.6-next.2",
49-
"@spectrum-css/infieldbutton": "4.2.5-next.2",
50-
"@spectrum-css/inlinealert": "7.1.7-next.2",
51-
"@spectrum-css/link": "4.2.6-next.2",
52-
"@spectrum-css/logicbutton": "3.3.5-next.2",
53-
"@spectrum-css/menu": "6.1.6-next.2",
54-
"@spectrum-css/miller": "5.1.5-next.2",
55-
"@spectrum-css/modal": "4.2.7-next.2",
56-
"@spectrum-css/opacitycheckerboard": "1.1.6-next.2",
57-
"@spectrum-css/page": "7.1.5-next.2",
58-
"@spectrum-css/pagination": "7.1.7-next.2",
59-
"@spectrum-css/picker": "7.2.8-next.2",
60-
"@spectrum-css/pickerbutton": "4.1.6-next.2",
61-
"@spectrum-css/popover": "6.2.6-next.2",
62-
"@spectrum-css/progressbar": "3.1.6-next.2",
63-
"@spectrum-css/progresscircle": "2.2.4-next.2",
64-
"@spectrum-css/radio": "8.1.6-next.2",
65-
"@spectrum-css/rating": "4.2.5-next.2",
66-
"@spectrum-css/search": "6.2.5-next.2",
67-
"@spectrum-css/sidenav": "4.2.5-next.2",
68-
"@spectrum-css/site": "4.2.5-next.2",
69-
"@spectrum-css/slider": "4.3.6-next.2",
70-
"@spectrum-css/splitview": "4.2.5-next.2",
71-
"@spectrum-css/statuslight": "6.1.7-next.2",
72-
"@spectrum-css/steplist": "4.1.5-next.2",
73-
"@spectrum-css/stepper": "5.1.6-next.2",
74-
"@spectrum-css/swatch": "5.1.6-next.2",
75-
"@spectrum-css/swatchgroup": "2.1.6-next.2",
76-
"@spectrum-css/switch": "4.2.6-next.2",
77-
"@spectrum-css/table": "5.2.6-next.2",
78-
"@spectrum-css/tabs": "4.1.5-next.2",
79-
"@spectrum-css/tag": "8.1.6-next.2",
80-
"@spectrum-css/taggroup": "4.1.6-next.2",
81-
"@spectrum-css/textfield": "6.1.7-next.2",
82-
"@spectrum-css/thumbnail": "5.2.5-next.2",
83-
"@spectrum-css/toast": "9.1.26-next.2",
84-
"@spectrum-css/tooltip": "5.3.6-next.2",
85-
"@spectrum-css/tray": "2.2.8-next.2",
86-
"@spectrum-css/treeview": "9.2.7-next.2",
87-
"@spectrum-css/typography": "5.1.6-next.2",
88-
"@spectrum-css/underlay": "3.2.5-next.2",
89-
"@spectrum-css/well": "4.1.5-next.2",
90-
"@spectrum-css/generator": "3.0.0",
91-
"conventional-changelog-spectrum": "1.0.2",
92-
"@spectrum-tools/stylelint-no-missing-var": "1.3.1",
93-
"@spectrum-tools/stylelint-no-unknown-custom-properties": "1.3.2",
94-
"@spectrum-tools/stylelint-no-unused-custom-properties": "1.3.1",
95-
"@spectrum-tools/documentation": "1.0.0",
96-
"@spectrum-css/tokens": "14.0.0-next.6",
97-
"@spectrum-css/ui-icons": "1.1.2",
98-
"@spectrum-tools/postcss-rgb-mapping": "3.0.0-s2-foundations.0"
5+
"@spectrum-tools/gh-action-file-diff": "2.1.0",
6+
"@spectrum-css/preview": "11.0.0",
7+
"@spectrum-css/accordion": "5.3.0",
8+
"@spectrum-css/actionbar": "8.2.0",
9+
"@spectrum-css/actionbutton": "6.2.0",
10+
"@spectrum-css/actiongroup": "5.2.0",
11+
"@spectrum-css/actionmenu": "6.2.0",
12+
"@spectrum-css/alertbanner": "2.3.0",
13+
"@spectrum-css/alertdialog": "2.2.0",
14+
"@spectrum-css/asset": "5.2.0",
15+
"@spectrum-css/assetcard": "4.2.0",
16+
"@spectrum-css/assetlist": "6.4.0",
17+
"@spectrum-css/avatar": "7.3.0",
18+
"@spectrum-css/badge": "4.3.0",
19+
"@spectrum-css/breadcrumb": "9.2.0",
20+
"@spectrum-css/button": "13.5.0",
21+
"@spectrum-css/buttongroup": "7.2.0",
22+
"@spectrum-css/calendar": "5.3.0",
23+
"@spectrum-css/card": "9.3.0",
24+
"@spectrum-css/checkbox": "9.2.1",
25+
"@spectrum-css/clearbutton": "6.4.0",
26+
"@spectrum-css/closebutton": "5.3.0",
27+
"@spectrum-css/coachindicator": "2.2.0",
28+
"@spectrum-css/coachmark": "7.3.0",
29+
"@spectrum-css/colorarea": "5.2.0",
30+
"@spectrum-css/colorhandle": "8.2.0",
31+
"@spectrum-css/colorloupe": "5.3.0",
32+
"@spectrum-css/colorslider": "6.2.0",
33+
"@spectrum-css/colorwheel": "4.2.0",
34+
"@spectrum-css/combobox": "3.3.0",
35+
"@spectrum-css/commons": "10.1.0",
36+
"@spectrum-css/contextualhelp": "3.3.0",
37+
"@spectrum-css/datepicker": "3.3.0",
38+
"@spectrum-css/dial": "3.2.0",
39+
"@spectrum-css/dialog": "10.2.0",
40+
"@spectrum-css/divider": "3.2.0",
41+
"@spectrum-css/dropindicator": "5.2.0",
42+
"@spectrum-css/dropzone": "6.2.0",
43+
"@spectrum-css/fieldgroup": "5.3.0",
44+
"@spectrum-css/fieldlabel": "8.2.0",
45+
"@spectrum-css/floatingactionbutton": "2.2.0",
46+
"@spectrum-css/form": "0.0.0",
47+
"@spectrum-css/helptext": "5.2.0",
48+
"@spectrum-css/icon": "7.2.0",
49+
"@spectrum-css/illustratedmessage": "7.2.0",
50+
"@spectrum-css/infieldbutton": "5.2.0",
51+
"@spectrum-css/inlinealert": "8.2.0",
52+
"@spectrum-css/link": "5.2.0",
53+
"@spectrum-css/logicbutton": "4.2.0",
54+
"@spectrum-css/menu": "7.2.0",
55+
"@spectrum-css/meter": "0.0.0",
56+
"@spectrum-css/miller": "6.2.0",
57+
"@spectrum-css/modal": "5.2.0",
58+
"@spectrum-css/opacitycheckerboard": "2.2.0",
59+
"@spectrum-css/page": "8.2.0",
60+
"@spectrum-css/pagination": "8.2.0",
61+
"@spectrum-css/picker": "8.3.0",
62+
"@spectrum-css/pickerbutton": "5.2.0",
63+
"@spectrum-css/popover": "7.2.0",
64+
"@spectrum-css/progressbar": "4.2.0",
65+
"@spectrum-css/progresscircle": "3.2.0",
66+
"@spectrum-css/radio": "9.4.1",
67+
"@spectrum-css/rating": "5.2.0",
68+
"@spectrum-css/search": "7.4.0",
69+
"@spectrum-css/sidenav": "5.2.0",
70+
"@spectrum-css/slider": "5.5.1",
71+
"@spectrum-css/splitview": "5.3.0",
72+
"@spectrum-css/statuslight": "7.3.0",
73+
"@spectrum-css/steplist": "5.2.0",
74+
"@spectrum-css/stepper": "6.3.0",
75+
"@spectrum-css/swatch": "6.4.1",
76+
"@spectrum-css/swatchgroup": "3.2.0",
77+
"@spectrum-css/switch": "5.2.0",
78+
"@spectrum-css/table": "6.2.0",
79+
"@spectrum-css/tabs": "5.2.0",
80+
"@spectrum-css/tag": "9.2.0",
81+
"@spectrum-css/taggroup": "5.2.0",
82+
"@spectrum-css/textfield": "7.3.0",
83+
"@spectrum-css/thumbnail": "6.3.0",
84+
"@spectrum-css/toast": "10.3.0",
85+
"@spectrum-css/tooltip": "6.2.0",
86+
"@spectrum-css/tray": "3.2.0",
87+
"@spectrum-css/treeview": "10.4.0",
88+
"@spectrum-css/typography": "6.2.0",
89+
"@spectrum-css/underlay": "4.2.0",
90+
"@spectrum-css/well": "5.3.0",
91+
"@spectrum-tools/postcss-add-theming-layer": "0.0.0",
92+
"@spectrum-tools/postcss-property-rollup": "0.0.0",
93+
"@spectrum-tools/postcss-rgb-mapping": "2.1.0",
94+
"@spectrum-tools/stylelint-no-missing-var": "2.0.1",
95+
"@spectrum-tools/stylelint-no-unknown-custom-properties": "2.0.1",
96+
"@spectrum-tools/stylelint-no-unused-custom-properties": "2.0.2",
97+
"@spectrum-tools/theme-alignment": "1.1.0",
98+
"@spectrum-css/tokens": "15.0.0",
99+
"@spectrum-css/bundle": "1.0.0",
100+
"@spectrum-css/generator": "4.1.0",
101+
"@spectrum-css/ui-icons": "1.1.2"
99102
},
100103
"changesets": [
104+
"big-chairs-care",
101105
"chilly-peaches-sniff",
102106
"early-actors-buy",
103107
"eleven-cooks-destroy",
@@ -114,9 +118,12 @@
114118
"perfect-dogs-smash",
115119
"pretty-parents-drum",
116120
"proud-jokes-rule",
121+
"sixty-vans-thank",
117122
"spotty-onions-study",
118123
"strange-glasses-allow",
119124
"tame-bobcats-beam",
120-
"twenty-tables-know"
125+
"twenty-tables-know",
126+
"weak-kings-pretend",
127+
"young-cheetahs-peel"
121128
]
122129
}

‎.env.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ CHROMATIC_PROJECT_ID="Project:64762974a45b8bc5ca1705a2"
33
# Note: the build script here should be defined in .storybook/package.json
44
# this is used by the chromatic storybook addon to build the storybook on the fly
55
CHROMATIC_BUILD_SCRIPT_NAME="build"
6+
CHROMATIC_ONLY_CHANGED=true
7+
CHROMATIC_STORYBOOK_BASE_DIR=".storybook"
8+
CHROMATIC_ZIP=true
69

710
# NX settings
811
NX_PREFER_TS_NODE=true

‎.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@
155155
}
156156
}
157157
]
158-
}
158+
}

‎.github/actions/file-diff/CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## 2.1.0
4+
5+
### Minor Changes
6+
7+
- [#3488](https://github.com/adobe/spectrum-css/pull/3488) [`40c1954`](https://github.com/adobe/spectrum-css/commit/40c1954048f735a07f9edfccf3a568d38164806a) Thanks [@castastrophe](https://github.com/castastrophe)! - Update file table to specify if the file is deleted/moved and indicate the file size has decreased without showing percentages. This update also hardens the way in which the main file is highlighted in the table by checking for exact equals for looking for files "ending with" the file name.
8+
39
## 2.0.6
410

511
### Patch Changes
@@ -58,7 +64,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
5864
- feat(icon,ui-icons)!: migrate the icon compiler to a distinct package (#2343)([d73d594](https://github.com/adobe/spectrum-css/commit/d73d594)), closes[#2343](https://github.com/adobe/spectrum-css/issues/2343)
5965

6066
### 🛑 BREAKING CHANGES
61-
- @spectrum-css/icon will no longer contain SVG assets; it will be a purely CSS package with all SVG assets migrated to the new @spectrum-css/ui-icons package.
67+
68+
- @spectrum-css/icon will no longer contain SVG assets; it will be a purely CSS package with all SVG assets migrated to the new @spectrum-css/ui-icons package.
6269

6370
- NEW: @spectrum-css/ui-icons package for all SVG icons in the UI set.
6471

‎.github/actions/file-diff/index.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,10 @@ async function run() {
175175
const removedOnBranch = isRemoved(headByteSize, baseByteSize);
176176
// @todo should there be any normalization before comparing the file names?
177177
const isMainFile = readableFilename === mainFile;
178-
const size = removedOnBranch ? " - " : bytesToSize(headByteSize);
179-
const delta = `${printChange(headByteSize, baseByteSize)}${difference(baseByteSize, headByteSize) !== 0 ? ` (${printPercentChange(headByteSize , baseByteSize)})` : ""}`;
178+
const size = removedOnBranch ? "🚨 deleted/moved" : bytesToSize(headByteSize);
179+
const change = !removedOnBranch ? printChange(headByteSize, baseByteSize) : `⬇ ${bytesToSize(baseByteSize)}`;
180+
const diff = difference(baseByteSize, headByteSize) !== 0 ? ` (${printPercentChange(headByteSize , baseByteSize)})` : "";
181+
const delta = `${change}${removedOnBranch ? "" : diff}`;
180182

181183
return [
182184
...table,
@@ -323,7 +325,13 @@ const makeTable = function (PACKAGES, filePath, path) {
323325
if (main) mainFile = main.replace(/^.*\/dist\//, "");
324326
}
325327

326-
const mainFileOnly = [...fileMap.keys()].filter((file) => file.endsWith(mainFile));
328+
let mainFileOnly = [...fileMap.keys()].filter((file) => file === mainFile);
329+
330+
// If no main file is found, look for the first file matching the filename only
331+
if (mainFileOnly.length === 0) {
332+
mainFileOnly = [...fileMap.keys()].filter((file) => file.endsWith(mainFile));
333+
}
334+
327335
const headMainSize = mainFileOnly.reduce(
328336
(acc, filename) => {
329337
const { headByteSize = 0 } = fileMap.get(filename);

‎.github/actions/file-diff/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"private": true,
33
"name": "@spectrum-tools/gh-action-file-diff",
4-
"version": "2.0.6",
4+
"version": "2.1.0",
55
"description": "A GitHub Action to compare asset sizes and generate a diff if changes are found.",
66
"license": "Apache-2.0",
77
"author": "Adobe",
88
"main": "index.js",
99
"dependencies": {
10-
"@actions/artifact": "^2.2.0",
10+
"@actions/artifact": "^2.2.1",
1111
"@actions/core": "^1.11.1",
1212
"@actions/github": "^6.0.0",
1313
"@actions/glob": "^0.5.0",
1414
"diff": "^7.0.0",
15-
"diff2html": "^3.4.48"
15+
"diff2html": "^3.4.51"
1616
},
1717
"keywords": [
1818
"Actions",

‎.github/workflows/release-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Node.js
3232
uses: actions/setup-node@v4
3333
with:
34-
node-version: 18
34+
node-version: 20
3535
cache: yarn
3636
- name: Install Dependencies
3737
run: yarn install --frozen-lockfile

‎.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- main
77
- spectrum-two
8-
- s2-foundations-redux
98

109
concurrency: ${{ github.workflow }}-${{ github.ref }}
1110

@@ -20,9 +19,9 @@ jobs:
2019
- name: Setup Node.js
2120
uses: actions/setup-node@v4
2221
with:
23-
node-version: 18
22+
node-version: 20
2423
cache: yarn
25-
24+
2625
- name: Install Dependencies
2726
run: yarn install --frozen-lockfile
2827

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dist
2-
!tokens/dist/index.css
2+
!dist/metadata.json
3+
!tokens/dist/**
34

45
# Not committing the map assets, these are dev-only
56
*.map

‎.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ Icon?
1919
Thumbs.db
2020
*~
2121
*.swp
22+
23+
# Test files
24+
plugins/*/expected/*.css
25+
plugins/*/fixtures/*.css

0 commit comments

Comments
 (0)