Skip to content

Commit

Permalink
refactor: remove null check in register.ts options.base
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jsjoeio committed Apr 24, 2021
1 parent 6f2709b commit 83746c8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/browser/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import "./pages/error.css"
import "./pages/global.css"
import "./pages/login.css"

async function registerServiceWorker(): Promise<void> {
export async function registerServiceWorker(): Promise<void> {
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) {
Expand Down
1 change: 0 additions & 1 deletion test/unit/register.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 83746c8

Please sign in to comment.