Skip to content

Commit e6d1f2a

Browse files
code-ashercode-asher
committed
Update VS Code to 1.41.0
1 parent 44c4722 commit e6d1f2a

File tree

15 files changed

+337
-350
lines changed

15 files changed

+337
-350
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66

77
before_install:
88
- export MAJOR_VERSION="2"
9-
- export VSCODE_VERSION="1.39.2"
9+
- export VSCODE_VERSION="1.41.0"
1010
- export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
1111
- export TAG="$VERSION-vsc$VSCODE_VERSION"
1212
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ Our changes include:
174174
- Modify the loader, websocket, webview, service worker, and asset requests to
175175
use the URL of the page as a base (and TLS if necessary for the websocket).
176176
- Send client-side telemetry through the server.
177-
- Add an upload service along with a file prefix to ignore for temporary files
178-
created during upload.
179177
- Make changing the display language work.
180178
- Make it possible for us to load code on the client.
181179
- Make extensions work in the browser.

‎scripts/build.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -339,26 +339,6 @@ class Builder {
339339
]);
340340
});
341341

342-
// onigasm 2.2.2 has a bug that makes it broken for PHP files so use 2.2.1.
343-
// https://github.com/NeekSandhu/onigasm/issues/17
344-
await this.task("Applying onigasm PHP fix", async () => {
345-
const onigasmPath = path.join(finalBuildPath, "node_modules/onigasm-umd");
346-
const onigasmTmpPath = `${onigasmPath}-temp`;
347-
await Promise.all([
348-
fs.remove(onigasmPath),
349-
fs.mkdir(onigasmTmpPath),
350-
]);
351-
await util.promisify(cp.exec)(`git clone "https://github.com/alexandrudima/onigasm-umd" "${onigasmPath}"`);
352-
await util.promisify(cp.exec)("yarn", { cwd: onigasmPath });
353-
await util.promisify(cp.exec)("yarn add --dev [email protected]", { cwd: onigasmPath });
354-
await util.promisify(cp.exec)("yarn package", { cwd: onigasmPath });
355-
await Promise.all(["release", "LICENSE", "package.json"].map((fileName) => {
356-
return fs.copy(path.join(onigasmPath, fileName), path.join(onigasmTmpPath, fileName));
357-
}));
358-
await fs.remove(onigasmPath);
359-
await fs.move(onigasmTmpPath, onigasmPath);
360-
});
361-
362342
this.log(`Final build: ${finalBuildPath}`);
363343
}
364344

‎scripts/vscode.patch

Lines changed: 173 additions & 210 deletions
Large diffs are not rendered by default.

‎src/browser/api.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { ITelemetryService } from "vs/platform/telemetry/common/telemetry";
2121
import { IThemeService } from "vs/platform/theme/common/themeService";
2222
import { IWorkspaceContextService } from "vs/platform/workspace/common/workspace";
2323
import * as extHostTypes from "vs/workbench/api/common/extHostTypes";
24-
import { CustomTreeView, CustomTreeViewPanel } from "vs/workbench/browser/parts/views/customView";
24+
import { CustomTreeView, CustomTreeViewPane } from "vs/workbench/browser/parts/views/customView";
2525
import { ViewContainerViewlet } from "vs/workbench/browser/parts/views/viewsViewlet";
2626
import { Extensions as ViewletExtensions, ShowViewletAction, ViewletDescriptor, ViewletRegistry } from "vs/workbench/browser/viewlet";
2727
import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from "vs/workbench/common/actions";
@@ -120,11 +120,11 @@ export const coderApi = (serviceCollection: ServiceCollection): CoderApi => {
120120
}
121121

122122
Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(
123-
new ViewletDescriptor(CustomViewlet as any, id, containerName, cssClass, undefined, URI.parse(icon)),
123+
ViewletDescriptor.create(CustomViewlet as any, id, containerName, cssClass, undefined, URI.parse(icon)),
124124
);
125125

126126
Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions).registerWorkbenchAction(
127-
new SyncActionDescriptor(OpenCustomViewletAction as any, id, localize("showViewlet", "Show {0}", containerName)),
127+
SyncActionDescriptor.create(OpenCustomViewletAction as any, id, localize("showViewlet", "Show {0}", containerName)),
128128
"View: Show {0}",
129129
localize("view", "View"),
130130
);
@@ -137,7 +137,7 @@ export const coderApi = (serviceCollection: ServiceCollection): CoderApi => {
137137
Registry.as<IViewsRegistry>(ViewsExtensions.ViewsRegistry).registerViews([{
138138
id: viewId,
139139
name: viewName,
140-
ctorDescriptor: { ctor: CustomTreeViewPanel },
140+
ctorDescriptor: { ctor: CustomTreeViewPane },
141141
treeView: getService(IInstantiationService).createInstance(CustomTreeView as any, viewId, container),
142142
}] as ITreeViewDescriptor[], container);
143143
},
@@ -286,8 +286,8 @@ class StatusBarEntry implements vscode.StatusBarItem {
286286

287287
private _id: number;
288288
private entry: IStatusBarEntry;
289-
private visible: boolean;
290-
private disposed: boolean;
289+
private visible?: boolean;
290+
private disposed?: boolean;
291291
private statusId: string;
292292
private statusName: string;
293293
private accessor?: IStatusbarEntryAccessor;

‎src/browser/extHostNodeProxy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Emitter } from "vs/base/common/event";
2-
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
2+
import { createDecorator } from "vs/platform/instantiation/common/instantiation";
33
import { ExtHostNodeProxyShape, MainContext, MainThreadNodeProxyShape } from "vs/workbench/api/common/extHost.protocol";
44
import { IExtHostRpcService } from "vs/workbench/api/common/extHostRpcService";
55

@@ -43,4 +43,4 @@ export class ExtHostNodeProxy implements ExtHostNodeProxyShape {
4343
}
4444

4545
export interface IExtHostNodeProxy extends ExtHostNodeProxy { }
46-
export const IExtHostNodeProxy = createDecorator<IExtHostNodeProxy>('IExtHostNodeProxy');
46+
export const IExtHostNodeProxy = createDecorator<IExtHostNodeProxy>("IExtHostNodeProxy");

‎src/browser/login.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
55
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'self' 'unsafe-inline'; script-src 'unsafe-inline'; manifest-src 'self'; img-src 'self';">
66
<title>Authenticate: code-server</title>
7-
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
8-
<link rel="manifest" href="./manifest.json">
7+
<link rel="icon" href="./static/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
8+
<link rel="manifest" href="./static/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
99
<link rel="apple-touch-icon" href="./static/out/vs/server/src/media/code-server.png" />
10+
<meta name="apple-mobile-web-app-capable" content="yes">
1011
<link href="./static/out/vs/server/src/media/login.css" rel="stylesheet">
1112
</head>
1213
<body>

‎src/browser/workbench-build.html

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,6 @@
77
<!-- Disable pinch zooming -->
88
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
99

10-
<!-- Content Security Policy -->
11-
<meta
12-
http-equiv="Content-Security-Policy"
13-
content="
14-
default-src 'self';
15-
img-src 'self' https: data: blob:;
16-
media-src 'none';
17-
script-src 'self' 'unsafe-eval' https: 'sha256-bpJydy1E+3Mx9MyBtkOIA3yyzM2wdyIz115+Sgq21+0=' 'sha256-meDZW3XhN5JmdjFUrWGhTouRKBiWYtXHltaKnqn/WMo=';
18-
child-src 'self';
19-
frame-src 'self';
20-
worker-src 'self';
21-
style-src 'self' 'unsafe-inline';
22-
connect-src 'self' ws: wss: https:;
23-
font-src 'self' blob:;
24-
manifest-src 'self';
25-
">
26-
2710
<!-- Workbench Configuration -->
2811
<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}">
2912

@@ -36,15 +19,14 @@
3619
<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}">
3720

3821
<!-- Workbench Icon/Manifest/CSS -->
39-
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
40-
<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
41-
<link rel="apple-touch-icon" href="./static-{{COMMIT}}/out/vs/server/src/media/code-server.png" />
22+
<link rel="icon" href="./static-{{COMMIT}}/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
23+
<link rel="manifest" href="./static-{{COMMIT}}/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
4224
<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static-{{COMMIT}}/out/vs/workbench/workbench.web.api.css">
25+
<link rel="apple-touch-icon" href="./static-{{COMMIT}}/out/vs/server/src/media/code-server.png" />
4326
<meta name="apple-mobile-web-app-capable" content="yes">
4427

4528
<!-- Prefetch to avoid waterfall -->
4629
<link rel="prefetch" href="./static-{{COMMIT}}/node_modules/semver-umd/lib/semver-umd.js">
47-
<link rel="prefetch" href="./static-{{COMMIT}}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js">
4830
</head>
4931

5032
<body aria-label="">
@@ -90,8 +72,8 @@
9072
'xterm': `${staticBase}/node_modules/xterm/lib/xterm.js`,
9173
'xterm-addon-search': `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
9274
'xterm-addon-web-links': `${staticBase}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
75+
'xterm-addon-webgl': `${staticBase}/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
9376
'semver-umd': `${staticBase}/node_modules/semver-umd/lib/semver-umd.js`,
94-
'@microsoft/applicationinsights-web': `${staticBase}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js`,
9577
},
9678
'vs/nls': nlsConfig,
9779
};

‎src/browser/workbench.html

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,6 @@
77
<!-- Disable pinch zooming -->
88
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
99

10-
<!-- Content Security Policy -->
11-
<meta
12-
http-equiv="Content-Security-Policy"
13-
content="
14-
default-src 'self';
15-
img-src 'self' https: data: blob:;
16-
media-src 'none';
17-
script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'unsafe-inline';
18-
child-src 'self';
19-
frame-src 'self' https://*.vscode-webview-test.com;
20-
worker-src 'self';
21-
style-src 'self' 'unsafe-inline';
22-
connect-src 'self' ws: wss: https:;
23-
font-src 'self' blob:;
24-
manifest-src 'self';
25-
">
26-
2710
<!-- Workbench Configuration -->
2811
<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}">
2912

@@ -36,8 +19,8 @@
3619
<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}">
3720

3821
<!-- Workbench Icon/Manifest/CSS -->
39-
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
40-
<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
22+
<link rel="icon" href="./static/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
23+
<link rel="manifest" href="./static/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
4124
</head>
4225

4326
<body aria-label="">
@@ -58,8 +41,8 @@
5841
'xterm': `${staticBase}/node_modules/xterm/lib/xterm.js`,
5942
'xterm-addon-search': `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
6043
'xterm-addon-web-links': `${staticBase}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
44+
'xterm-addon-webgl': `${staticBase}/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
6145
'semver-umd': `${staticBase}/node_modules/semver-umd/lib/semver-umd.js`,
62-
'@microsoft/applicationinsights-web': `${staticBase}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js`,
6346
},
6447
};
6548
</script>

‎src/media/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"background-color": "#fff",
77
"description": "Run VS Code on a remote server.",
88
"icons": [{
9-
"src": "./static/out/vs/server/src/media/code-server.png",
9+
"src": "./code-server.png",
1010
"sizes": "384x384",
1111
"type": "image/png"
1212
}]

0 commit comments

Comments
 (0)