Skip to content

Commit

Permalink
chore(spectrum-two): update local branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@aramos-adobe
aramos-adobe committed Jan 21, 2025
2 parents ad3ce1b + 6eaca0b commit f020018
Show file tree
Hide file tree
Showing 444 changed files with 15,046 additions and 23,961 deletions.
197 changes: 102 additions & 95 deletions .changeset/pre.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,102 +2,106 @@
"mode": "pre",
"tag": "next",
"initialVersions": {
"@spectrum-tools/gh-action-file-diff": "2.0.5",
"@spectrum-css/preview": "8.1.0-next.1",
"@spectrum-css/accordion": "4.2.7-next.2",
"@spectrum-css/actionbar": "7.2.5-next.2",
"@spectrum-css/actionbutton": "5.2.7-next.2",
"@spectrum-css/actiongroup": "5.0.0-next.3",
"@spectrum-css/actionmenu": "5.1.4-next.2",
"@spectrum-css/alertbanner": "1.1.42-next.2",
"@spectrum-css/alertdialog": "1.2.5-next.2",
"@spectrum-css/asset": "4.0.1-next.2",
"@spectrum-css/assetcard": "3.1.5-next.2",
"@spectrum-css/assetlist": "5.2.5-next.2",
"@spectrum-css/avatar": "6.1.6-next.2",
"@spectrum-css/badge": "3.2.6-next.2",
"@spectrum-css/breadcrumb": "8.2.6-next.2",
"@spectrum-css/button": "14.0.0-next.4",
"@spectrum-css/buttongroup": "7.0.0-next.3",
"@spectrum-css/calendar": "4.2.6-next.2",
"@spectrum-css/card": "7.0.3-next.2",
"@spectrum-css/checkbox": "14.0.0-next.4",
"@spectrum-css/clearbutton": "5.1.5-next.2",
"@spectrum-css/closebutton": "5.0.0-next.2",
"@spectrum-css/coachindicator": "1.1.6-next.2",
"@spectrum-css/coachmark": "6.1.6-next.2",
"@spectrum-css/colorarea": "4.1.6-next.2",
"@spectrum-css/colorhandle": "7.1.5-next.2",
"@spectrum-css/colorloupe": "4.2.5-next.2",
"@spectrum-css/colorslider": "5.1.6-next.2",
"@spectrum-css/colorwheel": "3.1.6-next.2",
"@spectrum-css/combobox": "2.1.7-next.2",
"@spectrum-css/commons": "9.1.4-next.1",
"@spectrum-css/contextualhelp": "2.1.6-next.2",
"@spectrum-css/datepicker": "2.1.5-next.2",
"@spectrum-css/dial": "2.2.5-next.2",
"@spectrum-css/dialog": "9.2.5-next.2",
"@spectrum-css/divider": "2.2.6-next.2",
"@spectrum-css/dropindicator": "4.1.5-next.2",
"@spectrum-css/dropzone": "5.2.6-next.2",
"@spectrum-css/fieldgroup": "4.2.5-next.2",
"@spectrum-css/fieldlabel": "8.0.0-next.2",
"@spectrum-css/floatingactionbutton": "1.2.6-next.2",
"@spectrum-css/helptext": "4.1.6-next.2",
"@spectrum-css/icon": "6.0.6-next.2",
"@spectrum-css/illustratedmessage": "6.1.6-next.2",
"@spectrum-css/infieldbutton": "4.2.5-next.2",
"@spectrum-css/inlinealert": "7.1.7-next.2",
"@spectrum-css/link": "4.2.6-next.2",
"@spectrum-css/logicbutton": "3.3.5-next.2",
"@spectrum-css/menu": "6.1.6-next.2",
"@spectrum-css/miller": "5.1.5-next.2",
"@spectrum-css/modal": "4.2.7-next.2",
"@spectrum-css/opacitycheckerboard": "1.1.6-next.2",
"@spectrum-css/page": "7.1.5-next.2",
"@spectrum-css/pagination": "7.1.7-next.2",
"@spectrum-css/picker": "7.2.8-next.2",
"@spectrum-css/pickerbutton": "4.1.6-next.2",
"@spectrum-css/popover": "6.2.6-next.2",
"@spectrum-css/progressbar": "3.1.6-next.2",
"@spectrum-css/progresscircle": "2.2.4-next.2",
"@spectrum-css/radio": "8.1.6-next.2",
"@spectrum-css/rating": "4.2.5-next.2",
"@spectrum-css/search": "6.2.5-next.2",
"@spectrum-css/sidenav": "4.2.5-next.2",
"@spectrum-css/site": "4.2.5-next.2",
"@spectrum-css/slider": "4.3.6-next.2",
"@spectrum-css/splitview": "4.2.5-next.2",
"@spectrum-css/statuslight": "6.1.7-next.2",
"@spectrum-css/steplist": "4.1.5-next.2",
"@spectrum-css/stepper": "5.1.6-next.2",
"@spectrum-css/swatch": "5.1.6-next.2",
"@spectrum-css/swatchgroup": "2.1.6-next.2",
"@spectrum-css/switch": "4.2.6-next.2",
"@spectrum-css/table": "5.2.6-next.2",
"@spectrum-css/tabs": "4.1.5-next.2",
"@spectrum-css/tag": "8.1.6-next.2",
"@spectrum-css/taggroup": "4.1.6-next.2",
"@spectrum-css/textfield": "6.1.7-next.2",
"@spectrum-css/thumbnail": "5.2.5-next.2",
"@spectrum-css/toast": "9.1.26-next.2",
"@spectrum-css/tooltip": "5.3.6-next.2",
"@spectrum-css/tray": "2.2.8-next.2",
"@spectrum-css/treeview": "9.2.7-next.2",
"@spectrum-css/typography": "5.1.6-next.2",
"@spectrum-css/underlay": "3.2.5-next.2",
"@spectrum-css/well": "4.1.5-next.2",
"@spectrum-css/generator": "3.0.0",
"conventional-changelog-spectrum": "1.0.2",
"@spectrum-tools/stylelint-no-missing-var": "1.3.1",
"@spectrum-tools/stylelint-no-unknown-custom-properties": "1.3.2",
"@spectrum-tools/stylelint-no-unused-custom-properties": "1.3.1",
"@spectrum-tools/documentation": "1.0.0",
"@spectrum-css/tokens": "14.0.0-next.6",
"@spectrum-css/ui-icons": "1.1.2",
"@spectrum-tools/postcss-rgb-mapping": "3.0.0-s2-foundations.0"
"@spectrum-tools/gh-action-file-diff": "2.1.0",
"@spectrum-css/preview": "11.0.0",
"@spectrum-css/accordion": "5.3.0",
"@spectrum-css/actionbar": "8.2.0",
"@spectrum-css/actionbutton": "6.2.0",
"@spectrum-css/actiongroup": "5.2.0",
"@spectrum-css/actionmenu": "6.2.0",
"@spectrum-css/alertbanner": "2.3.0",
"@spectrum-css/alertdialog": "2.2.0",
"@spectrum-css/asset": "5.2.0",
"@spectrum-css/assetcard": "4.2.0",
"@spectrum-css/assetlist": "6.4.0",
"@spectrum-css/avatar": "7.3.0",
"@spectrum-css/badge": "4.3.0",
"@spectrum-css/breadcrumb": "9.2.0",
"@spectrum-css/button": "13.5.0",
"@spectrum-css/buttongroup": "7.2.0",
"@spectrum-css/calendar": "5.3.0",
"@spectrum-css/card": "9.3.0",
"@spectrum-css/checkbox": "9.2.1",
"@spectrum-css/clearbutton": "6.4.0",
"@spectrum-css/closebutton": "5.3.0",
"@spectrum-css/coachindicator": "2.2.0",
"@spectrum-css/coachmark": "7.3.0",
"@spectrum-css/colorarea": "5.2.0",
"@spectrum-css/colorhandle": "8.2.0",
"@spectrum-css/colorloupe": "5.3.0",
"@spectrum-css/colorslider": "6.2.0",
"@spectrum-css/colorwheel": "4.2.0",
"@spectrum-css/combobox": "3.3.0",
"@spectrum-css/commons": "10.1.0",
"@spectrum-css/contextualhelp": "3.3.0",
"@spectrum-css/datepicker": "3.3.0",
"@spectrum-css/dial": "3.2.0",
"@spectrum-css/dialog": "10.2.0",
"@spectrum-css/divider": "3.2.0",
"@spectrum-css/dropindicator": "5.2.0",
"@spectrum-css/dropzone": "6.2.0",
"@spectrum-css/fieldgroup": "5.3.0",
"@spectrum-css/fieldlabel": "8.2.0",
"@spectrum-css/floatingactionbutton": "2.2.0",
"@spectrum-css/form": "0.0.0",
"@spectrum-css/helptext": "5.2.0",
"@spectrum-css/icon": "7.2.0",
"@spectrum-css/illustratedmessage": "7.2.0",
"@spectrum-css/infieldbutton": "5.2.0",
"@spectrum-css/inlinealert": "8.2.0",
"@spectrum-css/link": "5.2.0",
"@spectrum-css/logicbutton": "4.2.0",
"@spectrum-css/menu": "7.2.0",
"@spectrum-css/meter": "0.0.0",
"@spectrum-css/miller": "6.2.0",
"@spectrum-css/modal": "5.2.0",
"@spectrum-css/opacitycheckerboard": "2.2.0",
"@spectrum-css/page": "8.2.0",
"@spectrum-css/pagination": "8.2.0",
"@spectrum-css/picker": "8.3.0",
"@spectrum-css/pickerbutton": "5.2.0",
"@spectrum-css/popover": "7.2.0",
"@spectrum-css/progressbar": "4.2.0",
"@spectrum-css/progresscircle": "3.2.0",
"@spectrum-css/radio": "9.4.1",
"@spectrum-css/rating": "5.2.0",
"@spectrum-css/search": "7.4.0",
"@spectrum-css/sidenav": "5.2.0",
"@spectrum-css/slider": "5.5.1",
"@spectrum-css/splitview": "5.3.0",
"@spectrum-css/statuslight": "7.3.0",
"@spectrum-css/steplist": "5.2.0",
"@spectrum-css/stepper": "6.3.0",
"@spectrum-css/swatch": "6.4.1",
"@spectrum-css/swatchgroup": "3.2.0",
"@spectrum-css/switch": "5.2.0",
"@spectrum-css/table": "6.2.0",
"@spectrum-css/tabs": "5.2.0",
"@spectrum-css/tag": "9.2.0",
"@spectrum-css/taggroup": "5.2.0",
"@spectrum-css/textfield": "7.3.0",
"@spectrum-css/thumbnail": "6.3.0",
"@spectrum-css/toast": "10.3.0",
"@spectrum-css/tooltip": "6.2.0",
"@spectrum-css/tray": "3.2.0",
"@spectrum-css/treeview": "10.4.0",
"@spectrum-css/typography": "6.2.0",
"@spectrum-css/underlay": "4.2.0",
"@spectrum-css/well": "5.3.0",
"@spectrum-tools/postcss-add-theming-layer": "0.0.0",
"@spectrum-tools/postcss-property-rollup": "0.0.0",
"@spectrum-tools/postcss-rgb-mapping": "2.1.0",
"@spectrum-tools/stylelint-no-missing-var": "2.0.1",
"@spectrum-tools/stylelint-no-unknown-custom-properties": "2.0.1",
"@spectrum-tools/stylelint-no-unused-custom-properties": "2.0.2",
"@spectrum-tools/theme-alignment": "1.1.0",
"@spectrum-css/tokens": "15.0.0",
"@spectrum-css/bundle": "1.0.0",
"@spectrum-css/generator": "4.1.0",
"@spectrum-css/ui-icons": "1.1.2"
},
"changesets": [
"big-chairs-care",
"chilly-peaches-sniff",
"early-actors-buy",
"eleven-cooks-destroy",
Expand All @@ -114,9 +118,12 @@
"perfect-dogs-smash",
"pretty-parents-drum",
"proud-jokes-rule",
"sixty-vans-thank",
"spotty-onions-study",
"strange-glasses-allow",
"tame-bobcats-beam",
"twenty-tables-know"
"twenty-tables-know",
"weak-kings-pretend",
"young-cheetahs-peel"
]
}
17 changes: 17 additions & 0 deletions .changeset/wicked-dragons-cheer.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
"@spectrum-css/pickerbutton": patch
"@spectrum-css/progressbar": patch
"@spectrum-css/calendar": patch
"@spectrum-css/stepper": patch
"@spectrum-css/radio": patch
"@spectrum-css/dial": patch
---

Fixes to align `spectrum-two` with `s2-foundations-redux`/`main`, mostly defining unused custom properties, but addresses any other lint warnings or inconsistencies noted in the following components:

**Calendar**: Defines 1 previously undefined custom property to align with `main` and `s2-foundations-redux`
**Dial**: Defines 6 previously undefined custom properties, removes 3 unused custom properties
**Pickerbutton**: Defines 9 previously undefined custom properties to align with `main` and `s2-foundations-redux`
**Progressbar**: Removes 3 unused custom properties, reverts background-color to background to accommodate gradients
**Radio**: Defines 4 previously undefined custom properties to align with `main` and `s2-foundations-redux`
**Stepper**: moves high contrast block further down to align with other components' CSS structure, defines multiple undefined custom properties, adds disable-next-line comment to suppress no-unused-custom-properties warning
3 changes: 3 additions & 0 deletions .env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ CHROMATIC_PROJECT_ID="Project:64762974a45b8bc5ca1705a2"
# Note: the build script here should be defined in .storybook/package.json
# this is used by the chromatic storybook addon to build the storybook on the fly
CHROMATIC_BUILD_SCRIPT_NAME="build"
CHROMATIC_ONLY_CHANGED=true
CHROMATIC_STORYBOOK_BASE_DIR=".storybook"
CHROMATIC_ZIP=true

# NX settings
NX_PREFER_TS_NODE=true
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
}
}
]
}
}
6 changes: 6 additions & 0 deletions .github/actions/file-diff/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 2.1.0

### Minor Changes

- [#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.

## 2.0.6

### Patch Changes
Expand Down
14 changes: 11 additions & 3 deletions .github/actions/file-diff/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,10 @@ async function run() {
const removedOnBranch = isRemoved(headByteSize, baseByteSize);
// @todo should there be any normalization before comparing the file names?
const isMainFile = readableFilename === mainFile;
const size = removedOnBranch ? " - " : bytesToSize(headByteSize);
const delta = `${printChange(headByteSize, baseByteSize)}${difference(baseByteSize, headByteSize) !== 0 ? ` (${printPercentChange(headByteSize , baseByteSize)})` : ""}`;
const size = removedOnBranch ? "🚨 deleted/moved" : bytesToSize(headByteSize);
const change = !removedOnBranch ? printChange(headByteSize, baseByteSize) : `⬇ ${bytesToSize(baseByteSize)}`;
const diff = difference(baseByteSize, headByteSize) !== 0 ? ` (${printPercentChange(headByteSize , baseByteSize)})` : "";
const delta = `${change}${removedOnBranch ? "" : diff}`;

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

const mainFileOnly = [...fileMap.keys()].filter((file) => file.endsWith(mainFile));
let mainFileOnly = [...fileMap.keys()].filter((file) => file === mainFile);

// If no main file is found, look for the first file matching the filename only
if (mainFileOnly.length === 0) {
mainFileOnly = [...fileMap.keys()].filter((file) => file.endsWith(mainFile));
}

const headMainSize = mainFileOnly.reduce(
(acc, filename) => {
const { headByteSize = 0 } = fileMap.get(filename);
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/file-diff/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"private": true,
"name": "@spectrum-tools/gh-action-file-diff",
"version": "2.0.6",
"version": "2.1.0",
"description": "A GitHub Action to compare asset sizes and generate a diff if changes are found.",
"license": "Apache-2.0",
"author": "Adobe",
"main": "index.js",
"dependencies": {
"@actions/artifact": "^2.2.0",
"@actions/artifact": "^2.2.1",
"@actions/core": "^1.11.1",
"@actions/github": "^6.0.0",
"@actions/glob": "^0.5.0",
"diff": "^7.0.0",
"diff2html": "^3.4.48"
"diff2html": "^3.4.51"
},
"keywords": [
"Actions",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-snapshot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- main
- spectrum-two
- s2-foundations-redux

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

Expand All @@ -20,9 +19,9 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: yarn

- name: Install Dependencies
run: yarn install --frozen-lockfile

Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
dist
!tokens/dist/index.css
!dist/metadata.json
!tokens/dist/**

# Not committing the map assets, these are dev-only
*.map
Expand Down
4 changes: 4 additions & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ Icon?
Thumbs.db
*~
*.swp

# Test files
plugins/*/expected/*.css
plugins/*/fixtures/*.css
Loading

0 comments on commit f020018

Please sign in to comment.