Skip to content

Commit 73a6a4c

Browse files
committed
Merge tag 'v2.21.0' of github.com:salesforce-ux/design-system-internal into opensource-summer-23
2 parents 8269a69 + 9eb2cdd commit 73a6a4c

File tree

91 files changed

+2073
-1073
lines changed

Some content is hidden

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

91 files changed

+2073
-1073
lines changed

.github/actions/set-heroku-app-name/action.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@ outputs:
77
runs:
88
using: composite
99
steps:
10+
- name: Print context
11+
env:
12+
GITHUB_CONTEXT: ${{ toJson(github) }}
13+
run: |
14+
echo "$GITHUB_CONTEXT"
15+
shell: bash
1016
- name: Set which app to deploy to on Heroku
1117
id: which-app
18+
env:
19+
HEROKU_APP_UPCOMING: upcoming-doc-site
20+
HEROKU_APP_CORE_MAIN: core-main-doc-site
21+
HEROKU_APP_CORE_PATCH: core-patch-doc-site
1222
# if on default branch without a tag
1323
# then publish to UPCOMING
1424
#
@@ -20,19 +30,18 @@ runs:
2030
#
2131
# All other cases publish to the review app
2232
run: |-
23-
export CURRENT_DEFAULT_BRANCH=`git remote show origin | grep "HEAD branch" | cut -d ":" -f 2 | xargs`
2433
echo 'HEROKU_RELEASE_STORYBOOK_APP_NAME=false' >> $GITHUB_OUTPUT
25-
if [[ "${{ github.ref }}" = "${CURRENT_DEFAULT_BRANCH}" ]] ; then
34+
if [[ "${{ github.ref_name }}" = "${{ github.event.repository.default_branch }}" ]] ; then
2635
echo "Publishing to UPCOMING..."
27-
echo 'HEROKU_APP_NAME=${HEROKU_APP_UPCOMING}' >> $GITHUB_OUTPUT
36+
echo 'HEROKU_APP_NAME=${{ env.HEROKU_APP_UPCOMING }}' >> $GITHUB_OUTPUT
2837
echo 'HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-upcoming' >> $GITHUB_OUTPUT
29-
elif [[ ${{ github.ref }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+-.+$ ]] ; then
38+
elif [[ ${{ github.ref_name }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+-.+$ ]] ; then
3039
echo "Publishing to CORE-MAIN..."
31-
echo 'HEROKU_APP_NAME=${HEROKU_APP_CORE_MAIN}' >> $GITHUB_OUTPUT
40+
echo 'HEROKU_APP_NAME=${{ env.HEROKU_APP_CORE_MAIN }}' >> $GITHUB_OUTPUT
3241
echo 'HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-main' >> $GITHUB_OUTPUT
33-
elif [[ ${{ github.ref }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
42+
elif [[ ${{ github.ref_name }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
3443
echo "Publishing to CORE-PATCH..."
35-
echo 'HEROKU_APP_NAME=${HEROKU_APP_CORE_PATCH}' >> $GITHUB_OUTPUT
44+
echo 'HEROKU_APP_NAME=${{ env.HEROKU_APP_CORE_PATCH }}' >> $GITHUB_OUTPUT
3645
echo 'HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-patch' >> $GITHUB_OUTPUT
3746
else
3847
echo "Publishing to pull-request review app..."
@@ -62,4 +71,4 @@ runs:
6271
cat workspace/heroku-release-storybook-app-name.txt
6372
echo "============================================="
6473
echo
65-
shell: bash
74+
shell: bash

.github/workflows/remove-labels.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ jobs:
1111
with:
1212
labels: |
1313
vrt:chrome-ready
14+
vrt:mobile-ready
1415
vrt:full-ready

.github/workflows/storybook.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Make Review Apps
22

3-
on: pull_request
3+
on:
4+
release:
5+
types: [released, prereleased]
6+
pull_request:
7+
branches: [ '**' ]
8+
push:
9+
branches: [ '2[0-9][02468]-*-2[0-9]' ]
410

511
env:
612
# APPLITOOLS_API_KEY:
@@ -10,7 +16,7 @@ env:
1016
# DSE_API_RELEASE_TOKEN:
1117
# GITHUB_PACKAGES_TOKEN:
1218
# GITHUB_TOKEN: ${{ github.token }}
13-
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
19+
HEROKU_API_KEY: ${{ secrets.DSE_INFRA_HEROKU_API_KEY }}
1420

1521
jobs:
1622
init:
@@ -87,11 +93,15 @@ jobs:
8793

8894
- uses: "./.github/actions/copy-tokens-to-workspace"
8995

90-
# - run: |-HEROKU_RELEASE_STORYBOOK_APP_NAME
91-
# HEROKU_APP_NAME=${{ steps.which-heroku-app.outputs.HEROKU_APP_NAME }}
92-
# HEROKU_RELEASE_STORYBOOK_APP_NAME=${{ steps.which-heroku-app.outputs.HEROKU_RELEASE_STORYBOOK_APP_NAME }}
93-
# echo $HEROKU_APP_NAME
94-
# echo $HEROKU_RELEASE_STORYBOOK_APP_NAME
96+
- name: Print destination app names
97+
run: |
98+
HEROKU_APP_NAME=${{ steps.which-heroku-app.outputs.HEROKU_APP_NAME }}
99+
HEROKU_RELEASE_STORYBOOK_APP_NAME=${{ steps.which-heroku-app.outputs.HEROKU_RELEASE_STORYBOOK_APP_NAME }}
100+
echo "=============================="
101+
echo $HEROKU_APP_NAME
102+
echo $HEROKU_RELEASE_STORYBOOK_APP_NAME
103+
# if HEROKU_RELEASE_STORYBOOK_APP_NAME is "true", then we are in a PR
104+
echo "=============================="
95105
96106
- name: Compile styles
97107
run: npm run gulp -- styles
@@ -138,6 +148,8 @@ jobs:
138148
139149
- name: Build static Storybook
140150
run: npm run storybook:build
151+
env:
152+
NODE_OPTIONS: --openssl-legacy-provider # per https://candid.technology/error-error-0308010c-digital-envelope-routines-unsupported/
141153

142154
- name: Archive static Storybook
143155
run: tar -czvf workspace/storybook.tar.gz .www/ Procfile config/nginx.conf.erb heroku-start.sh app.json
@@ -147,7 +159,7 @@ jobs:
147159
path: workspace/storybook.tar.gz
148160

149161
publish-storybook:
150-
if: ${{ needs.prepare.outputs.HEROKU_RELEASE_STORYBOOK_APP_NAME == 'true' }}
162+
if: ${{ needs.prepare.outputs.HEROKU_RELEASE_STORYBOOK_APP_NAME != 'false' }}
151163
runs-on: ubuntu-latest
152164
needs:
153165
- init
@@ -241,6 +253,9 @@ jobs:
241253
- run: npm ci
242254
- name: Do build-dist
243255
run: npm run build-dist
256+
env:
257+
NODE_OPTIONS: --openssl-legacy-provider # per https://candid.technology/error-error-0308010c-digital-envelope-routines-unsupported/
258+
244259
- name: Compress .dist
245260
run: |-
246261
tar -cvf workspace/design-system-dist.tar .dist/
@@ -303,6 +318,8 @@ jobs:
303318
run: npm run build
304319
env:
305320
SLDS__FRAMEWORK__PATH: ".slds/.dist/"
321+
NODE_OPTIONS: --openssl-legacy-provider # per https://candid.technology/error-error-0308010c-digital-envelope-routines-unsupported/
322+
306323
- name: Display structure of downloaded files
307324
run: ls -la
308325
- name: Generate site tarball

.github/workflows/vrt.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Trigger VRT from Label
1+
name: VRT Triggered from Label
22

33
on:
44
pull_request:
@@ -15,7 +15,7 @@ env:
1515

1616
jobs:
1717
vrt-init:
18-
if: ${{ github.event.label.name == 'vrt:chrome-ready' || github.event.label.name == 'vrt:full-ready'}}
18+
if: startsWith(github.event.label.name, 'vrt:')
1919
runs-on: ubuntu-latest
2020

2121
steps:
@@ -36,6 +36,7 @@ jobs:
3636
cache: 'npm'
3737

3838
vrt-desktop:
39+
if: contains(fromJSON('["vrt:full-ready", "vrt:chrome-ready"]'), github.event.label.name)
3940
needs: vrt-init
4041
runs-on: ubuntu-latest
4142

@@ -62,10 +63,12 @@ jobs:
6263
6364
- name: Applitools
6465
run: 'VRT_MODE=${{ env.VRT_MODE }} npx eyes-storybook'
65-
timeout-minutes: 20
66+
timeout-minutes: 60
67+
env:
68+
NODE_OPTIONS: --openssl-legacy-provider # per https://candid.technology/error-error-0308010c-digital-envelope-routines-unsupported/
6669

6770
vrt-legacy:
68-
if: ${{ github.event.label.name == 'vrt:full-ready'}}
71+
if: contains(fromJSON('["vrt:full-ready"]'), github.event.label.name)
6972
needs: vrt-init
7073
runs-on: ubuntu-latest
7174

@@ -93,10 +96,12 @@ jobs:
9396
9497
- name: Applitools
9598
run: 'STORYBOOK_SLDS_VERSION=legacy npx eyes-storybook --conf applitools.legacy.config.js' # -u https://${REVIEW_APP_NAME}.herokuapp.com
96-
timeout-minutes: 20
99+
timeout-minutes: 60
100+
env:
101+
NODE_OPTIONS: --openssl-legacy-provider # per https://candid.technology/error-error-0308010c-digital-envelope-routines-unsupported/
97102

98103
vrt-mobile:
99-
if: ${{ github.event.label.name == 'vrt:full-ready'}}
104+
if: contains(fromJSON('["vrt:full-ready", "vrt:mobile-ready"]'), github.event.label.name)
100105
needs: vrt-init
101106
runs-on: ubuntu-latest
102107

@@ -124,11 +129,13 @@ jobs:
124129
125130
- name: Applitools
126131
run: 'STORYBOOK_SLDS_VERSION=mobile npx eyes-storybook --conf applitools.mobile.config.js' # -u https://${REVIEW_APP_NAME}.herokuapp.com
127-
timeout-minutes: 20
132+
timeout-minutes: 60
133+
env:
134+
NODE_OPTIONS: --openssl-legacy-provider # per https://candid.technology/error-error-0308010c-digital-envelope-routines-unsupported/
128135

129136
vrt-wrap:
130137
needs: [vrt-desktop, vrt-legacy, vrt-mobile]
131-
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
138+
if: startsWith(github.event.label.name, 'vrt:') && always() && !cancelled() && !contains(needs.*.result, 'failure')
132139
runs-on: ubuntu-latest
133140
env:
134141
APPLITOOLS_API_KEY: ${{ secrets.APPLITOOLS_API_KEY }}
@@ -150,7 +157,9 @@ jobs:
150157

151158
- name: Dump GitHub context event
152159
id: github_context_event_step
153-
run: echo '${{ toJSON(github.event) }}'
160+
env:
161+
GITHUB_EVENT_CONTEXT: ${{ toJson(github.event) }}
162+
run: echo "$GITHUB_EVENT_CONTEXT"
154163

155164
- name: Show GitHub context
156165
env:
@@ -176,4 +185,4 @@ jobs:
176185
GH_APP_CLIENT_ID: Iv1.6aaf118377862b49
177186
GH_APP_CLIENT_SECRET: ${{ secrets.DSE_CI_CLIENT_SECRET }}
178187
# single quotes are needed around the JSON string here so that is can be parsed by the node script
179-
run: batchesData='${{ steps.applitools_batch.outputs.batches }}' node scripts/ci/pr-checks
188+
run: batchesData='${{ steps.applitools_batch.outputs.batches }}' node scripts/ci/pr-checks

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14
1+
16

RELEASENOTES.general.md

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,53 @@
22
<!-- On release, add general notes here. In time the legacy release notes will be add to this -->
33

44

5+
## 2.21.0 - April 20, 2023
6+
7+
## Fixed
8+
9+
- Update transparency values (rgba and design tokens) with transparent SLDS global styling hooks
10+
- Changed anchor link ouline border black color to blue-50
11+
- Updated background colors for Standard and Actions icons
12+
- Updated icons to `v10.6.0`
13+
- Standard Set:
14+
- Added `bill_of_materials`
15+
- Added `buyer_group_qualifier`
16+
- Added `datashare_target`
17+
- Added `datashares`
18+
- Added `disclosure_and_compliance`
19+
- Added `document_preview`
20+
- Added `facility_bed`
21+
- Added `market`
22+
- Added `price_sheet`
23+
- Added `mulesoft`
24+
25+
- Utility Set:
26+
- Added `add_source`
27+
- Added `app_web_messaging`
28+
- Added `bookmark_stroke`
29+
- Added `buyer_group_qualifier`
30+
- Added `document_preview`
31+
- Added `expired`
32+
- Added `favorite_alt`
33+
- Added `heart`
34+
- Added `hourglass`
35+
- Added `integration`
36+
- Added `market`
37+
- Added `more`
38+
- Added `notification_off`
39+
- Added `notification_snoozed`
40+
- Added `profile_alt`
41+
- Added `promotion_tiers`
42+
- Added `sender_email`
43+
- Added `service_appointment`
44+
- Added `service_report`
45+
- Added `toggle_off`
46+
- Added `toggle_on`
47+
- Added `mulesoft`
48+
549
## 2.20.1 - December 16, 2022
650

7-
- Updated colors for verious components:
51+
- Updated colors for various components:
852
- Button Icons
953
- Carousel
1054
- Checkbox Button

0 commit comments

Comments
 (0)