Skip to content

Commit 2e968bc

Browse files
authored
Merge branch 'main' into xmr/ci
2 parents 21454fe + 2f3ca4f commit 2e968bc

File tree

3 files changed

+42
-30
lines changed

3 files changed

+42
-30
lines changed

.github/workflows/codeql.yml

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
branches:
1111
- main
1212
- live
13+
- "!dependabot/**"
1314
schedule:
1415
- cron: "0 0 * * 0"
1516
workflow_dispatch:
@@ -33,6 +34,12 @@ jobs:
3334
uses: github/codeql-action/init@v2
3435
with:
3536
languages: "javascript"
37+
queries: +security-and-quality
38+
39+
- name: Autobuild
40+
uses: github/codeql-action/autobuild@v2
3641

3742
- name: Perform CodeQL Analysis
3843
uses: github/codeql-action/analyze@v2
44+
with:
45+
category: "/language:javascript"

package-lock.json

+24-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/sw/index.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,17 @@ addEventListener('activate', (event) => {
4444
event.waitUntil(
4545
(async () => {
4646
// remove caches beginning "svgomg-" that aren't in expectedCaches
47-
for (const cacheName of await caches.keys()) {
48-
if (!cacheName.startsWith(cachePrefix)) continue;
49-
// TODO: switch to Promise.all
50-
// eslint-disable-next-line no-await-in-loop
51-
if (!expectedCaches.has(cacheName)) await caches.delete(cacheName);
52-
}
47+
const cacheNames = await caches.keys();
48+
49+
await Promise.all(
50+
cacheNames
51+
.filter(
52+
(cacheName) =>
53+
cacheName.startsWith(cachePrefix) &&
54+
!expectedCaches.has(cacheName),
55+
)
56+
.map((cacheName) => caches.delete(cacheName)),
57+
);
5358

5459
await storage.set('active-version', version);
5560
})(),

0 commit comments

Comments
 (0)