chore(vscode): update to latest fork

Author: jsjoeio

src/common/util.ts

@@ -1,3 +1,5 @@
+import { ClientConfiguration } from "../node/http"
+
 /**
  * Split a string up to the delimiter. If the delimiter doesn't exist the first
  * item will have all the text and the second item will be an empty string.
@@ -53,7 +55,7 @@ export const resolveBase = (base?: string): string => {
 /**
  * Get client-side configuration embedded in the HTML or query params.
  */
-export const getClientConfiguration = <T extends CodeServerLib.ClientConfiguration>(): T => {
+export const getClientConfiguration = <T extends ClientConfiguration>(): T => {
   let config: T
   try {
     config = JSON.parse(document.getElementById("coder-options")!.getAttribute("data-settings")!)

src/node/http.ts

@@ -10,6 +10,15 @@ import { version as codeServerVersion } from "./constants"
 import { Heart } from "./heart"
 import { getPasswordMethod, IsCookieValidArgs, isCookieValid, sanitizeString, escapeHtml, escapeJSON } from "./util"
 
+/**
+ * Base options included on every page.
+ */
+export interface ClientConfiguration {
+  codeServerVersion: string
+  base: string
+  csStaticBase: string
+}
+
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Express {
@@ -20,7 +29,7 @@ declare global {
   }
 }
 
-export const createClientConfiguration = (req: express.Request): CodeServerLib.ClientConfiguration => {
+export const createClientConfiguration = (req: express.Request): ClientConfiguration => {
   const base = relativeRoot(req)
 
   return {
@@ -38,7 +47,7 @@ export const replaceTemplates = <T extends object>(
   content: string,
   extraOpts?: Omit<T, "base" | "csStaticBase" | "logLevel">,
 ): string => {
-  const serverOptions: CodeServerLib.ClientConfiguration = {
+  const serverOptions: ClientConfiguration = {
     ...createClientConfiguration(req),
     ...extraOpts,
   }

vendor/package.json

@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "cdr/vscode#65b2462c212d415fbf521489307e58e5b691818b"
+    "code-oss-dev": "cdr/vscode#f3bb8843b16719989eaa74ada0992cab87a3d4a2"
   }
 }

vendor/yarn.lock

@@ -296,9 +296,9 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-code-oss-dev@cdr/vscode#65b2462c212d415fbf521489307e58e5b691818b:
+code-oss-dev@cdr/vscode#f3bb8843b16719989eaa74ada0992cab87a3d4a2:
   version "1.60.2"
-  resolved "https://codeload.github.com/cdr/vscode/tar.gz/65b2462c212d415fbf521489307e58e5b691818b"
+  resolved "https://codeload.github.com/cdr/vscode/tar.gz/f3bb8843b16719989eaa74ada0992cab87a3d4a2"
   dependencies:
     "@microsoft/applicationinsights-web" "^2.6.4"
     "@vscode/sqlite3" "4.0.12"