From 11aac90be43f1df88798f6f797d012a385b987c3 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Fri, 16 Apr 2021 19:21:18 +0200 Subject: [PATCH] Remove serviceWorker --- ui/serve.go | 1 - ui/src/index.tsx | 4 +- ui/src/registerServiceWorker.ts | 111 -------------------------------- 3 files changed, 2 insertions(+), 114 deletions(-) diff --git a/ui/serve.go b/ui/serve.go index e4b01090d..f67a9e172 100644 --- a/ui/serve.go +++ b/ui/serve.go @@ -16,7 +16,6 @@ func Register(r *gin.Engine) { ui.GET("/", serveFile("index.html", "text/html")) ui.GET("/index.html", serveFile("index.html", "text/html")) ui.GET("/manifest.json", serveFile("manifest.json", "application/json")) - ui.GET("/service-worker.js", serveFile("service-worker.js", "text/javascript")) ui.GET("/assets-manifest.json", serveFile("asserts-manifest.json", "application/json")) ui.GET("/static/*any", gin.WrapH(http.FileServer(box))) } diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 061b07620..5b2cc043d 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -4,7 +4,7 @@ import 'typeface-roboto'; import {initAxios} from './apiAuth'; import * as config from './config'; import Layout from './layout/Layout'; -import registerServiceWorker from './registerServiceWorker'; +import {unregister} from './registerServiceWorker'; import {CurrentUser} from './CurrentUser'; import {AppStore} from './application/AppStore'; import {WebSocketStore} from './message/WebSocketStore'; @@ -83,5 +83,5 @@ const initStores = (): StoreMapping => { , document.getElementById('root') ); - registerServiceWorker(); + unregister(); })(); diff --git a/ui/src/registerServiceWorker.ts b/ui/src/registerServiceWorker.ts index eabfe4791..69277f634 100644 --- a/ui/src/registerServiceWorker.ts +++ b/ui/src/registerServiceWorker.ts @@ -1,114 +1,3 @@ -// In production, we register a service worker to serve assets from local cache. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on the 'N+1' visit to a page, since previously -// cached resources are updated in the background. - -// To learn more about the benefits of this model, read https://goo.gl/KwvDNy. -// This link also includes instructions on opting out of this behavior. - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.1/8 is considered localhost for IPv4. - window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/) -); - -export default function register() { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL!, window.location.toString()); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (isLocalhost) { - // This is running on localhost. Lets check if a service worker still exists or not. - checkValidServiceWorker(swUrl); - - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://goo.gl/SC7cgQ' - ); - }); - } else { - // Is not local host. Just register service worker - registerValidSW(swUrl); - } - }); - } -} - -function registerValidSW(swUrl: string) { - if (!window.location.href.match('^([^/]*\\/)(.*\\.js|.*.html|static\\/.*|)$')) { - return; - } - navigator.serviceWorker - .register(swUrl) - .then((registration) => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker) { - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the old content will have been purged and - // the fresh content will have been added to the cache. - // It's the perfect time to display a 'New content is - // available; please refresh.' message in your web app. - console.log('New content is available; please refresh.'); - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // 'Content is cached for offline use.' message. - console.log('Content is cached for offline use.'); - } - } - }; - } - }; - }) - .catch((error) => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl: string) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl) - .then((response) => { - // Ensure service worker exists, and that we really are getting a JS file. - if ( - response.status === 404 || - response.headers.get('content-type')!.indexOf('javascript') === -1 - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then((registration) => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl); - } - }) - .catch(() => { - console.log('No internet connection found. App is running in offline mode.'); - }); -} - export function unregister() { if ('serviceWorker' in navigator) { navigator.serviceWorker.ready.then((registration) => {