Skip to content

Commit 77deea1

Browse files
committed
Merge tag 'v2.26.1' into release/opensource
2 parents 14e0dc7 + 66e09f3 commit 77deea1

File tree

12 files changed

+90
-40
lines changed

12 files changed

+90
-40
lines changed

.github/actions/copy-tokens-from-workspace/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ runs:
33
using: composite
44
steps:
55
- name: Decompress design-tokens
6-
run: tar -xvf workspace/artifact/design-tokens.tar
7-
shell: bash
6+
run: tar -xvf workspace/design-tokens.tar
7+
shell: bash

.github/workflows/a11y.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ jobs:
101101

102102
- name: Archive test results
103103
if: success() || failure()
104-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v4
105105
with:
106106
name: a11y
107107
path: __tests__/a11y/results/
108108

109109
- name: Archive test xml
110110
if: success() || failure()
111-
uses: actions/upload-artifact@v3
111+
uses: actions/upload-artifact@v4
112112
with:
113113
name: a11y-xml
114114
path: __tests__/a11y/xml/

.github/workflows/storybook.yml

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ jobs:
5454
export STATUS_URL=$(echo ${row} | base64 --decode | jq -r ".status" | sed 's/https:\/\/api.github.com//')
5555
gh api ${STATUS_URL} -f state=in_progress -H "Accept: application/vnd.github.flash-preview+json"
5656
done
57-
58-
- uses: actions/upload-artifact@v3
57+
- uses: actions/upload-artifact@v4
5958
with:
59+
name: artifact-deployments
6060
path: |-
6161
workspace/gh-deployments.json
6262
@@ -76,9 +76,10 @@ jobs:
7676
with:
7777
cache: "npm"
7878

79-
- uses: actions/download-artifact@v3
79+
- uses: actions/download-artifact@v4
8080
with:
8181
path: workspace
82+
merge-multiple: true
8283

8384
- name: Determine Heroku App
8485
uses: "./.github/actions/set-heroku-app-name"
@@ -106,8 +107,9 @@ jobs:
106107
run: tar -cvf workspace/styles.tar assets/styles/
107108
- name: Compress generated metadata
108109
run: tar -cvf workspace/metadata.tar .generated/metadata/
109-
- uses: actions/upload-artifact@v3
110+
- uses: actions/upload-artifact@v4
110111
with:
112+
name: artifact-prepare
111113
path: |-
112114
workspace/design-tokens.tar
113115
workspace/styles.tar
@@ -128,9 +130,10 @@ jobs:
128130
with:
129131
cache: "npm"
130132

131-
- uses: actions/download-artifact@v3
133+
- uses: actions/download-artifact@v4
132134
with:
133135
path: workspace
136+
merge-multiple: true
134137

135138
- name: Display structure of downloaded files
136139
run: ls -R
@@ -151,8 +154,9 @@ jobs:
151154
- name: Archive static Storybook
152155
run: tar -czvf workspace/storybook.tar.gz .www/ Procfile config/nginx.conf.erb heroku-start.sh app.json
153156

154-
- uses: actions/upload-artifact@v3
157+
- uses: actions/upload-artifact@v4
155158
with:
159+
name: artifact-storybook
156160
path: workspace/storybook.tar.gz
157161

158162
publish-storybook:
@@ -164,9 +168,10 @@ jobs:
164168
- build-storybook
165169

166170
steps:
167-
- uses: actions/download-artifact@v3
171+
- uses: actions/download-artifact@v4
168172
with:
169173
path: workspace
174+
merge-multiple: true
170175

171176
- name: Display structure of downloaded files
172177
run: ls -R
@@ -202,7 +207,7 @@ jobs:
202207
echo ${PUBLISH_STORYBOOK_TO}
203208
echo "=============================="
204209
heroku buildpacks -a ${PUBLISH_STORYBOOK_TO} | grep "https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse" || heroku buildpacks:set https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse -a ${PUBLISH_STORYBOOK_TO}
205-
heroku builds:create --source-tar workspace/artifact/storybook.tar.gz -a ${PUBLISH_STORYBOOK_TO}
210+
heroku builds:create --source-tar workspace/storybook.tar.gz -a ${PUBLISH_STORYBOOK_TO}
206211
207212
- uses: tibdex/github-app-token@v1
208213
id: get_installation_token
@@ -214,7 +219,7 @@ jobs:
214219
env:
215220
GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
216221
run: |-
217-
for row in $(jq -r '.[] | select(.url | contains("storybook")) | @base64' workspace/artifact/gh-deployments.json); do
222+
for row in $(jq -r '.[] | select(.url | contains("storybook")) | @base64' workspace/gh-deployments.json); do
218223
export STATUS_URL=$(echo ${row} | base64 --decode | jq -r ".status" | sed 's/https:\/\/api.github.com//')
219224
export SITE_URL=$(echo ${row} | base64 --decode | jq -r ".url")
220225
gh api ${STATUS_URL} -f state=success -f environment_url=${SITE_URL} -H "Accept: application/vnd.github.ant-man-preview+json"
@@ -234,19 +239,21 @@ jobs:
234239
cache: "npm"
235240
node-version: "<=18.17.1"
236241

237-
- uses: actions/download-artifact@v3
242+
- uses: actions/download-artifact@v4
238243
with:
239244
path: workspace
245+
merge-multiple: true
246+
240247

241248
- name: Display structure of downloaded files
242249
run: ls -R
243250
working-directory: workspace
244251

245252
- uses: "./.github/actions/copy-tokens-from-workspace"
246253
- name: Decompress styles
247-
run: tar -xvf workspace/artifact/styles.tar
254+
run: tar -xvf workspace/styles.tar
248255
- name: Decompress metadata
249-
run: tar -xvf workspace/artifact/metadata.tar
256+
run: tar -xvf workspace/metadata.tar
250257

251258
- run: npm ci
252259

@@ -259,8 +266,10 @@ jobs:
259266
run: |-
260267
tar -cvf workspace/design-system-dist.tar .dist/
261268
cd .dist && zip -r dist . && mv dist.zip ../workspace/ && cd ..
262-
- uses: actions/upload-artifact@v3
269+
270+
- uses: actions/upload-artifact@v4
263271
with:
272+
name: artifact-dist
264273
path: |-
265274
workspace/design-system-dist.tar
266275
workspace/dist.zip
@@ -287,9 +296,10 @@ jobs:
287296
- name: Display structure of downloaded files
288297
run: ls -la
289298

290-
- uses: actions/download-artifact@v3
299+
- uses: actions/download-artifact@v4
291300
with:
292301
path: workspace
302+
merge-multiple: true
293303

294304
- name: Display structure of downloaded files
295305
run: ls -R
@@ -298,7 +308,7 @@ jobs:
298308
- name: Decompress SLDS .dist
299309
run: |-
300310
mkdir -p .slds
301-
tar -xvf workspace/artifact/design-system-dist.tar --directory .slds
311+
tar -xvf workspace/design-system-dist.tar --directory .slds
302312
303313
- uses: actions/setup-node@v3
304314
with:
@@ -325,7 +335,7 @@ jobs:
325335
run: tar -czvf site-next.tar.gz .www/ Procfile config/nginx.conf.erb heroku-start.sh app.json
326336
- name: Deploy to Heroku app
327337
run: |-
328-
export HEROKU_APP_NAME=$(cat workspace/artifact/heroku-app-name.txt)
338+
export HEROKU_APP_NAME=$(cat workspace/heroku-app-name.txt)
329339
echo "=============================="
330340
echo ${HEROKU_APP_NAME}
331341
echo "=============================="
@@ -354,9 +364,10 @@ jobs:
354364
private_key: ${{ secrets.DSE_CI_APP_KEY }}
355365
- uses: actions/checkout@v3
356366

357-
- uses: actions/download-artifact@v3
367+
- uses: actions/download-artifact@v4
358368
with:
359369
path: workspace
370+
merge-multiple: true
360371

361372
- name: "Github: attach artifact to release"
362373
env:
@@ -367,7 +378,7 @@ jobs:
367378
gh release view ${VERSION_FROM_TAG} | grep ${VERSION_FROM_TAG}
368379
369380
if [ $? -eq 0 ]; then
370-
cp workspace/artifact/dist.zip workspace/slds-${VERSION_FROM_TAG}.zip
381+
cp workspace/dist.zip workspace/slds-${VERSION_FROM_TAG}.zip
371382
echo "=============================="
372383
echo "» Attaching artifact to release ${VERSION_FROM_TAG}"
373384
gh release upload ${VERSION_FROM_TAG} workspace/slds-${VERSION_FROM_TAG}.zip#"SLDS ${VERSION_FROM_TAG}" --clobber

.github/workflows/vrt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: ls -R
3838
working-directory: workspace
3939

40-
- uses: actions/upload-artifact@v3
40+
- uses: actions/upload-artifact@v4
4141
with:
4242
name: storybook-build-for-chromatic
4343
path: workspace/storybook.tar.gz
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
cache: "npm"
5858

59-
- uses: actions/download-artifact@v3
59+
- uses: actions/download-artifact@v4
6060
with:
6161
name: storybook-build-for-chromatic
6262
path: workspace

RELEASENOTES.general.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
22
<!-- On release, add general notes here. In time the legacy release notes will be add to this -->
3+
4+
## 2.26.1 - January 30, 2025
5+
6+
- Update icons to `v10.11.2`
7+
- Standard Set:
8+
- Added changes
9+
10+
- Utility Set:
11+
- Updated border_all svg
12+
- Added changes
13+
314
## 2.26.0 - January 16, 2025
415

516
- Update icons to `v10.11.1`

RELEASENOTES.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
22
<!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
33

4+
## Release 2.26.1 - January 30, 2025
5+
6+
- Update icons to `v10.11.2`
7+
- Standard Set:
8+
- Added changes
9+
- Utility Set:
10+
- Updated border_all svg
11+
- Added changes
12+
13+
## Component Blueprints
14+
### [Form Element](https://www.lightningdesignsystem.com/components/form-element)
15+
#### Fixed
16+
- Move clear fix applied in release 2.25.6 to a different form element to avoid possible regressions.
17+
418
## Release 2.26.0 - January 16, 2025
519

620
- Update icons to `v10.11.1`
@@ -609,7 +623,7 @@
609623
- Fixed `NVDA` checkbox toggle is announced twice removed aria-live="assertive"
610624

611625
### [Combobox](https://www.lightningdesignsystem.com/components/combobox)
612-
#### Added
626+
#### Added
613627
- Tooltip option provided for Date/DateTime pickers.
614628
- Updated from tabindex to tabIndex.
615629

@@ -650,7 +664,7 @@
650664

651665
### [Progress Ring](https://www.lightningdesignsystem.com/components/progress-ring)
652666
#### Fixed
653-
- Fixed duplicate IDs by adding helper method
667+
- Fixed duplicate IDs by adding helper method
654668

655669
### [Split View](https://www.lightningdesignsystem.com/components/split-view)
656670
#### Changed
@@ -754,7 +768,7 @@ Added `aria-label` to meet accessibility requirements specifically for screen re
754768

755769
### [Global Navigation](https://www.lightningdesignsystem.com/components/global-navigation)
756770
#### Added
757-
- Added `role="presentation"` for globlal navigation's overflow tab item
771+
- Added `role="presentation"` for globlal navigation's overflow tab item
758772

759773
### [Menus](https://www.lightningdesignsystem.com/components/menus)
760774
## Fixed

design-tokens/bg-standard.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,6 +1185,8 @@ props:
11851185
value: '#1b96ff'
11861186
CALCULATED_MEASURE:
11871187
value: '#06a59a'
1188+
CHANGES:
1189+
value: '#06a59a'
11881190
DISEASE_DEFINITION_CRITERIA:
11891191
value: '#ff5d2d'
11901192
DISEASE_INVESTIGATION:

package-lock.json

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"CSS"
99
],
1010
"homepage": "https://lightningdesignsystem.com",
11-
"version": "2.26.0",
11+
"version": "2.26.1",
1212
"author": "Salesforce",
1313
"bugs": {
1414
"url": "https://github.com/salesforce-ux/design-system/issues"
@@ -49,7 +49,7 @@
4949
"@salesforce-ux/design-system-markup": "^2.0.4",
5050
"@salesforce-ux/design-system-parser": "^1.1.1",
5151
"@salesforce-ux/design-system-primitive-tokens": "0.3.6",
52-
"@salesforce-ux/icons": "10.11.1",
52+
"@salesforce-ux/icons": "10.11.2",
5353
"@salesforce-ux/instant-vrt": "2.0.0",
5454
"@salesforce-ux/postcss-annotations-parser": "0.1.1",
5555
"@salesforce-ux/postcss-css-variable-value": "0.2.0",

ui/_config.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
///
1010
/// @type String
1111
/// @access private
12-
$app-version: "2.26.0";
12+
$app-version: "2.26.1";
1313

1414
/// Debug mode (uncomment to activate)
1515
/// Turn on to output deprecation warnings during development

0 commit comments

Comments
 (0)