fixup! refactor window -> origin

Author: jsjoeio

src/browser/pages/vscode.ts

@@ -58,7 +58,7 @@ type RegisterRequireOnSelfType = {
   // NOTE@jsjoeio
   // We get the self type by looking at window.self.
   self: Window & typeof globalThis
-  window: Window
+  origin: string
   nlsConfig: NlsConfiguration
   options: Options
 }
@@ -81,15 +81,15 @@ type RequireOnSelfType = {
  * We extracted the logic into a function so that
  * it's easier to test.
  **/
-export function registerRequireOnSelf({ self, window, nlsConfig, options }: RegisterRequireOnSelfType) {
+export function registerRequireOnSelf({ self, origin, nlsConfig, options }: RegisterRequireOnSelfType) {
   const errorMsgPrefix = "[vscode]"
 
   if (!self) {
     throw new Error(`${errorMsgPrefix} Could not register require on self. self is undefined.`)
   }
 
-  if (!window) {
-    throw new Error(`${errorMsgPrefix} Could not register require on self. window is undefined.`)
+  if (!origin) {
+    throw new Error(`${errorMsgPrefix} Could not register require on self. origin is undefined or missing.`)
   }
 
   if (!options || !options.csStaticBase) {
@@ -104,7 +104,7 @@ export function registerRequireOnSelf({ self, window, nlsConfig, options }: Regi
 
   const requireOnSelf: RequireOnSelfType = {
     // Without the full URL VS Code will try to load file://.
-    baseUrl: `${window.location.origin}${options.csStaticBase}/lib/vscode/out`,
+    baseUrl: `${origin}${options.csStaticBase}/lib/vscode/out`,
     recordStats: true,
     paths: {
       "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
@@ -154,9 +154,9 @@ try {
   }
   registerRequireOnSelf({
     self,
-    window,
     nlsConfig,
     options,
+    origin: window.location.origin,
   })
 } catch (error) {
   console.error(error)

test/unit/browser/pages/vscode.test.ts

@@ -241,13 +241,13 @@ describe("vscode", () => {
         availableLanguages: {},
       }
       const errorMsgPrefix = "[vscode]"
-      const errorMessage = `${errorMsgPrefix} Could not register require on self. window is undefined.`
+      const errorMessage = `${errorMsgPrefix} Could not register require on self. origin is undefined or missing.`
       const mockSelf = {} as Window & typeof globalThis
       expect(() => {
         registerRequireOnSelf({
           self: mockSelf,
           // @ts-expect-error We need to test if window is undefined
-          window: undefined,
+          origin: undefined,
           nlsConfig: nlsConfig,
           options,
         })
@@ -271,15 +271,15 @@ describe("vscode", () => {
       expect(() => {
         registerRequireOnSelf({
           self: mockSelf,
-          window: window,
+          origin: "localhost",
           nlsConfig: nlsConfig,
           options,
         })
       }).toThrowError(errorMessage)
       expect(() => {
         registerRequireOnSelf({
           self: mockSelf,
-          window: window,
+          origin: "localhost",
           nlsConfig: nlsConfig,
           // @ts-expect-error We need to check what happens when options is undefined
           options: undefined,
@@ -298,7 +298,7 @@ describe("vscode", () => {
       expect(() => {
         registerRequireOnSelf({
           self: mockSelf,
-          window: window,
+          origin: "localthost",
           // @ts-expect-error We need to check that it works when this is undefined
           nlsConfig: undefined,
           options,
@@ -320,7 +320,7 @@ describe("vscode", () => {
       const mockSelf = {} as Window & typeof globalThis
       registerRequireOnSelf({
         self: mockSelf,
-        window: window,
+        origin: "localthost",
         nlsConfig: nlsConfig,
         options,
       })
@@ -343,7 +343,7 @@ describe("vscode", () => {
       const mockSelf = {} as Window & typeof globalThis
       const didRegister = registerRequireOnSelf({
         self: mockSelf,
-        window: window,
+        origin: "localthost",
         nlsConfig: nlsConfig,
         options,
       })