Skip to content

Commit 9dd81b4

Browse files
authored
Merge branch 'main' into ttomar/asset-migration
2 parents 9b12ba6 + 50ad026 commit 9dd81b4

File tree

23 files changed

+605
-332
lines changed

23 files changed

+605
-332
lines changed

.changeset/funny-eggs-sell.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@spectrum-web-components/overlay': patch
3+
'@spectrum-web-components/core': patch
4+
---
5+
6+
hover overlays should close with the Esc key when trigger is not focused

.changeset/odd-times-give.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@spectrum-web-components/close-button': minor
3+
---
4+
5+
Added visually hidden default slot rendering to sp-close-button so text content is accessible to screen readers while remaining invisible to sighted users.

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ root = true
44
end_of_line = lf
55
indent_style = space
66
indent_size = 4
7-
charset = utf-8
7+
charset = utf-8

.github/scripts/build-preview-urls-comment.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,17 @@ export const buildPreviewURLComment = (prNumber) => {
8282
- [High Contrast Mode | Medium | LTR](${hcmUrl})`);
8383

8484
// Documentation and Storybook URLs
85-
const docsUrl = `${baseUrl}/${prHash}/docs/`;
86-
const storybookUrl = `${baseUrl}/${prHash}/docs/storybook/`;
85+
const docsFirstGenUrl = `${baseUrl}/${prHash}/docs/first-gen-docs/`;
86+
const storybookFirstGenUrl = `${baseUrl}/${prHash}/docs/first-gen-storybook/`;
87+
const storybookSecondGenUrl = `${baseUrl}/${prHash}/docs/second-gen-storybook/`;
8788

88-
let comment = `## 📚 Branch Preview
89+
let comment = `## 📚 Branch Preview Links
8990
90-
- [Documentation Site](${docsUrl})
91-
- [Storybook](${storybookUrl})
91+
- [Documentation Site (first-gen)](${docsFirstGenUrl})
92+
- [Storybook (first-gen)](${storybookFirstGenUrl})
93+
- [Storybook (second-gen)](${storybookSecondGenUrl})
9294
93-
<h3><strong>🔍 Visual Regression Test Results</strong></h3>
95+
<h3><strong>🔍 First Generation Visual Regression Test Results</strong></h3>
9496
9597
When a visual regression test fails (or has previously failed while working on this branch), its results can be found in the following URLs:
9698

.github/workflows/coveralls.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
name: Coveralls Code Coverage
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
8-
branches:
9-
- main
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
1010

1111
jobs:
12-
code-coverage-report:
13-
name: Generate and upload coverage report
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Checkout PR branch
17-
uses: actions/checkout@v4
12+
code-coverage-report:
13+
name: Generate and upload coverage report
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout PR branch
17+
uses: actions/checkout@v4
1818

19-
- name: Setup Job and Install Dependencies
20-
uses: ./.github/actions/setup-job
19+
- name: Setup Job and Install Dependencies
20+
uses: ./.github/actions/setup-job
2121

22-
- name: Install Playwright
23-
run: cd 1st-gen && yarn playwright install --with-deps
22+
- name: Install Playwright
23+
run: cd 1st-gen && yarn playwright install --with-deps
2424

25-
- name: Run unit tests with coverage
26-
run: cd 1st-gen && yarn test:ci --config web-test-runner.config.ci-chromium.js --group coveralls-ci --coverage
27-
continue-on-error: true
25+
- name: Run unit tests with coverage
26+
run: cd 1st-gen && yarn test:ci --config web-test-runner.config.ci-chromium.js --group coveralls-ci --coverage
27+
continue-on-error: true
2828

29-
- name: Upload coverage to Coveralls
30-
uses: coverallsapp/github-action@v2
31-
with:
32-
allow-empty: true
29+
- name: Upload coverage to Coveralls
30+
uses: coverallsapp/github-action@v2
31+
with:
32+
allow-empty: true

0 commit comments

Comments
 (0)