wip!

Author: jsjoeio

src/browser/pages/vscode.ts

@@ -24,13 +24,13 @@ type NlsConfiguration = {
  * Helper function to create the path to the bundle
  * for getNlsConfiguration.
  */
-export function createBundlePath(_resolvedLanguagePackCoreLocation: string, bundle: string) {
+export function createBundlePath(_resolvedLanguagePackCoreLocation: string | undefined, bundle: string) {
   // NOTE@jsjoeio - this comment was here before me
   // Refers to operating systems that use a different path separator.
   // Probably just Windows but we're not sure if "/" breaks on Windows
   // so we'll leave it alone for now.
   // FIXME: Only works if path separators are /.
-  return _resolvedLanguagePackCoreLocation + "/" + bundle.replace(/\//g, "!") + ".nls.json"
+  return (_resolvedLanguagePackCoreLocation || "") + "/" + bundle.replace(/\//g, "!") + ".nls.json"
 }
 
 /**
@@ -80,7 +80,7 @@ export function getNlsConfiguration(_document: Document, base: string) {
       }
       // FIXME: Only works if path separators are /.
       try {
-        const path = createBundlePath(nlsConfig._resolvedLanguagePackCoreLocation || "", bundle)
+        const path = createBundlePath(nlsConfig._resolvedLanguagePackCoreLocation, bundle)
         const response = await fetch(`${base}/vscode/resource/?path=${encodeURIComponent(path)}`)
         const json = await response.json()
         bundles[bundle] = json

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

@@ -115,6 +115,13 @@ describe("vscode", () => {
       const actual = createBundlePath(_resolvedLangaugePackCoreLocation, bundle)
       expect(actual).toBe(expected)
     })
+    it("should return the correct path (even if _resolvedLangaugePackCoreLocation is undefined)", () => {
+      const _resolvedLangaugePackCoreLocation = undefined
+      const bundle = "/bundle.js"
+      const expected = "/!bundle.js.nls.json"
+      const actual = createBundlePath(_resolvedLangaugePackCoreLocation, bundle)
+      expect(actual).toBe(expected)
+    })
   })
   describe("setBodyBackgroundToThemeBackgroundColor", () => {
     let _document: Document
@@ -310,7 +317,7 @@ describe("vscode", () => {
       expect(loader.trustedTypesPolicy.name).toBe("amdLoader")
 
       const scriptUrl = loader.trustedTypesPolicy.createScriptURL("http://localhost/foo.js")
-      expect(scriptUrl).toBe("/foo.js")
+      expect(scriptUrl).toBe("http://localhost/foo.js")
     })
   })
   describe("_createScriptURL", () => {