Skip to content

Commit b343d4e

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents bc18079 + f454380 commit b343d4e

File tree

143 files changed

+4040
-3604
lines changed

Some content is hidden

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

143 files changed

+4040
-3604
lines changed

.github/workflows/authors-and-third-party-notices.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
run: npm run update-third-party-notices
4545

4646
- name: Create Pull Request
47+
id: cpr
4748
uses: peter-evans/create-pull-request@v6
4849
with:
4950
commit-message: Update report

.github/workflows/update-electron.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
run: |
2525
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
2626
git config --local user.name "github-actions[bot]"
27-
- uses: actions/setup-node@v2
27+
- uses: actions/setup-node@v3
2828
with:
29-
node-version: ^16.20.2
29+
node-version: 18.19.1
3030
cache: 'npm'
3131

32-
- name: Install npm@8.19.4
32+
- name: Install npm@10.2.4
3333
run: |
34-
npm install -g npm@8.19.4
34+
npm install -g npm@10.2.4
3535
- name: Install Dependencies
3636
run: |
3737
npm -v
@@ -43,7 +43,7 @@ jobs:
4343
git commit --no-allow-empty -m "chore: update electron" || true
4444
- name: Create Pull Request
4545
id: cpr
46-
uses: peter-evans/create-pull-request@v4
46+
uses: peter-evans/create-pull-request@v6
4747
with:
4848
token: ${{ secrets.SVC_DEVTOOLSBOT_TOKEN }}
4949
commit-message: 'chore: update electron'

THIRD-PARTY-NOTICES.md

Lines changed: 116 additions & 109 deletions
Large diffs are not rendered by default.

configs/mocha-config-compass/register/jsdom-extra-mocks-register.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,33 @@ if (!window.matchMedia) {
1212
};
1313
};
1414
}
15+
16+
/**
17+
* NB: tabbable requires special overrides to work in jsdom environments as per
18+
* documentation
19+
*
20+
* @see {@link https://github.com/focus-trap/tabbable?tab=readme-ov-file#testing-in-jsdom}
21+
*/
22+
const tabbable = require('tabbable');
23+
24+
const origTabbable = { ...tabbable };
25+
26+
Object.assign(tabbable, {
27+
tabbable: (node, options) =>
28+
origTabbable.tabbable(node, { ...options, displayCheck: 'none' }),
29+
focusable: (node, options) =>
30+
origTabbable.focusable(node, { ...options, displayCheck: 'none' }),
31+
isFocusable: (node, options) =>
32+
origTabbable.isFocusable(node, { ...options, displayCheck: 'none' }),
33+
isTabbable: (node, options) =>
34+
origTabbable.isTabbable(node, { ...options, displayCheck: 'none' }),
35+
});
36+
37+
// leafygreen (through `clipboard` library) uses deprecated API check that is
38+
// not working in jsdom if copy / paste APIs are supported
39+
if (!window.document.queryCommandSupported) {
40+
window.document.queryCommandSupported =
41+
globalThis.document.queryCommandSupported = function (command) {
42+
return ['copy', 'cut'].includes(command);
43+
};
44+
}

0 commit comments

Comments
 (0)