Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,26 @@
"source": "**",
"destination": "/index.html"
}
],
"headers": [
{
"source": "**/*.{jpg,jpeg,gif,png,js,css}",
"headers": [
{
"key": "Cache-Control",
"value": "public, max-age=2592000"
}
]
},
{
"source": "index.html",
"headers": [
{
"key": "Cache-Control",
"value": "public, max-age=2592000"
}
]
}
]
},
"firestore": {
Expand Down
16 changes: 8 additions & 8 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
<div id="main" role="main">
</div>
<script async defer type="module" src="/main.js"></script>
<!-- <script>-->
<!-- if ('serviceWorker' in navigator) {-->
<!-- navigator.serviceWorker-->
<!-- .register('/serviceWorker.js')-->
<!-- .then(() => console.log('Service Worker Registered'))-->
<!-- .catch(err => console.error('Error registering service worker:', err))-->
<!-- }-->
<!-- </script>-->
<script>
if ('serviceWorker' in navigator) {
navigator.serviceWorker
.register('/serviceWorker.js')
.then(() => console.log('Service Worker Registered'))
.catch(err => console.error('Error registering service worker:', err))
}
</script>
</body>
<noscript>
Please enable JavaScript in order for your browser to view the content of this page.
Expand Down
30 changes: 21 additions & 9 deletions public/serviceWorker.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
const CACHE_NAME = 'v1'
const CACHE_NAME = 'v2'
const urlsToCache = [
'.',
'/',
'/assets/img/CreamLogo.png',
'/client/styles/button.js',
'/client/styles/contact.js',
'/client/styles/GlobalStyles.js',
'/client/styles/work.js',
'main.bundle.js',
'index.html',
'/main.js',
'/index.html',
'https://fonts.googleapis.com/css?family=Open+Sans:300,800',
]

// https://stackoverflow.com/a/70863551
const containsChromeExtension = ({ url }) =>
url.startsWith('chrome-extension') ||
url.includes('extension') ||
url.startsWith('http')
!url.startsWith('http')

self.addEventListener('install', evt => {
self.skipWaiting()

// Perform install steps
evt.waitUntil(
caches.open(CACHE_NAME).then(cache => {
Expand All @@ -27,6 +25,20 @@ self.addEventListener('install', evt => {
)
})

self.addEventListener('activate', evt => {
// Clean up old caches
evt.waitUntil(
caches
.keys()
.then(keys =>
Promise.all(
keys.filter(key => key !== CACHE_NAME).map(key => caches.delete(key))
)
)
.then(() => self.clients.claim())
)
})

self.addEventListener('fetch', evt => {
if (containsChromeExtension(evt.request)) {
return
Expand Down