Update VS Code to 1.48.0 (#1982)

e237589f · Asher · GitHub · 98d8d848 · e237589f · db40434f
6 changed file
--- a/ci/dev/vscode.patch
+++ b/ci/dev/vscode.patch
--- a/vscode @ db40434f
+++ b/vscode @ db40434f
-Subproject commit 17299e413d5590b14ab0340ea477cdd86ff13daf
+Subproject commit db40434f562994116e5b21c24015a2e40b2504e6
--- a/package.json
+++ b/package.json
 {
  "name": "code-server",
  "license": "MIT",
-  "version": "3.4.1",
+  "version": "3.5.0",
  "description": "Run VS Code on a remote server.",
  "homepage": "https://github.com/cdr/code-server",
  "bugs": {

--- a/src/browser/pages/vscode.html
+++ b/src/browser/pages/vscode.html
@@ -2,6 +2,11 @@
 <!DOCTYPE html>
 <html>
  <head>
+    <script>
+      globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || []
+      globalThis.MonacoPerformanceMarks.push("renderer/started", Date.now())
+    </script>
+
    <meta charset="utf-8" />

    <meta
@@ -46,6 +51,9 @@
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/pages/vscode.js"></script>
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/register.js"></script>
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
+  <script>
+    globalThis.MonacoPerformanceMarks.push("willLoadWorkbenchMain", Date.now())
+  </script>
  <!-- PROD_ONLY
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.nls.js"></script>
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.js"></script>

--- a/src/browser/pages/vscode.ts
+++ b/src/browser/pages/vscode.ts
@@ -32,6 +32,7 @@ try {

 ;(self.require as any) = {
  baseUrl: `${options.csStaticBase}/lib/vscode/out`,
+  recordStats: true,
  paths: {
    "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
    "vscode-oniguruma": `../node_modules/vscode-oniguruma/release/main`,

--- a/src/node/entry.ts
+++ b/src/node/entry.ts
@@ -2,6 +2,7 @@ import { field, logger } from "@coder/logger"
 import * as cp from "child_process"
 import * as path from "path"
 import { CliMessage } from "../../lib/vscode/src/vs/server/ipc"
+import { plural } from "../common/util"
 import { LoginHttpProvider } from "./app/login"
 import { ProxyHttpProvider } from "./app/proxy"
 import { StaticHttpProvider } from "./app/static"
@@ -12,7 +13,6 @@ import { AuthType, HttpServer, HttpServerOptions } from "./http"
 import { loadPlugins } from "./plugin"
 import { generateCertificate, hash, humanPath, open } from "./util"
 import { ipcMain, wrap } from "./wrapper"
-import { plural } from "../common/util"

 process.on("uncaughtException", (error) => {
  logger.error(`Uncaught exception: ${error.message}`)