Merge branch 'master' into master

shayne · web-flow · commit 6f388e72b638 · 2020-08-25T11:37:50.000-07:00
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url: https://github.com/cdr/code-server/discussions/new?category_id=22503114
+    about: Ask the community for help
diff --git a/.github/issue_template.md b/.github/issue_template.md
diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch
diff --git a/doc/FAQ.md b/doc/FAQ.md
@@ -30,9 +30,7 @@
 
 ## Questions?
 
-Please file all questions and support requests at https://www.reddit.com/r/codeserver/.
-
-The issue tracker is **only** for bugs and features.
+Please file all questions and support requests at https://github.com/cdr/code-server/discussions.
 
 ## How can I reuse my VS Code configuration?
 
diff --git a/lib/vscode b/lib/vscode
@@ -1 +1 @@
-Subproject commit 17299e413d5590b14ab0340ea477cdd86ff13daf
+Subproject commit db40434f562994116e5b21c24015a2e40b2504e6
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "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": {
diff --git 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>
diff --git 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`,
diff --git a/src/node/entry.ts b/src/node/entry.ts
@@ -4,6 +4,7 @@ import { promises as fs } from "fs"
 import http from "http"
 import * as path from "path"
 import { CliMessage, OpenCommandPipeArgs } 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"
@@ -14,7 +15,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}`)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "code-server",`
`3`	`3`	`"license": "MIT",`
`4`		`- "version": "3.4.1",`
	`4`	`+ "version": "3.5.0",`
`5`	`5`	`"description": "Run VS Code on a remote server.",`
`6`	`6`	`"homepage": "https://github.com/cdr/code-server",`
`7`	`7`	`"bugs": {`