a
/
code-server-2
mirror of https://git.tuxpa.in/a/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Joe Previte 2021-04-23 16:32:12 -07:00
parent 6f2709bcaa
commit 83746c8a1f
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/browser/register.ts
View File

@ -4,12 +4,12 @@ import "./pages/error.css"
import "./pages/global.css" import "./pages/global.css"
import "./pages/login.css" import "./pages/login.css"
async function registerServiceWorker(): Promise<void> { export async function registerServiceWorker(): Promise<void> {
const options = getOptions() const options = getOptions()
const path = normalize(`${options.csStaticBase}/dist/serviceWorker.js`) const path = normalize(`${options.csStaticBase}/dist/serviceWorker.js`)
try { try {
await navigator.serviceWorker.register(path, { await navigator.serviceWorker.register(path, {
scope: (options.base ?? "") + "/", scope: options.base + "/",
}) })
console.log("[Service Worker] registered") console.log("[Service Worker] registered")
} catch (error) { } catch (error) {

1
test/unit/register.test.ts
View File

@ -105,7 +105,6 @@ describe("register", () => {
const location: LocationLike = { const location: LocationLike = {
pathname: "", pathname: "",
origin: "http://localhost:8080", origin: "http://localhost:8080",
// search: "?environmentId=600e0187-0909d8a00cb0a394720d4dce",
} }
const { window } = new JSDOM() const { window } = new JSDOM()
global.window = (window as unknown) as Window & typeof globalThis global.window = (window as unknown) as Window & typeof globalThis