Skip to content

Commit 1a041e0

Browse files
committed
style(pwa): use 2 spaces indentation for sw.js and swcache.js
1 parent 52084f8 commit 1a041e0

File tree

2 files changed

+88
-90
lines changed

2 files changed

+88
-90
lines changed

assets/js/data/swcache.js

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,48 @@
11
---
22
layout: compress
3-
43
# The list to be cached by PWA
54
---
65

76
const resource = [
8-
/* --- CSS --- */
9-
'{{ "/assets/css/style.css" | relative_url }}',
10-
11-
/* --- PWA --- */
12-
'{{ "/app.js" | relative_url }}',
13-
'{{ "/sw.js" | relative_url }}',
14-
15-
/* --- HTML --- */
16-
'{{ "/index.html" | relative_url }}',
17-
'{{ "/404.html" | relative_url }}',
18-
19-
{% for tab in site.tabs %}
20-
'{{ tab.url | relative_url }}',
21-
{% endfor %}
22-
23-
/* --- Favicons & compressed JS --- */
24-
{% assign cache_list = site.static_files | where: 'swcache', true %}
25-
{% for file in cache_list %}
26-
'{{ file.path | relative_url }}'{%- unless forloop.last -%},{%- endunless -%}
27-
{% endfor %}
7+
/* --- CSS --- */
8+
'{{ "/assets/css/style.css" | relative_url }}',
9+
10+
/* --- PWA --- */
11+
'{{ "/app.js" | relative_url }}',
12+
'{{ "/sw.js" | relative_url }}',
13+
14+
/* --- HTML --- */
15+
'{{ "/index.html" | relative_url }}',
16+
'{{ "/404.html" | relative_url }}',
17+
18+
{% for tab in site.tabs %}
19+
'{{ tab.url | relative_url }}',
20+
{% endfor %}
21+
22+
/* --- Favicons & compressed JS --- */
23+
{% assign cache_list = site.static_files | where: 'swcache', true %}
24+
{% for file in cache_list %}
25+
'{{ file.path | relative_url }}'{%- unless forloop.last -%},{%- endunless -%}
26+
{% endfor %}
2827
];
2928

3029
/* The request url with below domain will be cached */
3130
const allowedDomains = [
32-
{% if site.google_analytics.id != empty and site.google_analytics.id %}
33-
'www.googletagmanager.com',
34-
'www.google-analytics.com',
35-
{% endif %}
31+
{% if site.google_analytics.id != empty and site.google_analytics.id %}
32+
'www.googletagmanager.com',
33+
'www.google-analytics.com',
34+
{% endif %}
3635

37-
'{{ site.url | split: "//" | last }}',
36+
'{{ site.url | split: "//" | last }}',
3837

39-
{% if site.img_cdn contains '//' and site.img_cdn %}
40-
'{{ site.img_cdn | split: '//' | last | split: '/' | first }}',
41-
{% endif %}
38+
{% if site.img_cdn contains '//' and site.img_cdn %}
39+
'{{ site.img_cdn | split: '//' | last | split: '/' | first }}',
40+
{% endif %}
4241

43-
'fonts.gstatic.com',
44-
'fonts.googleapis.com',
45-
'cdn.jsdelivr.net',
46-
'polyfill.io'
42+
'fonts.gstatic.com',
43+
'fonts.googleapis.com',
44+
'cdn.jsdelivr.net',
45+
'polyfill.io'
4746
];
4847

4948
/* Requests that include the following path will be banned */

assets/js/pwa/sw.js

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9,82 +9,81 @@ self.importScripts('{{ "/assets/js/data/swcache.js" | relative_url }}');
99
const cacheName = 'chirpy-{{ "now" | date: "%Y%m%d.%H%M%S" }}';
1010

1111
function verifyDomain(url) {
12-
for (const domain of allowedDomains) {
13-
const regex = RegExp(`^http(s)?:\/\/${domain}\/`);
14-
if (regex.test(url)) {
15-
return true;
16-
}
12+
for (const domain of allowedDomains) {
13+
const regex = RegExp(`^http(s)?:\/\/${domain}\/`);
14+
if (regex.test(url)) {
15+
return true;
1716
}
17+
}
1818

19-
return false;
19+
return false;
2020
}
2121

2222
function isExcluded(url) {
23-
for (const item of denyUrls) {
24-
if (url === item) {
25-
return true;
26-
}
23+
for (const item of denyUrls) {
24+
if (url === item) {
25+
return true;
2726
}
28-
return false;
27+
}
28+
return false;
2929
}
3030

31-
self.addEventListener('install', event => {
32-
event.waitUntil(
33-
caches.open(cacheName).then(cache => {
34-
return cache.addAll(resource);
35-
})
36-
);
31+
self.addEventListener('install', (event) => {
32+
event.waitUntil(
33+
caches.open(cacheName).then((cache) => {
34+
return cache.addAll(resource);
35+
})
36+
);
3737
});
3838

39-
self.addEventListener('activate', event => {
40-
event.waitUntil(
41-
caches.keys().then(keyList => {
42-
return Promise.all(
43-
keyList.map(key => {
44-
if (key !== cacheName) {
45-
return caches.delete(key);
46-
}
47-
})
48-
);
39+
self.addEventListener('activate', (event) => {
40+
event.waitUntil(
41+
caches.keys().then((keyList) => {
42+
return Promise.all(
43+
keyList.map((key) => {
44+
if (key !== cacheName) {
45+
return caches.delete(key);
46+
}
4947
})
50-
);
48+
);
49+
})
50+
);
5151
});
5252

5353
self.addEventListener('message', (event) => {
54-
if (event.data === 'SKIP_WAITING') {
55-
self.skipWaiting();
56-
}
54+
if (event.data === 'SKIP_WAITING') {
55+
self.skipWaiting();
56+
}
5757
});
5858

59-
self.addEventListener('fetch', event => {
60-
event.respondWith(
61-
caches.match(event.request).then(response => {
62-
if (response) {
63-
return response;
64-
}
59+
self.addEventListener('fetch', (event) => {
60+
event.respondWith(
61+
caches.match(event.request).then((response) => {
62+
if (response) {
63+
return response;
64+
}
6565

66-
return fetch(event.request).then(response => {
67-
const url = event.request.url;
66+
return fetch(event.request).then((response) => {
67+
const url = event.request.url;
6868

69-
if (event.request.method !== 'GET' ||
70-
!verifyDomain(url) ||
71-
isExcluded(url)) {
72-
return response;
73-
}
69+
if (
70+
event.request.method !== 'GET' ||
71+
!verifyDomain(url) ||
72+
isExcluded(url)
73+
) {
74+
return response;
75+
}
7476

75-
/*
76-
see: <https://developers.google.com/web/fundamentals/primers/service-workers#cache_and_return_requests>
77-
*/
78-
let responseToCache = response.clone();
77+
/* see: <https://developers.google.com/web/fundamentals/primers/service-workers#cache_and_return_requests> */
78+
let responseToCache = response.clone();
7979

80-
caches.open(cacheName).then(cache => {
81-
/* console.log('[sw] Caching new resource: ' + event.request.url); */
82-
cache.put(event.request, responseToCache);
83-
});
80+
caches.open(cacheName).then((cache) => {
81+
/* console.log('[sw] Caching new resource: ' + event.request.url); */
82+
cache.put(event.request, responseToCache);
83+
});
8484

85-
return response;
86-
});
87-
})
88-
);
85+
return response;
86+
});
87+
})
88+
);
8989
});
90-

0 commit comments

Comments
 (0)