bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update VS Code to 1.48.0 (#1982)

This commit is contained in:
Asher 2020-08-25 13:06:41 -05:00 committed by GitHub
parent 98d8d848a5
commit e237589f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 247 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

596
ci/dev/vscode.patch
View File

File diff suppressed because it is too large Load Diff

2
lib/vscode

@ -1 +1 @@
Subproject commit 17299e413d5590b14ab0340ea477cdd86ff13daf Subproject commit db40434f562994116e5b21c24015a2e40b2504e6

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "code-server", "name": "code-server",
"license": "MIT", "license": "MIT",
"version": "3.4.1", "version": "3.5.0",
"description": "Run VS Code on a remote server.", "description": "Run VS Code on a remote server.",
"homepage": "https://github.com/cdr/code-server", "homepage": "https://github.com/cdr/code-server",
"bugs": { "bugs": {

8
src/browser/pages/vscode.html
View File

@ -2,6 +2,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<script>
globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || []
globalThis.MonacoPerformanceMarks.push("renderer/started", Date.now())
</script>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta <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/pages/vscode.js"></script>
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/register.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 data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
<script>
globalThis.MonacoPerformanceMarks.push("willLoadWorkbenchMain", Date.now())
</script>
<!-- PROD_ONLY <!-- 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.nls.js"></script>
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.js"></script> <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.js"></script>

1
src/browser/pages/vscode.ts
View File

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

2
src/node/entry.ts
View File

@ -2,6 +2,7 @@ import { field, logger } from "@coder/logger"
import * as cp from "child_process" import * as cp from "child_process"
import * as path from "path" import * as path from "path"
import { CliMessage } from "../../lib/vscode/src/vs/server/ipc" import { CliMessage } from "../../lib/vscode/src/vs/server/ipc"
import { plural } from "../common/util"
import { LoginHttpProvider } from "./app/login" import { LoginHttpProvider } from "./app/login"
import { ProxyHttpProvider } from "./app/proxy" import { ProxyHttpProvider } from "./app/proxy"
import { StaticHttpProvider } from "./app/static" import { StaticHttpProvider } from "./app/static"
@ -12,7 +13,6 @@ import { AuthType, HttpServer, HttpServerOptions } from "./http"
import { loadPlugins } from "./plugin" import { loadPlugins } from "./plugin"
import { generateCertificate, hash, humanPath, open } from "./util" import { generateCertificate, hash, humanPath, open } from "./util"
import { ipcMain, wrap } from "./wrapper" import { ipcMain, wrap } from "./wrapper"
import { plural } from "../common/util"
process.on("uncaughtException", (error) => { process.on("uncaughtException", (error) => {
logger.error(`Uncaught exception: ${error.message}`) logger.error(`Uncaught exception: ${error.message}`)