Skip to content

Commit dfd7a18

Browse files
authored
chore(merge): 2.18.1 Summer 22 ➡️ Winter 23 (#5064)
2 parents 3f8cdab + e672caf commit dfd7a18

File tree

8 files changed

+27
-32
lines changed

8 files changed

+27
-32
lines changed

.circleci/config.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -445,11 +445,6 @@ jobs:
445445
export PUBLISH_STORYBOOK_TO=${HEROKU_RELEASE_STORYBOOK_APP_NAME}
446446
else
447447
export PUBLISH_STORYBOOK_TO=${REVIEW_APP_NAME}
448-
export EXISTING_REVIEW_APP=$(heroku apps:info -a ${REVIEW_APP_NAME} --json | jq -r ".app.name")
449-
if [[ ${EXISTING_REVIEW_APP} == "" ]]; then
450-
heroku apps:create ${REVIEW_APP_NAME} -t sfdc-uxe-slds
451-
heroku pipelines:add slds -a ${REVIEW_APP_NAME} -s development
452-
fi
453448
fi
454449
echo "=============================="
455450
echo ${PUBLISH_STORYBOOK_TO}
@@ -467,11 +462,6 @@ jobs:
467462
gh api ${STATUS_URL} -f state=success -f environment_url=${SITE_URL} -H "Accept: application/vnd.github.ant-man-preview+json"
468463
done
469464
470-
- run:
471-
name: Create comment with link to review app
472-
command: |
473-
gh api --method POST -H "Accept: application/vnd.github.v3+json" /repos/salesforce-ux/design-system-internal/issues/${PR_NUMBER}/comments -f body="[Storybook Review app](https://${REVIEW_APP_NAME}.herokuapp.com) is ready for [${CIRCLE_SHA1}](https://github.com/salesforce-ux/design-system-internal/commit/${CIRCLE_SHA1})"
474-
475465
# Build & publish SLDS site (review app or upcoming/core-main/core-patch)
476466
publish-site:
477467
executor: slds-executor
@@ -527,11 +517,6 @@ jobs:
527517
echo "=============================="
528518
echo ${HEROKU_APP_NAME}
529519
echo "=============================="
530-
export EXISTING_REVIEW_APP=$(heroku apps:info -a ${HEROKU_APP_NAME} --json | jq -r ".app.name")
531-
if [[ ${EXISTING_REVIEW_APP} == "" ]]; then
532-
heroku apps:create ${HEROKU_APP_NAME} -t sfdc-uxe-slds
533-
heroku pipelines:add slds-site-previews -a ${HEROKU_APP_NAME} -s development
534-
fi
535520
heroku buildpacks -a ${HEROKU_APP_NAME} | 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 ${HEROKU_APP_NAME}
536521
heroku builds:create --source-tar site-next.tar.gz -a ${HEROKU_APP_NAME}
537522
@@ -545,14 +530,6 @@ jobs:
545530
gh api ${STATUS_URL} -f state=success -f environment_url=${SITE_URL} -H "Accept: application/vnd.github.ant-man-preview+json"
546531
done
547532
548-
- set-github-pr-number
549-
- run:
550-
name: Create comment with link to review app
551-
command: |
552-
export HEROKU_APP_NAME=$(cat workspace/heroku-app-name.txt)
553-
554-
gh api --method POST -H "Accept: application/vnd.github.v3+json" /repos/salesforce-ux/design-system-internal/issues/${PR_NUMBER}/comments -f body="[SLDS Site Review app](https://${HEROKU_APP_NAME}.herokuapp.com) is ready for [${CIRCLE_SHA1}](https://github.com/salesforce-ux/design-system-internal/commit/${CIRCLE_SHA1})"
555-
556533
vrt-init:
557534
executor: slds-executor
558535
resource_class: small

RELEASENOTES.general.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
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 -->
33

4+
## 2.18.1 - June 22, 2022
5+
6+
- Corrected typos in blueprints:
7+
- components/checkbox
8+
- components/vertical-navigation
9+
410
## 2.18.0 - May 6, 2022
511

612
- Removed `&_` shorthand from numerous selectors in SCSS files

RELEASENOTES.md

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

4-
## Release 2.19.0 - June 1, 2022
4+
## Release 2.19.0 - June 22, 2022
55

66
## Components
77
### [Dynamic Icons](https://www.lightningdesignsystem.com/components/dynamic-icons)
@@ -16,6 +16,12 @@
1616
#### Added
1717
- Added `role="img"` to unread indicator dot to comply with accessibility usage rules for `aria-label`
1818

19+
## Release 2.18.1 - June 22, 2022
20+
21+
- Corrected typos in blueprints:
22+
- components/checkbox
23+
- components/vertical-navigation
24+
1925
## Release 2.18.0 - May 6, 2022
2026

2127
- Removed `&_` shorthand from numerous selectors in SCSS files

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"CSS"
99
],
1010
"homepage": "https://lightningdesignsystem.com",
11-
"version": "2.18.0",
11+
"version": "2.18.1",
1212
"author": "Salesforce",
1313
"bugs": {
1414
"url": "https://github.com/salesforce-ux/design-system/issues"

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.18.0";
12+
$app-version: "2.18.1";
1313

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

ui/components/checkbox/base/example.jsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ const errorId = 'error_01';
1717
/// ////////////////////////////////////////
1818

1919
let Fieldset = props => (
20-
<fieldset className={classNames('slds-form-element', props.className)}>
20+
<fieldset
21+
className={classNames(
22+
'slds-form-element',
23+
{ 'slds-is-required': props.required },
24+
props.className
25+
)}
26+
>
2127
{props.children}
2228
</fieldset>
2329
);
@@ -144,7 +150,7 @@ export let Group = props => (
144150
);
145151

146152
export let GroupRequired = props => (
147-
<Fieldset>
153+
<Fieldset required>
148154
<Legend>
149155
<abbr className="slds-required" title="required">
150156
*
@@ -159,7 +165,7 @@ export let GroupRequired = props => (
159165
);
160166

161167
export let GroupError = props => (
162-
<Fieldset className="slds-has-error">
168+
<Fieldset required className="slds-has-error">
163169
<Legend>
164170
<abbr className="slds-required" title="required">
165171
*

ui/components/vertical-navigation/quickfind/example.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default [
3030
hasHiddenLabel
3131
>
3232
<SvgIcon
33-
className="slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default"
33+
className="slds-icon slds-input__icon slds-input__icon_left slds-icon-text-default"
3434
sprite="utility"
3535
symbol="search"
3636
/>

0 commit comments

Comments
 (0)