From 83746c8a1f5cd97413829ec7618636ef97480cf7 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 23 Apr 2021 16:32:12 -0700 Subject: [PATCH] refactor: remove null check in register.ts options.base Inside registerServiceWorker, we were originally using the nullash coalescing operator to check if options.base was null or undefined. However, I realized this check is not necessary. If you look at getOptions' return value, we return an object with a key "base" which is of type "string". We get that value by calling resolveBase which always returns a string. As a result, we didn't need to check if options.base was null or undefined because it never can be. --- src/browser/register.ts | 4 ++-- test/unit/register.test.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/browser/register.ts b/src/browser/register.ts index 1079d159e..e99d64c6d 100644 --- a/src/browser/register.ts +++ b/src/browser/register.ts @@ -4,12 +4,12 @@ import "./pages/error.css" import "./pages/global.css" import "./pages/login.css" -async function registerServiceWorker(): Promise { +export async function registerServiceWorker(): Promise { const options = getOptions() const path = normalize(`${options.csStaticBase}/dist/serviceWorker.js`) try { await navigator.serviceWorker.register(path, { - scope: (options.base ?? "") + "/", + scope: options.base + "/", }) console.log("[Service Worker] registered") } catch (error) { diff --git a/test/unit/register.test.ts b/test/unit/register.test.ts index c163e0a5c..b845aab58 100644 --- a/test/unit/register.test.ts +++ b/test/unit/register.test.ts @@ -105,7 +105,6 @@ describe("register", () => { const location: LocationLike = { pathname: "", origin: "http://localhost:8080", - // search: "?environmentId=600e0187-0909d8a00cb0a394720d4dce", } const { window } = new JSDOM() global.window = (window as unknown) as Window & typeof globalThis