OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity
This repository has been archived on 2024-09-09. You can view files and clone it, but cannot push or open issues or pull requests.
8d03c22cb0
code-server/ci/dev/vscode.patch

3502 lines
141 KiB
Diff
Raw Normal View History

Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/.gitignore b/.gitignore
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
index e73dd4d9e8..e3192b3a0d 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/.gitignore
+++ b/.gitignore
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
@@ -24,7 +24,6 @@ out-vscode-reh-web-min/
Implement new structure
2020-02-04 20:27:46 +01:00
out-vscode-reh-web-pkg/
out-vscode-web/
out-vscode-web-min/
-src/vs/server
resources/server
build/node_modules
coverage/
Fix node version mismatch
2020-03-26 19:34:32 +01:00
diff --git a/.yarnrc b/.yarnrc
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
deleted file mode 100644
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 135e10442a..0000000000
Fix node version mismatch
2020-03-26 19:34:32 +01:00
--- a/.yarnrc
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
+++ /dev/null
@@ -1,3 +0,0 @@
Fix node version mismatch
2020-03-26 19:34:32 +01:00
-disturl "https://atom.io/download/electron"
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
-target "7.3.2"
Fix node version mismatch
2020-03-26 19:34:32 +01:00
-runtime "electron"
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
index f2ea1bd370..3f660f9981 100644
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -52,6 +52,7 @@ gulp.task('vscode-reh-web-linux-x64-min', noop);
gulp.task('vscode-reh-web-linux-alpine-min', noop);
function getNodeVersion() {
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ return process.versions.node;
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
return target;
diff --git a/build/lib/node.js b/build/lib/node.js
index 403ae3d965..738ee8cee0 100644
--- a/build/lib/node.js
+++ b/build/lib/node.js
@@ -5,11 +5,8 @@
*--------------------------------------------------------------------------------------------*/
Object.defineProperty(exports, "__esModule", { value: true });
const path = require("path");
-const fs = require("fs");
const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
+const version = process.versions.node;
const node = process.platform === 'win32' ? 'node.exe' : 'node';
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
console.log(nodePath);
diff --git a/build/lib/node.ts b/build/lib/node.ts
index 6439703446..c53dccf4dc 100644
--- a/build/lib/node.ts
+++ b/build/lib/node.ts
@@ -4,13 +4,10 @@
*--------------------------------------------------------------------------------------------*/
import * as path from 'path';
-import * as fs from 'fs';
const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
+const version = process.versions.node;
const node = process.platform === 'win32' ? 'node.exe' : 'node';
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
-console.log(nodePath);
\ No newline at end of file
+console.log(nodePath);
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
diff --git a/build/lib/util.js b/build/lib/util.js
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index e552a036f8..169e8614b9 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -257,6 +257,7 @@ function streamToPromise(stream) {
}
exports.streamToPromise = streamToPromise;
function getElectronVersion() {
+ return process.versions.node;
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
return target;
diff --git a/build/lib/util.ts b/build/lib/util.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 035c7e95ea..4ff8dcfe6b 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -322,6 +322,7 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
}
export function getElectronVersion(): string {
+ return process.versions.node;
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
const target = /^target "(.*)"$/m.exec(yarnrc)![1];
return target;
Skip unused dependencies
2020-03-26 21:12:05 +01:00
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index ef8fa4a47f..0866d0dbce 100644
Skip unused dependencies
2020-03-26 21:12:05 +01:00
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -33,10 +33,11 @@ function yarnInstall(location, opts) {
Skip unused dependencies
2020-03-26 21:12:05 +01:00
yarnInstall('extensions'); // node modules shared by all extensions
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
-if (!(process.platform === 'win32' && process.env['npm_config_arch'] === 'arm64')) {
- yarnInstall('remote'); // node modules used by vscode server
- yarnInstall('remote/web'); // node modules used by vscode web
-}
+// NOTE@coder: Skip these dependencies since we don't use them.
+// if (!(process.platform === 'win32' && process.env['npm_config_arch'] === 'arm64')) {
+// yarnInstall('remote'); // node modules used by vscode server
+// yarnInstall('remote/web'); // node modules used by vscode web
+// }
Skip unused dependencies
2020-03-26 21:12:05 +01:00
const allExtensionFolders = fs.readdirSync('extensions');
const extensions = allExtensionFolders.filter(e => {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -69,9 +70,9 @@ runtime "${runtime}"`;
Skip unused dependencies
2020-03-26 21:12:05 +01:00
}
yarnInstall(`build`); // node modules required for build
-yarnInstall('test/automation'); // node modules required for smoketest
-yarnInstall('test/smoke'); // node modules required for smoketest
-yarnInstall('test/integration/browser'); // node modules required for integration
+// yarnInstall('test/automation'); // node modules required for smoketest
+// yarnInstall('test/smoke'); // node modules required for smoketest
+// yarnInstall('test/integration/browser'); // node modules required for integration
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
cp.execSync('git config pull.rebase true');
Switch fully to GH Actions
2020-05-08 02:44:32 +02:00
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
index cb88d37ade..6b3253af0a 100644
--- a/build/npm/preinstall.js
+++ b/build/npm/preinstall.js
@@ -8,8 +8,9 @@ let err = false;
const majorNodeVersion = parseInt(/^(\d+)\./.exec(process.versions.node)[1]);
if (majorNodeVersion < 10 || majorNodeVersion >= 13) {
- console.error('\033[1;31m*** Please use node >=10 and <=12.\033[0;0m');
- err = true;
+ // We are ok building above Node 12.
+ // console.error('\033[1;31m*** Please use node >=10 and <=12.\033[0;0m');
+ // err = true;
}
const cp = require('child_process');
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/coder.js b/coder.js
new file mode 100644
Add missing bootstrap-node.js to final build Fixes #1884.
2020-07-21 18:31:27 +02:00
index 0000000000..88b720ceee
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/coder.js
Add missing bootstrap-node.js to final build Fixes #1884.
2020-07-21 18:31:27 +02:00
@@ -0,0 +1,69 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+// This must be ran from VS Code's root.
+const gulp = require("gulp");
+const path = require("path");
+const _ = require("underscore");
+const buildfile = require("./src/buildfile");
+const common = require("./build/lib/optimize");
+const util = require("./build/lib/util");
+const deps = require("./build/dependencies");
+
+const vscodeEntryPoints = _.flatten([
+ buildfile.entrypoint("vs/workbench/workbench.web.api"),
+ buildfile.entrypoint("vs/server/entry"),
+ buildfile.base,
+ buildfile.workbenchWeb,
+ buildfile.workerExtensionHost,
+ buildfile.keyboardMaps,
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ buildfile.entrypoint("vs/platform/files/node/watcher/unix/watcherApp", ["vs/css", "vs/nls"]),
+ buildfile.entrypoint("vs/platform/files/node/watcher/nsfw/watcherApp", ["vs/css", "vs/nls"]),
+ buildfile.entrypoint("vs/workbench/services/extensions/node/extensionHostProcess", ["vs/css", "vs/nls"]),
Implement new structure
2020-02-04 20:27:46 +01:00
+]);
+
+const vscodeResources = [
+ "out-build/vs/server/fork.js",
+ "!out-build/vs/server/doc/**",
+ "out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js",
+ "out-build/bootstrap.js",
+ "out-build/bootstrap-fork.js",
+ "out-build/bootstrap-amd.js",
Add missing bootstrap-node.js to final build Fixes #1884.
2020-07-21 18:31:27 +02:00
+ 'out-build/bootstrap-node.js',
Implement new structure
2020-02-04 20:27:46 +01:00
+ "out-build/paths.js",
Add NPM package, debs, rpms and refactor CI/build process Closes many issues that I'll prune after adding more docs for users.
2020-04-30 13:52:54 +02:00
+ 'out-build/vs/**/*.{svg,png,html,ttf}',
Implement new structure
2020-02-04 20:27:46 +01:00
+ "!out-build/vs/code/browser/workbench/*.html",
+ '!out-build/vs/code/electron-browser/**',
+ "out-build/vs/base/common/performance.js",
+ "out-build/vs/base/node/languagePacks.js",
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ 'out-build/vs/base/browser/ui/codicons/codicon/**',
Implement new structure
2020-02-04 20:27:46 +01:00
+ "out-build/vs/workbench/browser/media/*-theme.css",
+ "out-build/vs/workbench/contrib/debug/**/*.json",
+ "out-build/vs/workbench/contrib/externalTerminal/**/*.scpt",
+ "out-build/vs/workbench/contrib/webview/browser/pre/*.js",
+ "out-build/vs/**/markdown.css",
+ "out-build/vs/workbench/contrib/tasks/**/*.json",
+ "out-build/vs/platform/files/**/*.md",
+ "!**/test/**"
+];
+
+const rootPath = __dirname;
+const nodeModules = ["electron", "original-fs"]
+ .concat(_.uniq(deps.getProductionDependencies(rootPath).map((d) => d.name)))
+ .concat(_.uniq(deps.getProductionDependencies(path.join(rootPath, "src/vs/server")).map((d) => d.name)))
+ .concat(Object.keys(process.binding("natives")).filter((n) => !/^_|\//.test(n)));
+
+gulp.task("optimize", gulp.series(
+ util.rimraf("out-vscode"),
+ common.optimizeTask({
+ src: "out-build",
+ entryPoints: vscodeEntryPoints,
+ resources: vscodeResources,
+ loaderConfig: common.loaderConfig(nodeModules),
+ out: "out-vscode",
+ inlineAmdImages: true,
+ bundleInfo: undefined
+ }),
+));
+
+gulp.task("minify", gulp.series(
+ util.rimraf("out-vscode-min"),
+ common.minifyTask("out-vscode")
+));
Move rimraf to prod deps in extensions The postinstall uses rimraf so it needs to exist in the final build.
2020-07-30 17:42:34 +02:00
diff --git a/extensions/package.json b/extensions/package.json
index 7c668c9744..0778f4f7db 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -2,13 +2,14 @@
"name": "vscode-extensions",
"version": "0.0.1",
"description": "Dependencies shared by all extensions",
+ "dependencies_comment": "Move rimraf to dependencies because it is used in the postinstall script.",
"dependencies": {
+ "rimraf": "^3.0.2",
"typescript": "3.9.6"
},
"scripts": {
"postinstall": "node ./postinstall"
},
"devDependencies": {
- "rimraf": "^3.0.2"
}
}
Remove broken symlinks in extensions node modules The broken symlinks cause nfpm to fail.
2020-07-30 20:22:44 +02:00
diff --git a/extensions/postinstall.js b/extensions/postinstall.js
index da4fa3e9d0..50f3e1144f 100644
--- a/extensions/postinstall.js
+++ b/extensions/postinstall.js
@@ -24,6 +24,9 @@ function processRoot() {
rimraf.sync(filePath);
}
}
+
+ // Delete .bin so it doesn't contain broken symlinks that trip up nfpm.
+ rimraf.sync(path.join(__dirname, 'node_modules', '.bin'));
}
function processLib() {
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/package.json b/package.json
Force minimist update
2020-07-23 20:00:38 +02:00
index 86e3d5140d..962050280c 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/package.json
+++ b/package.json
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -42,6 +42,9 @@
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
"eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions"
Implement new structure
2020-02-04 20:27:46 +01:00
},
"dependencies": {
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ "@coder/logger": "^1.1.12",
Implement new structure
2020-02-04 20:27:46 +01:00
+ "@coder/node-browser": "^1.0.8",
Compress when sending client-side extension tars
2020-02-28 21:25:28 +01:00
+ "@coder/requirefs": "^1.1.5",
Implement new structure
2020-02-04 20:27:46 +01:00
"applicationinsights": "1.0.8",
"chokidar": "3.2.3",
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
"graceful-fs": "4.2.3",
Force minimist update
2020-07-23 20:00:38 +02:00
@@ -185,5 +188,8 @@
"windows-foreground-love": "0.2.0",
"windows-mutex": "0.3.0",
"windows-process-tree": "0.2.4"
+ },
+ "resolutions": {
+ "minimist": "^1.2.5"
}
}
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
diff --git a/product.json b/product.json
Update to VS Code 1.47.2
2020-07-21 20:03:07 +02:00
index 5378b017c8..afdadda974 100644
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
--- a/product.json
+++ b/product.json
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -20,7 +20,7 @@
Send report issues to code-server repo
2020-04-07 00:23:14 +02:00
"darwinBundleIdentifier": "com.visualstudio.code.oss",
"linuxIconName": "com.visualstudio.code.oss",
"licenseFileName": "LICENSE.txt",
- "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
+ "reportIssueUrl": "https://github.com/cdr/code-server/issues/new",
"urlProtocol": "code-oss",
"extensionAllowedProposedApi": [
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
"ms-vscode.vscode-js-profile-flame",
Remove .yarnrc from lib/vscode
2020-05-13 02:58:03 +02:00
diff --git a/remote/.yarnrc b/remote/.yarnrc
deleted file mode 100644
index 1e16cde724..0000000000
--- a/remote/.yarnrc
+++ /dev/null
@@ -1,3 +0,0 @@
-disturl "http://nodejs.org/dist"
-target "12.4.0"
-runtime "node"
Make sub-paths work
2019-07-22 23:00:59 +02:00
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 1286c5117a..e60dd11d03 100644
Make sub-paths work
2019-07-22 23:00:59 +02:00
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -111,16 +111,17 @@ class RemoteAuthoritiesImpl {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
if (host && host.indexOf(':') !== -1) {
host = `[${host}]`;
}
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
- const port = this._ports[authority];
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
+ // const port = this._ports[authority];
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
const connectionToken = this._connectionTokens[authority];
Fix paths from Windows client to non-Windows server Fixes #1659 Fixes #1642
2020-05-18 19:57:50 +02:00
let query = `path=${encodeURIComponent(uri.path)}`;
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
if (typeof connectionToken === 'string') {
query += `&tkn=${encodeURIComponent(connectionToken)}`;
}
+ // NOTE@coder: Changed this to work against the current path.
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
return URI.from({
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
- authority: `${host}:${port}`,
- path: `/vscode-remote-resource`,
+ authority: window.location.host,
+ path: `${window.location.pathname.replace(/\/+$/, '')}/vscode-remote-resource`,
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
query
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
});
}
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 0bbc5d6ef9..61f139b9c5 100644
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
@@ -59,6 +59,17 @@ if (typeof navigator === 'object' && !isElectronRenderer) {
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
_isWeb = true;
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
_locale = navigator.language;
_language = _locale;
Implement new structure
2020-02-04 20:27:46 +01:00
+ // NOTE@coder: Make languages work.
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ const el = typeof document !== 'undefined' && document.getElementById('vscode-remote-nls-configuration');
+ const rawNlsConfig = el && el.getAttribute('data-settings');
Groundwork for language support - Implement the localization service. - Use the proper build process which generates the require JSON files. - Implement getting the locale and language configuration.
2019-08-03 02:26:41 +02:00
+ if (rawNlsConfig) {
+ try {
+ const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
+ _locale = nlsConfig.locale;
+ _translationsConfigFile = nlsConfig._translationsConfigFile;
+ _language = nlsConfig.availableLanguages['*'] || LANGUAGE_DEFAULT;
+ } catch (error) { /* Oh well. */ }
+ }
} else if (typeof process === 'object') {
_isWindows = (process.platform === 'win32');
_isMacintosh = (process.platform === 'darwin');
Remove our env vars from the shell This enables developing code-server in code-server.
2020-03-16 17:01:46 +01:00
diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts
index c52f7b3774..08a87fa970 100644
--- a/src/vs/base/common/processes.ts
+++ b/src/vs/base/common/processes.ts
@@ -110,7 +110,8 @@ export function sanitizeProcessEnvironment(env: IProcessEnvironment, ...preserve
/^ELECTRON_.+$/,
/^GOOGLE_API_KEY$/,
/^VSCODE_.+$/,
- /^SNAP(|_.*)$/
+ /^SNAP(|_.*)$/,
+ /^CODE_SERVER_.+$/,
];
const envKeys = Object.keys(env);
envKeys
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts
index ef2291d49b..29b2f9dfc2 100644
--- a/src/vs/base/common/uriIpc.ts
+++ b/src/vs/base/common/uriIpc.ts
@@ -5,6 +5,7 @@
import { URI, UriComponents } from 'vs/base/common/uri';
import { MarshalledObject } from 'vs/base/common/marshalling';
+import { Schemas } from './network';
export interface IURITransformer {
transformIncoming(uri: UriComponents): UriComponents;
@@ -31,29 +32,35 @@ function toJSON(uri: URI): UriComponents {
export class URITransformer implements IURITransformer {
- private readonly _uriTransformer: IRawURITransformer;
-
- constructor(uriTransformer: IRawURITransformer) {
- this._uriTransformer = uriTransformer;
+ constructor(private readonly remoteAuthority: string) {
}
+ // NOTE@coder: Coming in from the browser it'll be vscode-remote so it needs
+ // to be transformed into file.
public transformIncoming(uri: UriComponents): UriComponents {
- const result = this._uriTransformer.transformIncoming(uri);
- return (result === uri ? uri : toJSON(URI.from(result)));
+ return uri.scheme === Schemas.vscodeRemote
+ ? toJSON(URI.file(uri.path))
+ : uri;
}
+ // NOTE@coder: Going out to the browser it'll be file so it needs to be
+ // transformed into vscode-remote.
public transformOutgoing(uri: UriComponents): UriComponents {
- const result = this._uriTransformer.transformOutgoing(uri);
- return (result === uri ? uri : toJSON(URI.from(result)));
+ return uri.scheme === Schemas.file
+ ? toJSON(URI.from({ authority: this.remoteAuthority, scheme: Schemas.vscodeRemote, path: uri.path }))
+ : uri;
}
public transformOutgoingURI(uri: URI): URI {
- const result = this._uriTransformer.transformOutgoing(uri);
- return (result === uri ? uri : URI.from(result));
+ return uri.scheme === Schemas.file
+ ? URI.from({ authority: this.remoteAuthority, scheme: Schemas.vscodeRemote, path:uri.path })
+ : uri;
}
public transformOutgoingScheme(scheme: string): string {
- return this._uriTransformer.transformOutgoingScheme(scheme);
+ return scheme === Schemas.file
+ ? Schemas.vscodeRemote
+ : scheme;
}
}
@@ -152,4 +159,4 @@ export function transformAndReviveIncomingURIs<T>(obj: T, transformer: IURITrans
return obj;
}
return result;
-}
\ No newline at end of file
+}
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
index 2c64061da7..c0ef8faedd 100644
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
--- a/src/vs/base/node/languagePacks.js
+++ b/src/vs/base/node/languagePacks.js
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
@@ -128,7 +128,10 @@ function factory(nodeRequire, path, fs, perf) {
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
function getLanguagePackConfigurations(userDataPath) {
const configFile = path.join(userDataPath, 'languagepacks.json');
try {
- return nodeRequire(configFile);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ // NOTE@coder: Swapped require with readFile since require is cached and
+ // we don't restart the server-side portion of code-server when the
+ // language changes.
Fix not being able to change language while code-server is running See #948. Only applies if code-server already tried to load a language.
2019-09-19 21:41:17 +02:00
+ return JSON.parse(fs.readFileSync(configFile, "utf8"));
} catch (err) {
// Do nothing. If we can't read the file we have no
// language pack config.
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 4bd7368805..da2204af0a 100644
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
@@ -12,6 +12,8 @@ import { request } from 'vs/base/parts/request/browser/request';
import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/windows/common/windows';
import { isEqual } from 'vs/base/common/resources';
import { isStandalone } from 'vs/base/browser/browser';
+import { Schemas } from 'vs/base/common/network';
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+import { encodePath } from 'vs/server/node/util';
interface ICredential {
service: string;
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
@@ -242,12 +244,18 @@ class WorkspaceProvider implements IWorkspaceProvider {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
// Folder
else if (isFolderToOpen(workspace)) {
- targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${encodeURIComponent(workspace.folderUri.toString())}`;
+ const target = workspace.folderUri.scheme === Schemas.vscodeRemote
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ ? encodePath(workspace.folderUri.path)
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
+ : encodeURIComponent(workspace.folderUri.toString());
+ targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${target}`;
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
// Workspace
else if (isWorkspaceToOpen(workspace)) {
- targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${encodeURIComponent(workspace.workspaceUri.toString())}`;
+ const target = workspace.workspaceUri.scheme === Schemas.vscodeRemote
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ ? encodePath(workspace.workspaceUri.path)
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
+ : encodeURIComponent(workspace.workspaceUri.toString());
+ targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${target}`;
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Restore old folder query parameter behavior Fixes #1351.
2020-03-11 22:05:38 +01:00
// Append payload if any
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -287,7 +295,22 @@ class WorkspaceProvider implements IWorkspaceProvider {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
throw new Error('Missing web configuration element');
}
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
- const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
+ const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ webviewEndpoint: `${window.location.origin}${window.location.pathname.replace(/\/+$/, '')}/webview/`,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ ...JSON.parse(configElementAttribute),
+ };
+
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ // Strip the protocol from the authority if it exists.
Document workspace and folder behavior Also fixed a type issue.
2020-04-08 00:49:50 +02:00
+ const normalizeAuthority = (authority: string): string => authority.replace(/^https?:\/\//, "");
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ if (config.remoteAuthority) {
+ (config as any).remoteAuthority = normalizeAuthority(config.remoteAuthority);
+ }
Document workspace and folder behavior Also fixed a type issue.
2020-04-08 00:49:50 +02:00
+ if (config.workspaceUri && config.workspaceUri.authority) {
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ config.workspaceUri.authority = normalizeAuthority(config.workspaceUri.authority);
+ }
Document workspace and folder behavior Also fixed a type issue.
2020-04-08 00:49:50 +02:00
+ if (config.folderUri && config.folderUri.authority) {
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
+ config.folderUri.authority = normalizeAuthority(config.folderUri.authority);
+ }
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
Strip protocol from remote authority In Google cloud shell the host header is 127.0.0.1:8080 instead of the actual URL. This is what we write out to the HTML so VS Code can pick it up. However cloud shell rewrites this string when found in the HTML before serving it so it becomes https://8080-[...].appspot.com, resulting in an extra unexpected https:// in the URI (vscode-remote://https://8080[...]). The resulting malformed URI causes the extension host to exit. - Fixes #1471 - Fixes #1468 - Fixes #1440 (most likely).
2020-04-01 20:41:05 +02:00
// Revive static extension locations
if (Array.isArray(config.staticExtensions)) {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -299,40 +322,7 @@ class WorkspaceProvider implements IWorkspaceProvider {
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
// Find workspace to open and payload
let foundWorkspace = false;
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
let workspace: IWorkspace;
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
- let payload = Object.create(null);
-
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
- const query = new URL(document.location.href).searchParams;
- query.forEach((value, key) => {
- switch (key) {
-
- // Folder
- case WorkspaceProvider.QUERY_PARAM_FOLDER:
- workspace = { folderUri: URI.parse(value) };
- foundWorkspace = true;
- break;
-
- // Workspace
- case WorkspaceProvider.QUERY_PARAM_WORKSPACE:
- workspace = { workspaceUri: URI.parse(value) };
- foundWorkspace = true;
- break;
-
- // Empty
- case WorkspaceProvider.QUERY_PARAM_EMPTY_WINDOW:
- workspace = undefined;
- foundWorkspace = true;
- break;
-
- // Payload
- case WorkspaceProvider.QUERY_PARAM_PAYLOAD:
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
- try {
- payload = JSON.parse(value);
- } catch (error) {
- console.error(error); // possible invalid JSON
- }
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
- break;
- }
- });
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ let payload = config.workspaceProvider?.payload || Object.create(null);
Fix duplicate files opening with folder parameter Reworked from d574012871e58e503801f869fab5e3d3a4052390 to fit in the new structure.
2020-02-13 19:04:22 +01:00
// If no workspace is provided through the URL, check for config attribute from server
if (!foundWorkspace) {
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index c63cc171cc..125e8a48e3 100644
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@@ -65,6 +65,9 @@ export interface IEnvironmentService {
disableTelemetry: boolean;
serviceMachineIdResource: URI;
+ // NOTE@coder: vscodevim makes use of this.
+ globalStorageHome: string;
+
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// NOTE: DO NOT ADD ANY OTHER PROPERTY INTO THE COLLECTION HERE
// UNLESS THIS PROPERTY IS SUPPORTED BOTH IN WEB AND DESKTOP!!!!
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 38e7ca5ad3..f0e59e8e63 100644
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -8,6 +8,8 @@ import { localize } from 'vs/nls';
import { isWindows } from 'vs/base/common/platform';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
export interface ParsedArgs {
+ 'extra-extensions-dir'?: string[];
+ 'extra-builtin-extensions-dir'?: string[];
_: string[];
'folder-uri'?: string[]; // undefined or array of 1 or more
'file-uri'?: string[]; // undefined or array of 1 or more
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -139,6 +141,8 @@ export const OPTIONS: OptionDescriptions<Required<ParsedArgs>> = {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
'extensions-dir': { type: 'string', deprecates: 'extensionHomePath', cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
'extensions-download-dir': { type: 'string' },
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
'builtin-extensions-dir': { type: 'string' },
+ 'extra-builtin-extensions-dir': { type: 'string[]', cat: 'o', description: 'Path to an extra builtin extension directory.' },
+ 'extra-extensions-dir': { type: 'string[]', cat: 'o', description: 'Path to an extra user extension directory.' },
'list-extensions': { type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },
'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extension.") },
'category': { type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extension.") },
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -399,4 +403,3 @@ export function buildHelpMessage(productName: string, executableName: string, ve
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
export function buildVersionMessage(version: string | undefined, commit: string | undefined): string {
return `${version || localize('unknownVersion', "Unknown version")}\n${commit || localize('unknownCommit', "Unknown commit")}\n${process.arch}`;
}
-
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 0d154c16f3..96584ceeaf 100644
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@@ -38,8 +38,9 @@ export interface INativeEnvironmentService extends IEnvironmentService {
extensionsPath?: string;
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
extensionsDownloadPath: string;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
builtinExtensionsPath: string;
+ extraExtensionPaths: string[];
+ extraBuiltinExtensionPaths: string[];
- globalStorageHome: string;
workspaceStorageHome: string;
driverHandle?: string;
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -181,6 +182,13 @@ export class EnvironmentService implements INativeEnvironmentService {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
return resources.joinPath(this.userHome, product.dataFolderName, 'extensions').fsPath;
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
+ @memoize get extraExtensionPaths(): string[] {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ return (this._args['extra-extensions-dir'] || []).map((p) => <string>parsePathArg(p, process));
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+ @memoize get extraBuiltinExtensionPaths(): string[] {
+ return (this._args['extra-builtin-extensions-dir'] || []).map((p) => <string>parsePathArg(p, process));
+ }
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+
@memoize
get extensionDevelopmentLocationURI(): URI[] | undefined {
const s = this._args.extensionDevelopmentPath;
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
diff --git a/src/vs/platform/extensionManagement/node/extensionsScanner.ts b/src/vs/platform/extensionManagement/node/extensionsScanner.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 8a02d58477..929650ece3 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
--- a/src/vs/platform/extensionManagement/node/extensionsScanner.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsScanner.ts
@@ -88,7 +88,7 @@ export class ExtensionsScanner extends Disposable {
}
async scanAllUserExtensions(): Promise<ILocalExtension[]> {
- return this.scanExtensionsInDir(this.extensionsPath, ExtensionType.User);
+ return this.scanExtensionsInDirs(this.extensionsPath, this.environmentService.extraExtensionPaths, ExtensionType.User);
Implement new structure
2020-02-04 20:27:46 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
async extractUserExtension(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, token: CancellationToken): Promise<ILocalExtension> {
@@ -214,7 +214,13 @@ export class ExtensionsScanner extends Disposable {
private async scanExtensionsInDir(dir: string, type: ExtensionType): Promise<ILocalExtension[]> {
Implement new structure
2020-02-04 20:27:46 +01:00
const limiter = new Limiter<any>(10);
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
- const extensionsFolders = await pfs.readdir(dir);
+ const extensionsFolders = await pfs.readdir(dir)
Implement new structure
2020-02-04 20:27:46 +01:00
+ .catch((error) => {
+ if (error.code !== 'ENOENT') {
+ throw error;
+ }
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ return <string[]>[];
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ });
const extensions = await Promise.all<ILocalExtension>(extensionsFolders.map(extensionFolder => limiter.queue(() => this.scanExtension(extensionFolder, dir, type))));
return extensions.filter(e => e && e.identifier);
Implement new structure
2020-02-04 20:27:46 +01:00
}
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -244,7 +250,7 @@ export class ExtensionsScanner extends Disposable {
Implement new structure
2020-02-04 20:27:46 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
private async scanDefaultSystemExtensions(): Promise<ILocalExtension[]> {
- const result = await this.scanExtensionsInDir(this.systemExtensionsPath, ExtensionType.System);
+ const result = await this.scanExtensionsInDirs(this.systemExtensionsPath, this.environmentService.extraBuiltinExtensionPaths, ExtensionType.System);
this.logService.trace('Scanned system extensions:', result.length);
return result;
}
@@ -348,4 +354,9 @@ export class ExtensionsScanner extends Disposable {
}
});
}
+
+ private async scanExtensionsInDirs(dir: string, dirs: string[], type: ExtensionType): Promise<ILocalExtension[]>{
+ const results = await Promise.all([dir, ...dirs].map((path) => this.scanExtensionsInDir(path, type)));
+ return results.reduce((flat, current) => flat.concat(current), []);
+ }
}
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 057c83ab36..e586f401c2 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@@ -26,6 +26,12 @@ if (isWeb) {
Implement new structure
2020-02-04 20:27:46 +01:00
urlProtocol: 'code-oss'
});
}
+ // NOTE@coder: Add the ability to inject settings from the server.
+ const el = document.getElementById('vscode-remote-product-configuration');
+ const rawProductConfiguration = el && el.getAttribute('data-settings');
+ if (rawProductConfiguration) {
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ Object.assign(product, JSON.parse(rawProductConfiguration));
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
// Node: AMD loader
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 7cfc7f1fc3..f8980ea40a 100644
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
--- a/src/vs/platform/product/common/productService.ts
+++ b/src/vs/platform/product/common/productService.ts
@@ -25,6 +25,8 @@ export interface IBuiltInExtension {
export type ConfigurationSyncStore = { url: string, authenticationProviders: IStringDictionary<{ scopes: string[] }> };
export interface IProductConfiguration {
+ readonly codeServerVersion?: string;
+
readonly version: string;
readonly date?: string;
readonly quality?: string;
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts
index d0f6e6b18a..1966fd297d 100644
--- a/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -205,7 +205,8 @@ export class BrowserSocketFactory implements ISocketFactory {
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
connect(host: string, port: number, query: string, callback: IConnectCallback): void {
- const socket = this._webSocketFactory.create(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);
+ // NOTE@coder: Modified to work against the current path.
+ const socket = this._webSocketFactory.create(`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}${window.location.pathname}?${query}&skipWebSocketFrames=false`);
const errorListener = socket.onError((err) => callback(err, undefined));
socket.onOpen(() => {
errorListener.dispose();
@@ -213,6 +214,3 @@ export class BrowserSocketFactory implements ISocketFactory {
});
}
}
-
-
-
Add connection type to websocket query parameters This allows external services to distinguish between them.
2020-03-05 22:48:26 +01:00
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index eab8591492..26668701f7 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -88,7 +88,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
options.socketFactory.connect(
options.host,
options.port,
- `reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
+ `type=${connectionTypeToString(connectionType)}&reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
(err: any, socket: ISocket | undefined) => {
if (err || !socket) {
options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`);
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts
new file mode 100644
Remove apply portion of update endpoint It can still be used to check for updates but will not apply them. For now also remove the update check loop in VS Code since it's currently unused (update check is hardcoded off right now) and won't work anyway since it also applies the update which now won't work. In the future we should integrate the check into the browser update service.
2020-07-22 22:55:14 +02:00
index 0000000000..8fb2a87303
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/browser/client.ts
Remove apply portion of update endpoint It can still be used to check for updates but will not apply them. For now also remove the update check loop in VS Code since it's currently unused (update check is hardcoded off right now) and won't work anyway since it also applies the update which now won't work. In the future we should integrate the check into the browser update service.
2020-07-22 22:55:14 +02:00
@@ -0,0 +1,208 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Emitter } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INodeProxyService, NodeProxyChannelClient } from 'vs/server/common/nodeProxy';
+import { TelemetryChannelClient } from 'vs/server/common/telemetry';
+import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
+import { LocalizationsService } from 'vs/workbench/services/localizations/electron-browser/localizationsService';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+import { Options } from 'vs/server/ipc.d';
Set background color using VS Code theme
2020-03-27 22:58:50 +01:00
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
Implement new structure
2020-02-04 20:27:46 +01:00
+
+class TelemetryService extends TelemetryChannelClient {
+ public constructor(
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
+ ) {
+ super(remoteAgentService.getConnection()!.getChannel('telemetry'));
+ }
+}
+
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+/**
+ * Remove extra slashes in a URL.
+ */
+export const normalize = (url: string, keepTrailing = false): string => {
+ return url.replace(/\/\/+/g, "/").replace(/\/+$/, keepTrailing ? "/" : "");
+};
Implement new structure
2020-02-04 20:27:46 +01:00
+
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+/**
+ * Get options embedded in the HTML from the server.
+ */
+export const getOptions = <T extends Options>(): T => {
+ if (typeof document === "undefined") {
+ return {} as T;
+ }
+ const el = document.getElementById("coder-options");
+ try {
+ if (!el) {
+ throw new Error("no options element");
+ }
+ const value = el.getAttribute("data-settings");
+ if (!value) {
+ throw new Error("no options value");
+ }
+ const options = JSON.parse(value);
+ const parts = window.location.pathname.replace(/^\//g, "").split("/");
+ parts[parts.length - 1] = options.base;
+ const url = new URL(window.location.origin + "/" + parts.join("/"));
+ return {
+ ...options,
+ base: normalize(url.pathname, true),
+ };
+ } catch (error) {
+ console.warn(error);
+ return {} as T;
+ }
+};
Set telemetry setting based on disable-telemetry flag By design the disable-telemetry flag does not affect extension telemetry, only the setting does, so disabling the setting when the flag is set should cause extensions to also stop sending telemetry. Fixes #1116.
2020-03-13 18:36:57 +01:00
+
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+const options = getOptions();
+
+const TELEMETRY_SECTION_ID = 'telemetry';
Implement new structure
2020-02-04 20:27:46 +01:00
+Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
+ 'id': TELEMETRY_SECTION_ID,
+ 'order': 110,
+ 'type': 'object',
+ 'title': localize('telemetryConfigurationTitle', 'Telemetry'),
+ 'properties': {
+ 'telemetry.enableTelemetry': {
+ 'type': 'boolean',
+ 'description': localize('telemetry.enableTelemetry', 'Enable usage data and errors to be sent to a Microsoft online service.'),
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+ 'default': !options.disableTelemetry,
Implement new structure
2020-02-04 20:27:46 +01:00
+ 'tags': ['usesOnlineServices']
+ }
+ }
+});
+
+class NodeProxyService extends NodeProxyChannelClient implements INodeProxyService {
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+ private readonly _onDown = new Emitter<void>();
+ public readonly onDown = this._onDown.event;
+ private readonly _onUp = new Emitter<void>();
+ public readonly onUp = this._onUp.event;
+
+ public constructor(
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
+ ) {
+ super(remoteAgentService.getConnection()!.getChannel('nodeProxy'));
+ remoteAgentService.getConnection()!.onDidStateChange((state) => {
+ switch (state.type) {
+ case PersistentConnectionEventType.ConnectionGain:
+ return this._onUp.fire();
+ case PersistentConnectionEventType.ConnectionLost:
+ return this._onDown.fire();
+ case PersistentConnectionEventType.ReconnectionPermanentFailure:
+ return this._onClose.fire();
+ }
+ });
+ }
+}
+
+registerSingleton(ILocalizationsService, LocalizationsService);
+registerSingleton(INodeProxyService, NodeProxyService);
+registerSingleton(ITelemetryService, TelemetryService);
+
+/**
+ * This is called by vs/workbench/browser/web.main.ts after the workbench has
+ * been initialized so we can initialize our own client-side code.
+ */
+export const initialize = async (services: ServiceCollection): Promise<void> => {
+ const event = new CustomEvent('ide-ready');
+ window.dispatchEvent(event);
+
+ if (parent) {
+ // Tell the parent loading has completed.
+ parent.postMessage({ event: 'loaded' }, window.location.origin);
+
+ // Proxy or stop proxing events as requested by the parent.
+ const listeners = new Map<string, (event: Event) => void>();
+ window.addEventListener('message', (parentEvent) => {
+ const eventName = parentEvent.data.bind || parentEvent.data.unbind;
+ if (eventName) {
+ const oldListener = listeners.get(eventName);
+ if (oldListener) {
+ document.removeEventListener(eventName, oldListener);
+ }
+ }
+
+ if (parentEvent.data.bind && parentEvent.data.prop) {
+ const listener = (event: Event) => {
+ parent.postMessage({
+ event: parentEvent.data.event,
+ [parentEvent.data.prop]: event[parentEvent.data.prop as keyof Event]
+ }, window.location.origin);
+ };
+ listeners.set(parentEvent.data.bind, listener);
+ document.addEventListener(parentEvent.data.bind, listener);
+ }
+ });
+ }
+
+ if (!window.isSecureContext) {
+ (services.get(INotificationService) as INotificationService).notify({
+ severity: Severity.Warning,
Elaborate what won't work over an insecure domain Closes #997.
2020-03-03 20:10:32 +01:00
+ message: 'code-server is being accessed over an insecure domain. Web views, the clipboard, and other functionality will not work as expected.',
Implement new structure
2020-02-04 20:27:46 +01:00
+ actions: {
+ primary: [{
Handle when VS Code fails to load This is mostly for development where VS Code might not have finished compiling yet.
2020-02-05 21:21:59 +01:00
+ id: 'understand',
+ label: 'I understand',
+ tooltip: '',
Implement new structure
2020-02-04 20:27:46 +01:00
+ class: undefined,
+ enabled: true,
+ checked: true,
+ dispose: () => undefined,
+ run: () => {
+ return Promise.resolve();
+ }
+ }],
+ }
+ });
+ }
Integrate update notifications into VS Code
2020-03-02 21:39:12 +01:00
+
Set background color using VS Code theme
2020-03-27 22:58:50 +01:00
+ // This will be used to set the background color while VS Code loads.
+ const theme = (services.get(IStorageService) as IStorageService).get("colorThemeData", StorageScope.GLOBAL);
+ if (theme) {
+ localStorage.setItem("colorThemeData", theme);
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+};
+
+export interface Query {
+ [key: string]: string | undefined;
+}
+
+/**
+ * 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.
+ */
+export const split = (str: string, delimiter: string): [string, string] => {
+ const index = str.indexOf(delimiter);
+ return index !== -1 ? [str.substring(0, index).trim(), str.substring(index + 1)] : [str, ''];
+};
+
+/**
+ * Return the URL modified with the specified query variables. It's pretty
+ * stupid so it probably doesn't cover any edge cases. Undefined values will
+ * unset existing values. Doesn't allow duplicates.
+ */
+export const withQuery = (url: string, replace: Query): string => {
+ const uri = URI.parse(url);
+ const query = { ...replace };
+ uri.query.split('&').forEach((kv) => {
+ const [key, value] = split(kv, '=');
+ if (!(key in query)) {
+ query[key] = value;
+ }
+ });
+ return uri.with({
+ query: Object.keys(query)
+ .filter((k) => typeof query[k] !== 'undefined')
+ .map((k) => `${k}=${query[k]}`).join('&'),
+ }).toString(true);
+};
diff --git a/src/vs/server/browser/extHostNodeProxy.ts b/src/vs/server/browser/extHostNodeProxy.ts
new file mode 100644
index 0000000000..ed7c078077
--- /dev/null
+++ b/src/vs/server/browser/extHostNodeProxy.ts
@@ -0,0 +1,46 @@
+import { Emitter } from 'vs/base/common/event';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ExtHostNodeProxyShape, MainContext, MainThreadNodeProxyShape } from 'vs/workbench/api/common/extHost.protocol';
+import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+
+export class ExtHostNodeProxy implements ExtHostNodeProxyShape {
+ _serviceBrand: any;
+
+ private readonly _onMessage = new Emitter<string>();
+ public readonly onMessage = this._onMessage.event;
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+ private readonly _onDown = new Emitter<void>();
+ public readonly onDown = this._onDown.event;
+ private readonly _onUp = new Emitter<void>();
+ public readonly onUp = this._onUp.event;
+
+ private readonly proxy: MainThreadNodeProxyShape;
+
+ constructor(@IExtHostRpcService rpc: IExtHostRpcService) {
+ this.proxy = rpc.getProxy(MainContext.MainThreadNodeProxy);
+ }
+
+ public $onMessage(message: string): void {
+ this._onMessage.fire(message);
+ }
+
+ public $onClose(): void {
+ this._onClose.fire();
+ }
+
+ public $onUp(): void {
+ this._onUp.fire();
+ }
+
+ public $onDown(): void {
+ this._onDown.fire();
+ }
+
+ public send(message: string): void {
+ this.proxy.$send(message);
+ }
+}
+
+export interface IExtHostNodeProxy extends ExtHostNodeProxy { }
+export const IExtHostNodeProxy = createDecorator<IExtHostNodeProxy>('IExtHostNodeProxy');
diff --git a/src/vs/server/browser/mainThreadNodeProxy.ts b/src/vs/server/browser/mainThreadNodeProxy.ts
new file mode 100644
index 0000000000..0d2e93edae
--- /dev/null
+++ b/src/vs/server/browser/mainThreadNodeProxy.ts
@@ -0,0 +1,37 @@
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { INodeProxyService } from 'vs/server/common/nodeProxy';
+import { ExtHostContext, IExtHostContext, MainContext, MainThreadNodeProxyShape } from 'vs/workbench/api/common/extHost.protocol';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+
+@extHostNamedCustomer(MainContext.MainThreadNodeProxy)
+export class MainThreadNodeProxy implements MainThreadNodeProxyShape {
+ private disposed = false;
+ private disposables = <IDisposable[]>[];
+
+ constructor(
+ extHostContext: IExtHostContext,
+ @INodeProxyService private readonly proxyService: INodeProxyService,
+ ) {
+ if (!extHostContext.remoteAuthority) { // HACK: A terrible way to detect if running in the worker.
+ const proxy = extHostContext.getProxy(ExtHostContext.ExtHostNodeProxy);
+ this.disposables = [
+ this.proxyService.onMessage((message: string) => proxy.$onMessage(message)),
+ this.proxyService.onClose(() => proxy.$onClose()),
+ this.proxyService.onDown(() => proxy.$onDown()),
+ this.proxyService.onUp(() => proxy.$onUp()),
+ ];
+ }
+ }
+
+ $send(message: string): void {
+ if (!this.disposed) {
+ this.proxyService.send(message);
+ }
+ }
+
+ dispose(): void {
+ this.disposables.forEach((d) => d.dispose());
+ this.disposables = [];
+ this.disposed = true;
+ }
+}
diff --git a/src/vs/server/browser/worker.ts b/src/vs/server/browser/worker.ts
new file mode 100644
Fix paths from Windows client to non-Windows server Fixes #1659 Fixes #1642
2020-05-18 19:57:50 +02:00
index 0000000000..a93381631a
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/browser/worker.ts
@@ -0,0 +1,57 @@
+import { Client } from '@coder/node-browser';
+import { fromTar } from '@coder/requirefs';
+import { URI } from 'vs/base/common/uri';
+import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ILogService } from 'vs/platform/log/common/log';
+import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHostExtensionActivator';
+import { IExtHostNodeProxy } from './extHostNodeProxy';
+
+export const loadCommonJSModule = async <T>(
+ module: IExtensionDescription,
+ activationTimesBuilder: ExtensionActivationTimesBuilder,
+ nodeProxy: IExtHostNodeProxy,
+ logService: ILogService,
+ vscode: any,
+): Promise<T> => {
+ const fetchUri = URI.from({
+ scheme: self.location.protocol.replace(':', ''),
+ authority: self.location.host,
Make client-side extensions work at any base
2020-03-16 18:04:09 +01:00
+ path: self.location.pathname.replace(/\/static\/([^\/]+)\/.*$/, '/static/$1\/'),
Fix paths from Windows client to non-Windows server Fixes #1659 Fixes #1642
2020-05-18 19:57:50 +02:00
+ query: `tar=${encodeURIComponent(module.extensionLocation.path)}`,
Implement new structure
2020-02-04 20:27:46 +01:00
+ });
+ const response = await fetch(fetchUri.toString(true));
+ if (response.status !== 200) {
+ throw new Error(`Failed to download extension "${module.extensionLocation.path}"`);
+ }
+ const client = new Client(nodeProxy, { logger: logService });
+ const init = await client.handshake();
+ const buffer = new Uint8Array(await response.arrayBuffer());
+ const rfs = fromTar(buffer);
+ (<any>self).global = self;
+ rfs.provide('vscode', vscode);
+ Object.keys(client.modules).forEach((key) => {
+ const mod = (client.modules as any)[key];
+ if (key === 'process') {
+ (<any>self).process = mod;
+ (<any>self).process.env = init.env;
+ return;
+ }
+
+ rfs.provide(key, mod);
+ switch (key) {
+ case 'buffer':
+ (<any>self).Buffer = mod.Buffer;
+ break;
+ case 'timers':
+ (<any>self).setImmediate = mod.setImmediate;
+ break;
+ }
+ });
+
+ try {
+ activationTimesBuilder.codeLoadingStart();
+ return rfs.require('.');
+ } finally {
+ activationTimesBuilder.codeLoadingStop();
+ }
+};
diff --git a/src/vs/server/common/nodeProxy.ts b/src/vs/server/common/nodeProxy.ts
new file mode 100644
index 0000000000..14b9de879c
--- /dev/null
+++ b/src/vs/server/common/nodeProxy.ts
@@ -0,0 +1,47 @@
+import { ReadWriteConnection } from '@coder/node-browser';
+import { Event } from 'vs/base/common/event';
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const INodeProxyService = createDecorator<INodeProxyService>('nodeProxyService');
+
+export interface INodeProxyService extends ReadWriteConnection {
+ _serviceBrand: any;
+ send(message: string): void;
+ onMessage: Event<string>;
+ onUp: Event<void>;
+ onClose: Event<void>;
+ onDown: Event<void>;
+}
+
+export class NodeProxyChannel implements IServerChannel {
+ constructor(private service: INodeProxyService) {}
+
+ listen(_: unknown, event: string): Event<any> {
+ switch (event) {
+ case 'onMessage': return this.service.onMessage;
+ }
+ throw new Error(`Invalid listen ${event}`);
+ }
+
+ async call(_: unknown, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'send': return this.service.send(args[0]);
+ }
+ throw new Error(`Invalid call ${command}`);
+ }
+}
+
+export class NodeProxyChannelClient {
+ _serviceBrand: any;
+
+ public readonly onMessage: Event<string>;
+
+ constructor(private readonly channel: IChannel) {
+ this.onMessage = this.channel.listen<string>('onMessage');
+ }
+
+ public send(data: string): void {
+ this.channel.call('send', [data]);
+ }
+}
diff --git a/src/vs/server/common/telemetry.ts b/src/vs/server/common/telemetry.ts
new file mode 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
index 0000000000..4cd0d91657
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/common/telemetry.ts
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -0,0 +1,60 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ITelemetryData } from 'vs/base/common/actions';
+import { Event } from 'vs/base/common/event';
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { ClassifiedEvent, GDPRClassification, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
+import { ITelemetryInfo, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+
+export class TelemetryChannel implements IServerChannel {
+ constructor(private service: ITelemetryService) {}
+
+ listen(_: unknown, event: string): Event<any> {
+ throw new Error(`Invalid listen ${event}`);
+ }
+
+ call(_: unknown, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'publicLog': return this.service.publicLog(args[0], args[1], args[2]);
+ case 'publicLog2': return this.service.publicLog2(args[0], args[1], args[2]);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ case 'publicLogError': return this.service.publicLogError(args[0], args[1]);
+ case 'publicLogError2': return this.service.publicLogError2(args[0], args[1]);
Implement new structure
2020-02-04 20:27:46 +01:00
+ case 'setEnabled': return Promise.resolve(this.service.setEnabled(args[0]));
+ case 'getTelemetryInfo': return this.service.getTelemetryInfo();
+ }
+ throw new Error(`Invalid call ${command}`);
+ }
+}
+
+export class TelemetryChannelClient implements ITelemetryService {
+ _serviceBrand: any;
+
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ // These don't matter; telemetry is sent to the Node side which decides
+ // whether to send the telemetry event.
+ public isOptedIn = true;
+ public sendErrorTelemetry = true;
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ constructor(private readonly channel: IChannel) {}
+
+ public publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Promise<void> {
+ return this.channel.call('publicLog', [eventName, data, anonymizeFilePaths]);
+ }
+
+ public publicLog2<E extends ClassifiedEvent<T> = never, T extends GDPRClassification<T> = never>(eventName: string, data?: StrictPropertyCheck<T, E>, anonymizeFilePaths?: boolean): Promise<void> {
+ return this.channel.call('publicLog2', [eventName, data, anonymizeFilePaths]);
+ }
+
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ public publicLogError(errorEventName: string, data?: ITelemetryData): Promise<void> {
+ return this.channel.call('publicLogError', [errorEventName, data]);
+ }
+
+ public publicLogError2<E extends ClassifiedEvent<T> = never, T extends GDPRClassification<T> = never>(eventName: string, data?: StrictPropertyCheck<T, E>): Promise<void> {
+ return this.channel.call('publicLogError2', [eventName, data]);
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ public setEnabled(value: boolean): void {
+ this.channel.call('setEnable', [value]);
+ }
+
+ public getTelemetryInfo(): Promise<ITelemetryInfo> {
+ return this.channel.call('getTelemetryInfo');
+ }
+}
diff --git a/src/vs/server/entry.ts b/src/vs/server/entry.ts
new file mode 100644
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
index 0000000000..ab020fbb4e
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/entry.ts
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
@@ -0,0 +1,78 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { field } from '@coder/logger';
+import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { CodeServerMessage, VscodeMessage } from 'vs/server/ipc';
+import { logger } from 'vs/server/node/logger';
+import { enableCustomMarketplace } from 'vs/server/node/marketplace';
+import { Vscode } from 'vs/server/node/server';
+
Handle unexpected string errors Looks like sometimes VS Code throws strings. For example if ifconfig is missing.
2020-03-03 00:19:28 +01:00
+setUnexpectedErrorHandler((error) => logger.warn(error instanceof Error ? error.message : error));
Implement new structure
2020-02-04 20:27:46 +01:00
+enableCustomMarketplace();
+
+/**
+ * Ensure we control when the process exits.
+ */
+const exit = process.exit;
+process.exit = function(code?: number) {
+ logger.warn(`process.exit() was prevented: ${code || 'unknown code'}.`);
+} as (code?: number) => never;
+
+// Kill VS Code if the parent process dies.
+if (typeof process.env.CODE_SERVER_PARENT_PID !== 'undefined') {
+ const parentPid = parseInt(process.env.CODE_SERVER_PARENT_PID, 10);
+ setInterval(() => {
+ try {
+ process.kill(parentPid, 0); // Throws an exception if the process doesn't exist anymore.
+ } catch (e) {
+ exit();
+ }
+ }, 5000);
+} else {
+ logger.error('no parent process');
+ exit(1);
+}
+
+const vscode = new Vscode();
+const send = (message: VscodeMessage): void => {
+ if (!process.send) {
+ throw new Error('not spawned with IPC');
+ }
+ process.send(message);
+};
+
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+// Wait for the init message then start up VS Code. Subsequent messages will
+// return new workbench options without starting a new instance.
Implement new structure
2020-02-04 20:27:46 +01:00
+process.on('message', async (message: CodeServerMessage, socket) => {
+ logger.debug('got message from code-server', field('message', message));
+ switch (message.type) {
+ case 'init':
+ try {
+ const options = await vscode.initialize(message.options);
+ send({ type: 'options', id: message.id, options });
+ } catch (error) {
+ logger.error(error.message);
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
+ logger.error(error.stack);
Implement new structure
2020-02-04 20:27:46 +01:00
+ exit(1);
+ }
+ break;
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ case 'cli':
+ try {
+ await vscode.cli(message.args);
+ exit(0);
+ } catch (error) {
+ logger.error(error.message);
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
+ logger.error(error.stack);
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ exit(1);
+ }
+ break;
Implement new structure
2020-02-04 20:27:46 +01:00
+ case 'socket':
+ vscode.handleWebSocket(socket, message.query);
+ break;
+ }
+});
+if (!process.send) {
+ logger.error('not spawned with IPC');
+ exit(1);
+} else {
+ // This lets the parent know the child is ready to receive messages.
+ send({ type: 'ready' });
+}
diff --git a/src/vs/server/fork.js b/src/vs/server/fork.js
new file mode 100644
index 0000000000..56331ff1fc
--- /dev/null
+++ b/src/vs/server/fork.js
@@ -0,0 +1,3 @@
+// This must be a JS file otherwise when it gets compiled it turns into AMD
+// syntax which will not work without the right loader.
+require('../../bootstrap-amd').load('vs/server/entry');
diff --git a/src/vs/server/ipc.d.ts b/src/vs/server/ipc.d.ts
new file mode 100644
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
index 0000000000..0a9c95d50e
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/ipc.d.ts
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
@@ -0,0 +1,117 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+/**
+ * External interfaces for integration into code-server over IPC. No vs imports
+ * should be made in this file.
+ */
Add base path to update endpoint from VS Code This will make it work regardless of what the current URL happens to be. Also move the telemetry setting into the options since we might as well make use of it seeing as how we have to parse it for the base path anyway.
2020-03-13 22:44:56 +01:00
+export interface Options {
+ base: string
+ commit: string
+ disableTelemetry: boolean
+}
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export interface InitMessage {
+ type: 'init';
+ id: string;
+ options: VscodeOptions;
+}
+
+export type Query = { [key: string]: string | string[] | undefined };
+
+export interface SocketMessage {
+ type: 'socket';
+ query: Query;
+}
+
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+export interface CliMessage {
+ type: 'cli';
+ args: Args;
+}
+
+export type CodeServerMessage = InitMessage | SocketMessage | CliMessage;
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export interface ReadyMessage {
+ type: 'ready';
+}
+
+export interface OptionsMessage {
+ id: string;
+ type: 'options';
+ options: WorkbenchOptions;
+}
+
+export type VscodeMessage = ReadyMessage | OptionsMessage;
+
+export interface StartPath {
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ url: string;
+ workspace: boolean;
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+export interface Args {
Move user data directory logic out of patch
2020-02-06 20:11:38 +01:00
+ 'user-data-dir'?: string;
+
+ 'extensions-dir'?: string;
+ 'builtin-extensions-dir'?: string;
+ 'extra-extensions-dir'?: string[];
+ 'extra-builtin-extensions-dir'?: string[];
+
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
+ locale?: string
+
Move user data directory logic out of patch
2020-02-06 20:11:38 +01:00
+ log?: string;
+ verbose?: boolean;
+
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ _: string[];
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
+export interface VscodeOptions {
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ readonly args: Args;
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ readonly remoteAuthority: string;
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ readonly startPath?: StartPath;
Implement new structure
2020-02-04 20:27:46 +01:00
+}
+
+export interface VscodeOptionsMessage extends VscodeOptions {
+ readonly id: string;
+}
+
+export interface UriComponents {
+ readonly scheme: string;
+ readonly authority: string;
+ readonly path: string;
+ readonly query: string;
+ readonly fragment: string;
+}
+
+export interface NLSConfiguration {
+ locale: string;
+ availableLanguages: {
+ [key: string]: string;
+ };
+ pseudo?: boolean;
+ _languagePackSupport?: boolean;
+}
+
+export interface WorkbenchOptions {
+ readonly workbenchWebConfiguration: {
+ readonly remoteAuthority?: string;
+ readonly folderUri?: UriComponents;
+ readonly workspaceUri?: UriComponents;
+ readonly logLevel?: number;
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ readonly workspaceProvider?: {
+ payload: [["userDataPath", string]];
+ };
Implement new structure
2020-02-04 20:27:46 +01:00
+ };
+ readonly remoteUserDataUri: UriComponents;
+ readonly productConfiguration: {
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
+ codeServerVersion?: string;
Implement new structure
2020-02-04 20:27:46 +01:00
+ readonly extensionsGallery?: {
+ readonly serviceUrl: string;
+ readonly itemUrl: string;
+ readonly controlUrl: string;
+ readonly recommendationsUrl: string;
+ };
+ };
+ readonly nlsConfiguration: NLSConfiguration;
+ readonly commit: string;
+}
+
+export interface WorkbenchOptionsMessage {
+ id: string;
+}
diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts
new file mode 100644
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 0000000000..6590636abd
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/channel.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -0,0 +1,338 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Server } from '@coder/node-browser';
+import * as path from 'path';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+import { VSBuffer } from 'vs/base/common/buffer';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { Emitter, Event } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { OS } from 'vs/base/common/platform';
+import { ReadableStreamEventPayload } from 'vs/base/common/stream';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { transformOutgoingURIs } from 'vs/base/common/uriIpc';
+import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { FileDeleteOptions, FileOpenOptions, FileOverwriteOptions, FileReadStreamOptions, FileType, FileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files';
+import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
+import { ILogService } from 'vs/platform/log/common/log';
+import product from 'vs/platform/product/common/product';
+import { IRemoteAgentEnvironment, RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INodeProxyService } from 'vs/server/common/nodeProxy';
+import { getTranslations } from 'vs/server/node/nls';
+import { getUriTransformer } from 'vs/server/node/util';
+import { IFileChangeDto } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
+
+/**
+ * Extend the file provider to allow unwatching.
+ */
+class Watcher extends DiskFileSystemProvider {
+ public readonly watches = new Map<number, IDisposable>();
+
+ public dispose(): void {
+ this.watches.forEach((w) => w.dispose());
+ this.watches.clear();
+ super.dispose();
+ }
+
+ public _watch(req: number, resource: URI, opts: IWatchOptions): void {
+ this.watches.set(req, this.watch(resource, opts));
+ }
+
+ public unwatch(req: number): void {
+ this.watches.get(req)!.dispose();
+ this.watches.delete(req);
+ }
+}
+
+export class FileProviderChannel implements IServerChannel<RemoteAgentConnectionContext>, IDisposable {
+ private readonly provider: DiskFileSystemProvider;
+ private readonly watchers = new Map<string, Watcher>();
+
+ public constructor(
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ private readonly environmentService: INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ private readonly logService: ILogService,
+ ) {
+ this.provider = new DiskFileSystemProvider(this.logService);
+ }
+
+ public listen(context: RemoteAgentConnectionContext, event: string, args?: any): Event<any> {
+ switch (event) {
+ case 'filechange': return this.filechange(context, args[0]);
+ case 'readFileStream': return this.readFileStream(args[0], args[1]);
+ }
+
+ throw new Error(`Invalid listen '${event}'`);
+ }
+
+ private filechange(context: RemoteAgentConnectionContext, session: string): Event<IFileChangeDto[]> {
+ const emitter = new Emitter<IFileChangeDto[]>({
+ onFirstListenerAdd: () => {
+ const provider = new Watcher(this.logService);
+ this.watchers.set(session, provider);
+ const transformer = getUriTransformer(context.remoteAuthority);
+ provider.onDidChangeFile((events) => {
+ emitter.fire(events.map((event) => ({
+ ...event,
+ resource: transformer.transformOutgoing(event.resource),
+ })));
+ });
+ provider.onDidErrorOccur((event) => this.logService.error(event));
+ },
+ onLastListenerRemove: () => {
+ this.watchers.get(session)!.dispose();
+ this.watchers.delete(session);
+ },
+ });
+
+ return emitter.event;
+ }
+
+ private readFileStream(resource: UriComponents, opts: FileReadStreamOptions): Event<ReadableStreamEventPayload<VSBuffer>> {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ const cts = new CancellationTokenSource();
+ const fileStream = this.provider.readFileStream(this.transform(resource), opts, cts.token);
Implement new structure
2020-02-04 20:27:46 +01:00
+ const emitter = new Emitter<ReadableStreamEventPayload<VSBuffer>>({
+ onFirstListenerAdd: () => {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ fileStream.on('data', (data) => emitter.fire(VSBuffer.wrap(data)));
+ fileStream.on('error', (error) => emitter.fire(error));
+ fileStream.on('end', () => emitter.fire('end'));
Implement new structure
2020-02-04 20:27:46 +01:00
+ },
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ onLastListenerRemove: () => cts.cancel(),
Implement new structure
2020-02-04 20:27:46 +01:00
+ });
+
+ return emitter.event;
+ }
+
+ public call(_: unknown, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'stat': return this.stat(args[0]);
+ case 'open': return this.open(args[0], args[1]);
+ case 'close': return this.close(args[0]);
+ case 'read': return this.read(args[0], args[1], args[2]);
+ case 'readFile': return this.readFile(args[0]);
+ case 'write': return this.write(args[0], args[1], args[2], args[3], args[4]);
+ case 'writeFile': return this.writeFile(args[0], args[1], args[2]);
+ case 'delete': return this.delete(args[0], args[1]);
+ case 'mkdir': return this.mkdir(args[0]);
+ case 'readdir': return this.readdir(args[0]);
+ case 'rename': return this.rename(args[0], args[1], args[2]);
+ case 'copy': return this.copy(args[0], args[1], args[2]);
+ case 'watch': return this.watch(args[0], args[1], args[2], args[3]);
+ case 'unwatch': return this.unwatch(args[0], args[1]);
+ }
+
+ throw new Error(`Invalid call '${command}'`);
+ }
+
+ public dispose(): void {
+ this.watchers.forEach((w) => w.dispose());
+ this.watchers.clear();
+ }
+
+ private async stat(resource: UriComponents): Promise<IStat> {
+ return this.provider.stat(this.transform(resource));
+ }
+
+ private async open(resource: UriComponents, opts: FileOpenOptions): Promise<number> {
+ return this.provider.open(this.transform(resource), opts);
+ }
+
+ private async close(fd: number): Promise<void> {
+ return this.provider.close(fd);
+ }
+
+ private async read(fd: number, pos: number, length: number): Promise<[VSBuffer, number]> {
+ const buffer = VSBuffer.alloc(length);
+ const bytesRead = await this.provider.read(fd, pos, buffer.buffer, 0, length);
+ return [buffer, bytesRead];
+ }
+
+ private async readFile(resource: UriComponents): Promise<VSBuffer> {
+ return VSBuffer.wrap(await this.provider.readFile(this.transform(resource)));
+ }
+
+ private write(fd: number, pos: number, buffer: VSBuffer, offset: number, length: number): Promise<number> {
+ return this.provider.write(fd, pos, buffer.buffer, offset, length);
+ }
+
+ private writeFile(resource: UriComponents, buffer: VSBuffer, opts: FileWriteOptions): Promise<void> {
+ return this.provider.writeFile(this.transform(resource), buffer.buffer, opts);
+ }
+
+ private async delete(resource: UriComponents, opts: FileDeleteOptions): Promise<void> {
+ return this.provider.delete(this.transform(resource), opts);
+ }
+
+ private async mkdir(resource: UriComponents): Promise<void> {
+ return this.provider.mkdir(this.transform(resource));
+ }
+
+ private async readdir(resource: UriComponents): Promise<[string, FileType][]> {
+ return this.provider.readdir(this.transform(resource));
+ }
+
+ private async rename(resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Promise<void> {
+ return this.provider.rename(this.transform(resource), URI.from(target), opts);
+ }
+
+ private copy(resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Promise<void> {
+ return this.provider.copy(this.transform(resource), URI.from(target), opts);
+ }
+
+ private async watch(session: string, req: number, resource: UriComponents, opts: IWatchOptions): Promise<void> {
+ this.watchers.get(session)!._watch(req, this.transform(resource), opts);
+ }
+
+ private async unwatch(session: string, req: number): Promise<void> {
+ this.watchers.get(session)!.unwatch(req);
+ }
+
+ private transform(resource: UriComponents): URI {
+ // Used for walkthrough content.
+ if (/^\/static[^/]*\//.test(resource.path)) {
+ return URI.file(this.environmentService.appRoot + resource.path.replace(/^\/static[^/]*\//, '/'));
+ // Used by the webview service worker to load resources.
+ } else if (resource.path === '/vscode-resource' && resource.query) {
+ try {
+ const query = JSON.parse(resource.query);
+ if (query.requestResourcePath) {
+ return URI.file(query.requestResourcePath);
+ }
+ } catch (error) { /* Carry on. */ }
+ }
+ return URI.from(resource);
+ }
+}
+
+export class ExtensionEnvironmentChannel implements IServerChannel {
+ public constructor(
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ private readonly environment: INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ private readonly log: ILogService,
+ private readonly telemetry: ITelemetryService,
+ private readonly connectionToken: string,
+ ) {}
+
+ public listen(_: unknown, event: string): Event<any> {
+ throw new Error(`Invalid listen '${event}'`);
+ }
+
+ public async call(context: any, command: string, args?: any): Promise<any> {
+ switch (command) {
+ case 'getEnvironmentData':
+ return transformOutgoingURIs(
+ await this.getEnvironmentData(args.language),
+ getUriTransformer(context.remoteAuthority),
+ );
+ case 'getDiagnosticInfo': return this.getDiagnosticInfo();
+ case 'disableTelemetry': return this.disableTelemetry();
+ }
+ throw new Error(`Invalid call '${command}'`);
+ }
+
+ private async getEnvironmentData(locale: string): Promise<IRemoteAgentEnvironment> {
+ return {
+ pid: process.pid,
+ connectionToken: this.connectionToken,
+ appRoot: URI.file(this.environment.appRoot),
+ appSettingsHome: this.environment.appSettingsHome,
Initialize config and use correct settings path Fixes #1829.
2020-06-24 18:40:17 +02:00
+ settingsPath: this.environment.settingsResource,
Implement new structure
2020-02-04 20:27:46 +01:00
+ logsPath: URI.file(this.environment.logsPath),
+ extensionsPath: URI.file(this.environment.extensionsPath!),
+ extensionHostLogsPath: URI.file(path.join(this.environment.logsPath, 'extension-host')),
+ globalStorageHome: URI.file(this.environment.globalStorageHome),
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ userHome: this.environment.userHome,
Implement new structure
2020-02-04 20:27:46 +01:00
+ extensions: await this.scanExtensions(locale),
+ os: OS,
+ };
+ }
+
+ private async scanExtensions(locale: string): Promise<IExtensionDescription[]> {
+ const translations = await getTranslations(locale, this.environment.userDataPath);
+
+ const scanMultiple = (isBuiltin: boolean, isUnderDevelopment: boolean, paths: string[]): Promise<IExtensionDescription[][]> => {
+ return Promise.all(paths.map((path) => {
+ return ExtensionScanner.scanExtensions(new ExtensionScannerInput(
+ product.version,
+ product.commit,
+ locale,
+ !!process.env.VSCODE_DEV,
+ path,
+ isBuiltin,
+ isUnderDevelopment,
+ translations,
+ ), this.log);
+ }));
+ };
+
+ const scanBuiltin = async (): Promise<IExtensionDescription[][]> => {
+ return scanMultiple(true, false, [this.environment.builtinExtensionsPath, ...this.environment.extraBuiltinExtensionPaths]);
+ };
+
+ const scanInstalled = async (): Promise<IExtensionDescription[][]> => {
+ return scanMultiple(false, true, [this.environment.extensionsPath!, ...this.environment.extraExtensionPaths]);
+ };
+
+ return Promise.all([scanBuiltin(), scanInstalled()]).then((allExtensions) => {
+ const uniqueExtensions = new Map<string, IExtensionDescription>();
+ allExtensions.forEach((multipleExtensions) => {
+ multipleExtensions.forEach((extensions) => {
+ extensions.forEach((extension) => {
+ const id = ExtensionIdentifier.toKey(extension.identifier);
+ if (uniqueExtensions.has(id)) {
+ const oldPath = uniqueExtensions.get(id)!.extensionLocation.fsPath;
+ const newPath = extension.extensionLocation.fsPath;
+ this.log.warn(`${oldPath} has been overridden ${newPath}`);
+ }
+ uniqueExtensions.set(id, extension);
+ });
+ });
+ });
+ return Array.from(uniqueExtensions.values());
+ });
+ }
+
+ private getDiagnosticInfo(): Promise<IDiagnosticInfo> {
+ throw new Error('not implemented');
+ }
+
+ private async disableTelemetry(): Promise<void> {
+ this.telemetry.setEnabled(false);
+ }
+}
+
+export class NodeProxyService implements INodeProxyService {
+ public _serviceBrand = undefined;
+
+ public readonly server: Server;
+
+ private readonly _onMessage = new Emitter<string>();
+ public readonly onMessage = this._onMessage.event;
+ private readonly _$onMessage = new Emitter<string>();
+ public readonly $onMessage = this._$onMessage.event;
+ public readonly _onDown = new Emitter<void>();
+ public readonly onDown = this._onDown.event;
+ public readonly _onUp = new Emitter<void>();
+ public readonly onUp = this._onUp.event;
+
+ // Unused because the server connection will never permanently close.
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+
+ public constructor() {
+ // TODO: down/up
+ this.server = new Server({
+ onMessage: this.$onMessage,
+ onClose: this.onClose,
+ onDown: this.onDown,
+ onUp: this.onUp,
+ send: (message: string): void => {
+ this._onMessage.fire(message);
+ }
+ });
+ }
+
+ public send(message: string): void {
+ this._$onMessage.fire(message);
+ }
+}
diff --git a/src/vs/server/node/connection.ts b/src/vs/server/node/connection.ts
new file mode 100644
Fix connections sticking around indefinitely For some reason it only affects the extension host socket (something to do with passing it via IPC?) but I changed both just to be sure. Fixes #1795.
2020-06-30 23:41:47 +02:00
index 0000000000..36e80fb696
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/connection.ts
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
@@ -0,0 +1,157 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as cp from 'child_process';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { Emitter } from 'vs/base/common/event';
+import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
+import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ILogService } from 'vs/platform/log/common/log';
+import { getNlsConfiguration } from 'vs/server/node/nls';
+import { Protocol } from 'vs/server/node/protocol';
+import { IExtHostReadyMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
+
+export abstract class Connection {
+ private readonly _onClose = new Emitter<void>();
+ public readonly onClose = this._onClose.event;
+ private disposed = false;
+ private _offline: number | undefined;
+
+ public constructor(protected protocol: Protocol, public readonly token: string) {}
+
+ public get offline(): number | undefined {
+ return this._offline;
+ }
+
+ public reconnect(socket: ISocket, buffer: VSBuffer): void {
+ this._offline = undefined;
+ this.doReconnect(socket, buffer);
+ }
+
+ public dispose(): void {
+ if (!this.disposed) {
+ this.disposed = true;
+ this.doDispose();
+ this._onClose.fire();
+ }
+ }
+
+ protected setOffline(): void {
+ if (!this._offline) {
+ this._offline = Date.now();
+ }
+ }
+
+ /**
+ * Set up the connection on a new socket.
+ */
+ protected abstract doReconnect(socket: ISocket, buffer: VSBuffer): void;
+ protected abstract doDispose(): void;
+}
+
+/**
+ * Used for all the IPC channels.
+ */
+export class ManagementConnection extends Connection {
+ public constructor(protected protocol: Protocol, token: string) {
+ super(protocol, token);
+ protocol.onClose(() => this.dispose()); // Explicit close.
+ protocol.onSocketClose(() => this.setOffline()); // Might reconnect.
+ }
+
+ protected doDispose(): void {
+ this.protocol.sendDisconnect();
+ this.protocol.dispose();
Fix connections sticking around indefinitely For some reason it only affects the extension host socket (something to do with passing it via IPC?) but I changed both just to be sure. Fixes #1795.
2020-06-30 23:41:47 +02:00
+ this.protocol.getUnderlyingSocket().destroy();
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
+ this.protocol.beginAcceptReconnection(socket, buffer);
+ this.protocol.endAcceptReconnection();
+ }
+}
+
+export class ExtensionHostConnection extends Connection {
+ private process?: cp.ChildProcess;
+
+ public constructor(
+ locale:string, protocol: Protocol, buffer: VSBuffer, token: string,
+ private readonly log: ILogService,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ private readonly environment: INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ ) {
+ super(protocol, token);
+ this.protocol.dispose();
+ this.spawn(locale, buffer).then((p) => this.process = p);
+ this.protocol.getUnderlyingSocket().pause();
+ }
+
+ protected doDispose(): void {
+ if (this.process) {
+ this.process.kill();
+ }
Fix connections sticking around indefinitely For some reason it only affects the extension host socket (something to do with passing it via IPC?) but I changed both just to be sure. Fixes #1795.
2020-06-30 23:41:47 +02:00
+ this.protocol.getUnderlyingSocket().destroy();
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
+ // This is just to set the new socket.
+ this.protocol.beginAcceptReconnection(socket, null);
+ this.protocol.dispose();
+ this.sendInitMessage(buffer);
+ }
+
+ private sendInitMessage(buffer: VSBuffer): void {
+ const socket = this.protocol.getUnderlyingSocket();
+ socket.pause();
+ this.process!.send({ // Process must be set at this point.
+ type: 'VSCODE_EXTHOST_IPC_SOCKET',
+ initialDataChunk: (buffer.buffer as Buffer).toString('base64'),
+ skipWebSocketFrames: this.protocol.getSocket() instanceof NodeSocket,
+ }, socket);
+ }
+
+ private async spawn(locale: string, buffer: VSBuffer): Promise<cp.ChildProcess> {
+ const config = await getNlsConfiguration(locale, this.environment.userDataPath);
+ const proc = cp.fork(
+ getPathFromAmdModule(require, 'bootstrap-fork'),
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
+ [ '--type=extensionHost' ],
Implement new structure
2020-02-04 20:27:46 +01:00
+ {
+ env: {
+ ...process.env,
+ AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',
+ PIPE_LOGGING: 'true',
+ VERBOSE_LOGGING: 'true',
+ VSCODE_EXTHOST_WILL_SEND_SOCKET: 'true',
+ VSCODE_HANDLES_UNCAUGHT_ERRORS: 'true',
+ VSCODE_LOG_STACK: 'false',
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
+ VSCODE_LOG_LEVEL: process.env.LOG_LEVEL,
Implement new structure
2020-02-04 20:27:46 +01:00
+ VSCODE_NLS_CONFIG: JSON.stringify(config),
+ },
+ silent: true,
+ },
+ );
+
+ proc.on('error', () => this.dispose());
+ proc.on('exit', () => this.dispose());
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ if (proc.stdout && proc.stderr) {
+ proc.stdout.setEncoding('utf8').on('data', (d) => this.log.info('Extension host stdout', d));
+ proc.stderr.setEncoding('utf8').on('data', (d) => this.log.error('Extension host stderr', d));
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+ proc.on('message', (event) => {
+ if (event && event.type === '__$console') {
+ const severity = (<any>this.log)[event.severity] ? event.severity : 'info';
+ (<any>this.log)[severity]('Extension host', event.arguments);
+ }
+ if (event && event.type === 'VSCODE_EXTHOST_DISCONNECTED') {
+ this.setOffline();
+ }
+ });
+
+ const listen = (message: IExtHostReadyMessage) => {
+ if (message.type === 'VSCODE_EXTHOST_IPC_READY') {
+ proc.removeListener('message', listen);
+ this.sendInitMessage(buffer);
+ }
+ };
+
+ return proc.on('message', listen);
+ }
+}
diff --git a/src/vs/server/node/insights.ts b/src/vs/server/node/insights.ts
new file mode 100644
index 0000000000..a0ece345f2
--- /dev/null
+++ b/src/vs/server/node/insights.ts
@@ -0,0 +1,124 @@
+import * as appInsights from 'applicationinsights';
+import * as https from 'https';
+import * as http from 'http';
+import * as os from 'os';
+
+class Channel {
+ public get _sender() {
+ throw new Error('unimplemented');
+ }
+ public get _buffer() {
+ throw new Error('unimplemented');
+ }
+
+ public setUseDiskRetryCaching(): void {
+ throw new Error('unimplemented');
+ }
+ public send(): void {
+ throw new Error('unimplemented');
+ }
+ public triggerSend(): void {
+ throw new Error('unimplemented');
+ }
+}
+
+export class TelemetryClient {
+ public context: any = undefined;
+ public commonProperties: any = undefined;
+ public config: any = {};
+
+ public channel: any = new Channel();
+
+ public addTelemetryProcessor(): void {
+ throw new Error('unimplemented');
+ }
+
+ public clearTelemetryProcessors(): void {
+ throw new Error('unimplemented');
+ }
+
+ public runTelemetryProcessors(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackTrace(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackMetric(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackException(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackRequest(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackDependency(): void {
+ throw new Error('unimplemented');
+ }
+
+ public track(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackNodeHttpRequestSync(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackNodeHttpRequest(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackNodeHttpDependency(): void {
+ throw new Error('unimplemented');
+ }
+
+ public trackEvent(options: appInsights.Contracts.EventTelemetry): void {
+ if (!options.properties) {
+ options.properties = {};
+ }
+ if (!options.measurements) {
+ options.measurements = {};
+ }
+
+ try {
+ const cpus = os.cpus();
+ options.measurements.cores = cpus.length;
+ options.properties['common.cpuModel'] = cpus[0].model;
+ } catch (error) {}
+
+ try {
+ options.measurements.memoryFree = os.freemem();
+ options.measurements.memoryTotal = os.totalmem();
+ } catch (error) {}
+
+ try {
+ options.properties['common.shell'] = os.userInfo().shell;
+ options.properties['common.release'] = os.release();
+ options.properties['common.arch'] = os.arch();
+ } catch (error) {}
+
+ try {
+ const url = process.env.TELEMETRY_URL || 'https://v1.telemetry.coder.com/track';
+ const request = (/^http:/.test(url) ? http : https).request(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+ request.on('error', () => { /* We don't care. */ });
+ request.write(JSON.stringify(options));
+ request.end();
+ } catch (error) {}
+ }
+
+ public flush(options: { callback: (v: string) => void }): void {
+ if (options.callback) {
+ options.callback('');
+ }
+ }
+}
diff --git a/src/vs/server/node/ipc.ts b/src/vs/server/node/ipc.ts
new file mode 100644
index 0000000000..5e560eb46e
--- /dev/null
+++ b/src/vs/server/node/ipc.ts
@@ -0,0 +1,61 @@
+import * as cp from 'child_process';
+import { Emitter } from 'vs/base/common/event';
+
+enum ControlMessage {
+ okToChild = 'ok>',
+ okFromChild = 'ok<',
+}
+
+interface RelaunchMessage {
+ type: 'relaunch';
+ version: string;
+}
+
+export type Message = RelaunchMessage;
+
+class IpcMain {
+ protected readonly _onMessage = new Emitter<Message>();
+ public readonly onMessage = this._onMessage.event;
+
+ public handshake(child?: cp.ChildProcess): Promise<void> {
+ return new Promise((resolve, reject) => {
+ const target = child || process;
+ if (!target.send) {
+ throw new Error('Not spawned with IPC enabled');
+ }
+ target.on('message', (message) => {
+ if (message === child ? ControlMessage.okFromChild : ControlMessage.okToChild) {
+ target.removeAllListeners();
+ target.on('message', (msg) => this._onMessage.fire(msg));
+ if (child) {
+ target.send!(ControlMessage.okToChild);
+ }
+ resolve();
+ }
+ });
+ if (child) {
+ child.once('error', reject);
+ child.once('exit', (code) => {
+ const error = new Error(`Unexpected exit with code ${code}`);
+ (error as any).code = code;
+ reject(error);
+ });
+ } else {
+ target.send(ControlMessage.okFromChild);
+ }
+ });
+ }
+
+ public relaunch(version: string): void {
+ this.send({ type: 'relaunch', version });
+ }
+
+ private send(message: Message): void {
+ if (!process.send) {
+ throw new Error('Not a child process with IPC enabled');
+ }
+ process.send(message);
+ }
+}
+
+export const ipcMain = new IpcMain();
diff --git a/src/vs/server/node/logger.ts b/src/vs/server/node/logger.ts
new file mode 100644
index 0000000000..2a39c524aa
--- /dev/null
+++ b/src/vs/server/node/logger.ts
@@ -0,0 +1,2 @@
+import { logger as baseLogger } from '@coder/logger';
+export const logger = baseLogger.named('vscode');
diff --git a/src/vs/server/node/marketplace.ts b/src/vs/server/node/marketplace.ts
new file mode 100644
Switch to new extensions API
2020-02-19 21:36:42 +01:00
index 0000000000..8956fc40d4
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/marketplace.ts
@@ -0,0 +1,174 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as tarStream from 'tar-stream';
+import * as util from 'util';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { mkdirp } from 'vs/base/node/pfs';
+import * as vszip from 'vs/base/node/zip';
+import * as nls from 'vs/nls';
+import product from 'vs/platform/product/common/product';
+
+// We will be overriding these, so keep a reference to the original.
+const vszipExtract = vszip.extract;
+const vszipBuffer = vszip.buffer;
+
+export interface IExtractOptions {
+ overwrite?: boolean;
+ /**
+ * Source path within the TAR/ZIP archive. Only the files
+ * contained in this path will be extracted.
+ */
+ sourcePath?: string;
+}
+
+export interface IFile {
+ path: string;
+ contents?: Buffer | string;
+ localPath?: string;
+}
+
+export const tar = async (tarPath: string, files: IFile[]): Promise<string> => {
+ const pack = tarStream.pack();
+ const chunks: Buffer[] = [];
+ const ended = new Promise<Buffer>((resolve) => {
+ pack.on('end', () => resolve(Buffer.concat(chunks)));
+ });
+ pack.on('data', (chunk: Buffer) => chunks.push(chunk));
+ for (let i = 0; i < files.length; i++) {
+ const file = files[i];
+ pack.entry({ name: file.path }, file.contents);
+ }
+ pack.finalize();
+ await util.promisify(fs.writeFile)(tarPath, await ended);
+ return tarPath;
+};
+
+export const extract = async (archivePath: string, extractPath: string, options: IExtractOptions = {}, token: CancellationToken): Promise<void> => {
+ try {
+ await extractTar(archivePath, extractPath, options, token);
+ } catch (error) {
+ if (error.toString().includes('Invalid tar header')) {
+ await vszipExtract(archivePath, extractPath, options, token);
+ }
+ }
+};
+
+export const buffer = (targetPath: string, filePath: string): Promise<Buffer> => {
+ return new Promise<Buffer>(async (resolve, reject) => {
+ try {
+ let done: boolean = false;
+ await extractAssets(targetPath, new RegExp(filePath), (assetPath: string, data: Buffer) => {
+ if (path.normalize(assetPath) === path.normalize(filePath)) {
+ done = true;
+ resolve(data);
+ }
+ });
+ if (!done) {
+ throw new Error('couldn\'t find asset ' + filePath);
+ }
+ } catch (error) {
+ if (error.toString().includes('Invalid tar header')) {
+ vszipBuffer(targetPath, filePath).then(resolve).catch(reject);
+ } else {
+ reject(error);
+ }
+ }
+ });
+};
+
+const extractAssets = async (tarPath: string, match: RegExp, callback: (path: string, data: Buffer) => void): Promise<void> => {
+ return new Promise<void>((resolve, reject): void => {
+ const extractor = tarStream.extract();
+ const fail = (error: Error) => {
+ extractor.destroy();
+ reject(error);
+ };
+ extractor.once('error', fail);
+ extractor.on('entry', async (header, stream, next) => {
+ const name = header.name;
+ if (match.test(name)) {
+ extractData(stream).then((data) => {
+ callback(name, data);
+ next();
+ }).catch(fail);
+ } else {
+ stream.on('end', () => next());
+ stream.resume(); // Just drain it.
+ }
+ });
+ extractor.on('finish', resolve);
+ fs.createReadStream(tarPath).pipe(extractor);
+ });
+};
+
+const extractData = (stream: NodeJS.ReadableStream): Promise<Buffer> => {
+ return new Promise((resolve, reject): void => {
+ const fileData: Buffer[] = [];
+ stream.on('error', reject);
+ stream.on('end', () => resolve(Buffer.concat(fileData)));
+ stream.on('data', (data) => fileData.push(data));
+ });
+};
+
+const extractTar = async (tarPath: string, targetPath: string, options: IExtractOptions = {}, token: CancellationToken): Promise<void> => {
+ return new Promise<void>((resolve, reject): void => {
+ const sourcePathRegex = new RegExp(options.sourcePath ? `^${options.sourcePath}` : '');
+ const extractor = tarStream.extract();
+ const fail = (error: Error) => {
+ extractor.destroy();
+ reject(error);
+ };
+ extractor.once('error', fail);
+ extractor.on('entry', async (header, stream, next) => {
+ const nextEntry = (): void => {
+ stream.on('end', () => next());
+ stream.resume();
+ };
+
+ const rawName = path.normalize(header.name);
+ if (token.isCancellationRequested || !sourcePathRegex.test(rawName)) {
+ return nextEntry();
+ }
+
+ const fileName = rawName.replace(sourcePathRegex, '');
+ const targetFileName = path.join(targetPath, fileName);
+ if (/\/$/.test(fileName)) {
+ return mkdirp(targetFileName).then(nextEntry);
+ }
+
+ const dirName = path.dirname(fileName);
+ const targetDirName = path.join(targetPath, dirName);
+ if (targetDirName.indexOf(targetPath) !== 0) {
+ return fail(new Error(nls.localize('invalid file', 'Error extracting {0}. Invalid file.', fileName)));
+ }
+
+ await mkdirp(targetDirName, undefined);
+
+ const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
+ fstream.once('close', () => next());
+ fstream.once('error', fail);
+ stream.pipe(fstream);
+ });
+ extractor.once('finish', resolve);
+ fs.createReadStream(tarPath).pipe(extractor);
+ });
+};
+
+/**
+ * Override original functionality so we can use a custom marketplace with
+ * either tars or zips.
+ */
+export const enableCustomMarketplace = (): void => {
+ (<any>product).extensionsGallery = { // Use `any` to override readonly.
Switch to new extensions API
2020-02-19 21:36:42 +01:00
+ serviceUrl: process.env.SERVICE_URL || 'https://extensions.coder.com/api',
Implement new structure
2020-02-04 20:27:46 +01:00
+ itemUrl: process.env.ITEM_URL || '',
+ controlUrl: '',
+ recommendationsUrl: '',
+ ...(product.extensionsGallery || {}),
+ };
+
+ const target = vszip as typeof vszip;
+ target.zip = tar;
+ target.extract = extract;
+ target.buffer = buffer;
+};
diff --git a/src/vs/server/node/nls.ts b/src/vs/server/node/nls.ts
new file mode 100644
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
index 0000000000..3d428a57d3
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/nls.ts
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
@@ -0,0 +1,88 @@
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as fs from 'fs';
+import * as path from 'path';
+import * as util from 'util';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import * as lp from 'vs/base/node/languagePacks';
+import product from 'vs/platform/product/common/product';
+import { Translations } from 'vs/workbench/services/extensions/common/extensionPoints';
+
+const configurations = new Map<string, Promise<lp.NLSConfiguration>>();
+const metadataPath = path.join(getPathFromAmdModule(require, ''), 'nls.metadata.json');
+
+export const isInternalConfiguration = (config: lp.NLSConfiguration): config is lp.InternalNLSConfiguration => {
+ return config && !!(<lp.InternalNLSConfiguration>config)._languagePackId;
+};
+
+const DefaultConfiguration = {
+ locale: 'en',
+ availableLanguages: {},
+};
+
+export const getNlsConfiguration = async (locale: string, userDataPath: string): Promise<lp.NLSConfiguration> => {
+ const id = `${locale}: ${userDataPath}`;
+ if (!configurations.has(id)) {
+ configurations.set(id, new Promise(async (resolve) => {
+ const config = product.commit && await util.promisify(fs.exists)(metadataPath)
+ ? await lp.getNLSConfiguration(product.commit, userDataPath, metadataPath, locale)
+ : DefaultConfiguration;
+ if (isInternalConfiguration(config)) {
+ config._languagePackSupport = true;
+ }
+ // If the configuration has no results keep trying since code-server
+ // doesn't restart when a language is installed so this result would
+ // persist (the plugin might not be installed yet or something).
+ if (config.locale !== 'en' && config.locale !== 'en-us' && Object.keys(config.availableLanguages).length === 0) {
+ configurations.delete(id);
+ }
+ resolve(config);
+ }));
+ }
+ return configurations.get(id)!;
+};
+
+export const getTranslations = async (locale: string, userDataPath: string): Promise<Translations> => {
+ const config = await getNlsConfiguration(locale, userDataPath);
+ if (isInternalConfiguration(config)) {
+ try {
+ return JSON.parse(await util.promisify(fs.readFile)(config._translationsConfigFile, 'utf8'));
+ } catch (error) { /* Nothing yet. */}
+ }
+ return {};
+};
+
+export const getLocaleFromConfig = async (userDataPath: string): Promise<string> => {
Update locale file location Should make language packs work again.
2020-02-20 19:38:46 +01:00
+ const files = ['locale.json', 'argv.json'];
+ for (let i = 0; i < files.length; ++i) {
+ try {
+ const localeConfigUri = path.join(userDataPath, 'User', files[i]);
+ const content = stripComments(await util.promisify(fs.readFile)(localeConfigUri, 'utf8'));
+ return JSON.parse(content).locale;
+ } catch (error) { /* Ignore. */ }
+ }
+ return 'en';
Implement new structure
2020-02-04 20:27:46 +01:00
+};
+
+// Taken from src/main.js in the main VS Code source.
+const stripComments = (content: string): string => {
+ const regexp = /('(?:[^\\']*(?:\\.)?)*')|('(?:[^\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
+
+ return content.replace(regexp, (match, _m1, _m2, m3, m4) => {
+ // Only one of m1, m2, m3, m4 matches
+ if (m3) {
+ // A block comment. Replace with nothing
+ return '';
+ } else if (m4) {
+ // A line comment. If it ends in \r?\n then keep it.
+ const length_1 = m4.length;
+ if (length_1 > 2 && m4[length_1 - 1] === '\n') {
+ return m4[length_1 - 2] === '\r' ? '\r\n' : '\n';
+ }
+ else {
+ return '';
+ }
+ } else {
+ // We match a string
+ return match;
+ }
+ });
+};
diff --git a/src/vs/server/node/protocol.ts b/src/vs/server/node/protocol.ts
new file mode 100644
index 0000000000..3c74512192
--- /dev/null
+++ b/src/vs/server/node/protocol.ts
@@ -0,0 +1,73 @@
+import * as net from 'net';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
+import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
+import { AuthRequest, ConnectionTypeRequest, HandshakeMessage } from 'vs/platform/remote/common/remoteAgentConnection';
+
+export interface SocketOptions {
+ readonly reconnectionToken: string;
+ readonly reconnection: boolean;
+ readonly skipWebSocketFrames: boolean;
+}
+
+export class Protocol extends PersistentProtocol {
+ public constructor(socket: net.Socket, public readonly options: SocketOptions) {
+ super(
+ options.skipWebSocketFrames
+ ? new NodeSocket(socket)
+ : new WebSocketNodeSocket(new NodeSocket(socket)),
+ );
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ public getUnderlyingSocket(): net.Socket {
+ const socket = this.getSocket();
+ return socket instanceof NodeSocket
+ ? socket.socket
+ : (socket as WebSocketNodeSocket).socket.socket;
+ }
+
+ /**
+ * Perform a handshake to get a connection request.
+ */
+ public handshake(): Promise<ConnectionTypeRequest> {
+ return new Promise((resolve, reject) => {
+ const handler = this.onControlMessage((rawMessage) => {
+ try {
+ const message = JSON.parse(rawMessage.toString());
+ switch (message.type) {
+ case 'auth': return this.authenticate(message);
+ case 'connectionType':
+ handler.dispose();
+ return resolve(message);
+ default: throw new Error('Unrecognized message type');
+ }
+ } catch (error) {
+ handler.dispose();
+ reject(error);
+ }
+ });
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
+ });
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ /**
+ * TODO: This ignores the authentication process entirely for now.
+ */
+ private authenticate(_message: AuthRequest): void {
+ this.sendMessage({ type: 'sign', data: '' });
+ }
+
+ /**
+ * TODO: implement.
+ */
+ public tunnel(): void {
+ throw new Error('Tunnel is not implemented yet');
+ }
+
+ /**
+ * Send a handshake message. In the case of the extension host, it just sends
+ * back a debug port.
+ */
+ public sendMessage(message: HandshakeMessage | { debugPort?: number } ): void {
+ this.sendControl(VSBuffer.fromString(JSON.stringify(message)));
+ }
+}
diff --git a/src/vs/server/node/server.ts b/src/vs/server/node/server.ts
new file mode 100644
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
index 0000000000..433646424e
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/server.ts
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -0,0 +1,282 @@
+import * as fs from 'fs';
Implement new structure
2020-02-04 20:27:46 +01:00
+import * as net from 'net';
+import * as path from 'path';
+import { Emitter } from 'vs/base/common/event';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { getMachineId } from 'vs/base/node/id';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+import { ClientConnectionEvent, createChannelReceiver, IPCServer, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner';
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+import { main } from "vs/code/node/cliProcessMain";
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
+import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ParsedArgs } from 'vs/platform/environment/node/argv';
+import { EnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
+import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
+import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
+import { IFileService } from 'vs/platform/files/common/files';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
+import { getLogLevel, ILogService } from 'vs/platform/log/common/log';
+import { LoggerChannel } from 'vs/platform/log/common/logIpc';
+import { SpdLogService } from 'vs/platform/log/node/spdlogService';
+import product from 'vs/platform/product/common/product';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { ConnectionType, ConnectionTypeRequest } from 'vs/platform/remote/common/remoteAgentConnection';
+import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { IRequestService } from 'vs/platform/request/common/request';
+import { RequestChannel } from 'vs/platform/request/common/requestIpc';
+import { RequestService } from 'vs/platform/request/node/requestService';
+import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { combinedAppender, LogAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
+import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
+import { INodeProxyService, NodeProxyChannel } from 'vs/server/common/nodeProxy';
+import { TelemetryChannel } from 'vs/server/common/telemetry';
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+import { Query, VscodeOptions, WorkbenchOptions } from 'vs/server/ipc';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtensionEnvironmentChannel, FileProviderChannel, NodeProxyService } from 'vs/server/node/channel';
+import { Connection, ExtensionHostConnection, ManagementConnection } from 'vs/server/node/connection';
+import { TelemetryClient } from 'vs/server/node/insights';
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+import { logger } from 'vs/server/node/logger';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { getLocaleFromConfig, getNlsConfiguration } from 'vs/server/node/nls';
+import { Protocol } from 'vs/server/node/protocol';
+import { getUriTransformer } from 'vs/server/node/util';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from "vs/workbench/services/remote/common/remoteAgentFileSystemChannel";
Implement new structure
2020-02-04 20:27:46 +01:00
+import { RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService';
+
+export class Vscode {
+ public readonly _onDidClientConnect = new Emitter<ClientConnectionEvent>();
+ public readonly onDidClientConnect = this._onDidClientConnect.event;
+ private readonly ipc = new IPCServer<RemoteAgentConnectionContext>(this.onDidClientConnect);
+
+ private readonly maxExtraOfflineConnections = 0;
+ private readonly connections = new Map<ConnectionType, Map<string, Connection>>();
+
+ private readonly services = new ServiceCollection();
+ private servicesPromise?: Promise<void>;
+
Enable access to vscode cli
2020-02-18 19:24:12 +01:00
+ public async cli(args: ParsedArgs): Promise<void> {
+ return main(args);
+ }
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ public async initialize(options: VscodeOptions): Promise<WorkbenchOptions> {
+ const transformer = getUriTransformer(options.remoteAuthority);
+ if (!this.servicesPromise) {
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ this.servicesPromise = this.initializeServices(options.args);
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+ await this.servicesPromise;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ const environment = this.services.get(IEnvironmentService) as INativeEnvironmentService;
Move start path logic out of patch and fix it
2020-02-06 19:29:19 +01:00
+ const startPath = options.startPath;
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ const parseUrl = (url: string): URI => {
+ // This might be a fully-specified URL or just a path.
+ try {
+ return URI.parse(url, true);
+ } catch (error) {
+ return URI.from({
+ scheme: Schemas.vscodeRemote,
+ authority: options.remoteAuthority,
+ path: url,
+ });
+ }
+ };
Implement new structure
2020-02-04 20:27:46 +01:00
+ return {
+ workbenchWebConfiguration: {
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+ workspaceUri: startPath && startPath.workspace ? parseUrl(startPath.url) : undefined,
+ folderUri: startPath && !startPath.workspace ? parseUrl(startPath.url) : undefined,
Implement new structure
2020-02-04 20:27:46 +01:00
+ remoteAuthority: options.remoteAuthority,
+ logLevel: getLogLevel(environment),
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ workspaceProvider: {
+ payload: [["userDataPath", environment.userDataPath]],
+ },
Implement new structure
2020-02-04 20:27:46 +01:00
+ },
+ remoteUserDataUri: transformer.transformOutgoing(URI.file(environment.userDataPath)),
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+ productConfiguration: product,
Implement new structure
2020-02-04 20:27:46 +01:00
+ nlsConfiguration: await getNlsConfiguration(environment.args.locale || await getLocaleFromConfig(environment.userDataPath), environment.userDataPath),
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+ commit: product.commit || 'development',
Implement new structure
2020-02-04 20:27:46 +01:00
+ };
+ }
+
+ public async handleWebSocket(socket: net.Socket, query: Query): Promise<true> {
+ if (!query.reconnectionToken) {
+ throw new Error('Reconnection token is missing from query parameters');
+ }
+ const protocol = new Protocol(socket, {
+ reconnectionToken: <string>query.reconnectionToken,
+ reconnection: query.reconnection === 'true',
+ skipWebSocketFrames: query.skipWebSocketFrames === 'true',
+ });
+ try {
+ await this.connect(await protocol.handshake(), protocol);
+ } catch (error) {
+ protocol.sendMessage({ type: 'error', reason: error.message });
+ protocol.dispose();
+ protocol.getSocket().dispose();
+ }
+ return true;
+ }
+
+ private async connect(message: ConnectionTypeRequest, protocol: Protocol): Promise<void> {
+ if (product.commit && message.commit !== product.commit) {
Fix VS Code product configuration not loading
2020-02-07 23:37:59 +01:00
+ logger.warn(`Version mismatch (${message.commit} instead of ${product.commit})`);
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
+
+ switch (message.desiredConnectionType) {
+ case ConnectionType.ExtensionHost:
+ case ConnectionType.Management:
+ if (!this.connections.has(message.desiredConnectionType)) {
+ this.connections.set(message.desiredConnectionType, new Map());
+ }
+ const connections = this.connections.get(message.desiredConnectionType)!;
+
+ const ok = async () => {
+ return message.desiredConnectionType === ConnectionType.ExtensionHost
+ ? { debugPort: await this.getDebugPort() }
+ : { type: 'ok' };
+ };
+
+ const token = protocol.options.reconnectionToken;
+ if (protocol.options.reconnection && connections.has(token)) {
+ protocol.sendMessage(await ok());
+ const buffer = protocol.readEntireBuffer();
+ protocol.dispose();
+ return connections.get(token)!.reconnect(protocol.getSocket(), buffer);
+ } else if (protocol.options.reconnection || connections.has(token)) {
+ throw new Error(protocol.options.reconnection
+ ? 'Unrecognized reconnection token'
+ : 'Duplicate reconnection token'
+ );
+ }
+
+ protocol.sendMessage(await ok());
+
+ let connection: Connection;
+ if (message.desiredConnectionType === ConnectionType.Management) {
+ connection = new ManagementConnection(protocol, token);
+ this._onDidClientConnect.fire({
+ protocol, onDidClientDisconnect: connection.onClose,
+ });
+ // TODO: Need a way to match clients with a connection. For now
+ // dispose everything which only works because no extensions currently
+ // utilize long-running proxies.
+ (this.services.get(INodeProxyService) as NodeProxyService)._onUp.fire();
+ connection.onClose(() => (this.services.get(INodeProxyService) as NodeProxyService)._onDown.fire());
+ } else {
+ const buffer = protocol.readEntireBuffer();
+ connection = new ExtensionHostConnection(
+ message.args ? message.args.language : 'en',
+ protocol, buffer, token,
+ this.services.get(ILogService) as ILogService,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ this.services.get(IEnvironmentService) as INativeEnvironmentService,
Implement new structure
2020-02-04 20:27:46 +01:00
+ );
+ }
+ connections.set(token, connection);
+ connection.onClose(() => connections.delete(token));
+ this.disposeOldOfflineConnections(connections);
+ break;
+ case ConnectionType.Tunnel: return protocol.tunnel();
+ default: throw new Error('Unrecognized connection type');
+ }
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ }
Implement new structure
2020-02-04 20:27:46 +01:00
+
+ private disposeOldOfflineConnections(connections: Map<string, Connection>): void {
+ const offline = Array.from(connections.values())
+ .filter((connection) => typeof connection.offline !== 'undefined');
+ for (let i = 0, max = offline.length - this.maxExtraOfflineConnections; i < max; ++i) {
+ offline[i].dispose();
+ }
+ }
+
+ private async initializeServices(args: ParsedArgs): Promise<void> {
+ const environmentService = new EnvironmentService(args, process.execPath);
Initialize config and use correct settings path Fixes #1829.
2020-06-24 18:40:17 +02:00
+ // https://github.com/cdr/code-server/issues/1693
+ fs.mkdirSync(environmentService.globalStorageHome, { recursive: true });
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ const logService = new SpdLogService(RemoteExtensionLogFileName, environmentService.logsPath, getLogLevel(environmentService));
+ const fileService = new FileService(logService);
+ fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService));
+
+ const piiPaths = [
+ path.join(environmentService.userDataPath, 'clp'), // Language packs.
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ environmentService.appRoot,
Implement new structure
2020-02-04 20:27:46 +01:00
+ environmentService.extensionsPath,
+ environmentService.builtinExtensionsPath,
+ ...environmentService.extraExtensionPaths,
+ ...environmentService.extraBuiltinExtensionPaths,
+ ];
+
+ this.ipc.registerChannel('logger', new LoggerChannel(logService));
+ this.ipc.registerChannel(ExtensionHostDebugBroadcastChannel.ChannelName, new ExtensionHostDebugBroadcastChannel());
+
+ this.services.set(ILogService, logService);
+ this.services.set(IEnvironmentService, environmentService);
Initialize config and use correct settings path Fixes #1829.
2020-06-24 18:40:17 +02:00
+
+ const configurationService = new ConfigurationService(environmentService.settingsResource, fileService);
+ await configurationService.initialize();
+ this.services.set(IConfigurationService, configurationService);
+
Implement new structure
2020-02-04 20:27:46 +01:00
+ this.services.set(IRequestService, new SyncDescriptor(RequestService));
+ this.services.set(IFileService, fileService);
+ this.services.set(IProductService, { _serviceBrand: undefined, ...product });
+ this.services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
+ this.services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
+
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ if (!environmentService.disableTelemetry) {
+ this.services.set(ITelemetryService, new TelemetryService({
Implement new structure
2020-02-04 20:27:46 +01:00
+ appender: combinedAppender(
+ new AppInsightsAppender('code-server', null, () => new TelemetryClient() as any, logService),
+ new LogAppender(logService),
+ ),
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ sendErrorTelemetry: true,
Implement new structure
2020-02-04 20:27:46 +01:00
+ commonProperties: resolveCommonProperties(
+ product.commit, product.version, await getMachineId(),
+ [], environmentService.installSourcePath, 'code-server',
+ ),
+ piiPaths,
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
+ }, configurationService));
Implement new structure
2020-02-04 20:27:46 +01:00
+ } else {
+ this.services.set(ITelemetryService, NullTelemetryService);
+ }
+
+ await new Promise((resolve) => {
+ const instantiationService = new InstantiationService(this.services);
+ this.services.set(ILocalizationsService, instantiationService.createInstance(LocalizationsService));
+ this.services.set(INodeProxyService, instantiationService.createInstance(NodeProxyService));
+
+ instantiationService.invokeFunction(() => {
+ instantiationService.createInstance(LogsDataCleaner);
+ const telemetryService = this.services.get(ITelemetryService) as ITelemetryService;
+ this.ipc.registerChannel('extensions', new ExtensionManagementChannel(
+ this.services.get(IExtensionManagementService) as IExtensionManagementService,
+ (context) => getUriTransformer(context.remoteAuthority),
+ ));
+ this.ipc.registerChannel('remoteextensionsenvironment', new ExtensionEnvironmentChannel(
+ environmentService, logService, telemetryService, '',
+ ));
+ this.ipc.registerChannel('request', new RequestChannel(this.services.get(IRequestService) as IRequestService));
+ this.ipc.registerChannel('telemetry', new TelemetryChannel(telemetryService));
+ this.ipc.registerChannel('nodeProxy', new NodeProxyChannel(this.services.get(INodeProxyService) as INodeProxyService));
+ this.ipc.registerChannel('localizations', <IServerChannel<any>>createChannelReceiver(this.services.get(ILocalizationsService) as ILocalizationsService));
+ this.ipc.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, new FileProviderChannel(environmentService, logService));
+ resolve(new ErrorTelemetry(telemetryService));
+ });
+ });
+ }
+
+ /**
+ * TODO: implement.
+ */
+ private async getDebugPort(): Promise<number | undefined> {
+ return undefined;
+ }
+}
diff --git a/src/vs/server/node/util.ts b/src/vs/server/node/util.ts
new file mode 100644
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
index 0000000000..fa47e993b4
Implement new structure
2020-02-04 20:27:46 +01:00
--- /dev/null
+++ b/src/vs/server/node/util.ts
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
@@ -0,0 +1,13 @@
+import { URITransformer } from 'vs/base/common/uriIpc';
Implement new structure
2020-02-04 20:27:46 +01:00
+
+export const getUriTransformer = (remoteAuthority: string): URITransformer => {
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
+ return new URITransformer(remoteAuthority);
Implement new structure
2020-02-04 20:27:46 +01:00
+};
Fix encoding issues with folder and workspace params The raw value is now passed back to VS Code so it can do the parsing with its own URI class rather than trying to parse using Node's url module first since that has no guarantee of working the same way. It also lets us keep the vscode-remote bit internal to VS Code. Removed the logic that keeps trying paths until it finds a valid one because it seems confusing to open a path and silently get some other path instead of an error for the one you tried to open. Now it'll just use exactly what you specified or fail trying. Fixes #1488. The problem here was that url.parse was encoding the spaces then the validation failed looking for a literal %20.
2020-04-07 02:06:12 +02:00
+
+/**
+ * Encode a path for opening via the folder or workspace query parameter. This
+ * preserves slashes so it can be edited by hand more easily.
+ */
+export const encodePath = (path: string): string => {
+ return path.split("/").map((p) => encodeURIComponent(p)).join("/");
+};
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 3d77009b90..11deb1b99a 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -60,6 +60,7 @@ import './mainThreadComments';
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
import './mainThreadNotebook';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import './mainThreadTask';
import './mainThreadLabelService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import 'vs/server/browser/mainThreadNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import './mainThreadTunnelService';
import './mainThreadAuthentication';
import './mainThreadTimeline';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 967b210d0a..2443935f5e 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
@@ -68,6 +68,7 @@ import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransf
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { ExtHostTheming } from 'vs/workbench/api/common/extHostTheming';
import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@@ -95,6 +96,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
const extHostStorage = accessor.get(IExtHostStorage);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
const extensionStoragePaths = accessor.get(IExtensionStoragePaths);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
const extHostLogService = accessor.get(ILogService);
+ const extHostNodeProxy = accessor.get(IExtHostNodeProxy);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
const extHostTunnelService = accessor.get(IExtHostTunnelService);
const extHostApiDeprecation = accessor.get(IExtHostApiDeprecationService);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
const extHostWindow = accessor.get(IExtHostWindow);
@@ -105,6 +107,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);
rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);
rpcProtocol.set(ExtHostContext.ExtHostStorage, extHostStorage);
+ rpcProtocol.set(ExtHostContext.ExtHostNodeProxy, extHostNodeProxy);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
rpcProtocol.set(ExtHostContext.ExtHostTunnelService, extHostTunnelService);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
rpcProtocol.set(ExtHostContext.ExtHostWindow, extHostWindow);
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 1b76a15a6c..358728fc2f 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -765,6 +765,16 @@ export interface MainThreadLabelServiceShape extends IDisposable {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
$unregisterResourceLabelFormatter(handle: number): void;
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+export interface MainThreadNodeProxyShape extends IDisposable {
+ $send(message: string): void;
+}
+export interface ExtHostNodeProxyShape {
+ $onMessage(message: string): void;
+ $onClose(): void;
+ $onDown(): void;
+ $onUp(): void;
+}
+
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
export interface MainThreadSearchShape extends IDisposable {
$registerFileSearchProvider(handle: number, scheme: string): void;
$registerTextSearchProvider(handle: number, scheme: string): void;
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -1692,6 +1702,7 @@ export const MainContext = {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
MainThreadWindow: createMainId<MainThreadWindowShape>('MainThreadWindow'),
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
MainThreadLabelService: createMainId<MainThreadLabelServiceShape>('MainThreadLabelService'),
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
MainThreadNotebook: createMainId<MainThreadNotebookShape>('MainThreadNotebook'),
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ MainThreadNodeProxy: createMainId<MainThreadNodeProxyShape>('MainThreadNodeProxy'),
MainThreadTheming: createMainId<MainThreadThemingShape>('MainThreadTheming'),
MainThreadTunnelService: createMainId<MainThreadTunnelServiceShape>('MainThreadTunnelService'),
MainThreadTimeline: createMainId<MainThreadTimelineShape>('MainThreadTimeline')
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -1730,6 +1741,7 @@ export const ExtHostContext = {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
ExtHostOutputService: createMainId<ExtHostOutputServiceShape>('ExtHostOutputService'),
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
ExtHosLabelService: createMainId<ExtHostLabelServiceShape>('ExtHostLabelService'),
ExtHostNotebook: createMainId<ExtHostNotebookShape>('ExtHostNotebook'),
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ ExtHostNodeProxy: createMainId<ExtHostNodeProxyShape>('ExtHostNodeProxy'),
ExtHostTheming: createMainId<ExtHostThemingShape>('ExtHostTheming'),
ExtHostTunnelService: createMainId<ExtHostTunnelServiceShape>('ExtHostTunnelService'),
ExtHostAuthentication: createMainId<ExtHostAuthenticationShape>('ExtHostAuthentication'),
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index c11e3036ad..f9dd91ca3d 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@@ -5,7 +5,7 @@
import * as nls from 'vs/nls';
import * as path from 'vs/base/common/path';
-import { originalFSPath, joinPath } from 'vs/base/common/resources';
+import { originalFSPath } from 'vs/base/common/resources';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
import { Barrier, timeout } from 'vs/base/common/async';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
import { dispose, toDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
import { TernarySearchTree } from 'vs/base/common/map';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
@@ -32,6 +32,7 @@ import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitData
import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
import { Emitter, Event } from 'vs/base/common/event';
@@ -82,6 +83,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
protected readonly _extHostWorkspace: ExtHostWorkspace;
protected readonly _extHostConfiguration: ExtHostConfiguration;
protected readonly _logService: ILogService;
+ protected readonly _nodeProxy: IExtHostNodeProxy;
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
protected readonly _extHostTunnelService: IExtHostTunnelService;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
protected readonly _extHostTerminalService: IExtHostTerminalService;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -114,6 +116,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
@ILogService logService: ILogService,
@IExtHostInitDataService initData: IExtHostInitDataService,
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
@IExtensionStoragePaths storagePath: IExtensionStoragePaths,
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ @IExtHostNodeProxy nodeProxy: IExtHostNodeProxy,
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
@IExtHostTunnelService extHostTunnelService: IExtHostTunnelService,
@IExtHostTerminalService extHostTerminalService: IExtHostTerminalService
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
) {
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -125,6 +128,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
this._extHostWorkspace = extHostWorkspace;
this._extHostConfiguration = extHostConfiguration;
this._logService = logService;
+ this._nodeProxy = nodeProxy;
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
this._extHostTunnelService = extHostTunnelService;
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
this._extHostTerminalService = extHostTerminalService;
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
this._disposables = new DisposableStore();
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -356,14 +360,14 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
return Promise.all([
- this._loadCommonJSModule<IExtensionModule>(joinPath(extensionDescription.extensionLocation, extensionDescription.main), activationTimesBuilder),
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ this._loadCommonJSModule<IExtensionModule>(extensionDescription, activationTimesBuilder),
this._loadExtensionContext(extensionDescription)
]).then(values => {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
});
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
- protected abstract _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
+ protected abstract _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
private _loadExtensionContext(extensionDescription: IExtensionDescription): Promise<vscode.ExtensionContext> {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/node/extHost.services.ts b/src/vs/workbench/api/node/extHost.services.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index a6c0079600..ee31d4b8e7 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/node/extHost.services.ts
+++ b/src/vs/workbench/api/node/extHost.services.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -24,12 +24,14 @@ import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePa
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import { IExtHostStorage, ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { ILogService } from 'vs/platform/log/common/log';
import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
import { ExtHostTunnelService } from 'vs/workbench/api/node/extHostTunnelService';
import { IExtHostApiDeprecationService, ExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
import { IExtHostWindow, ExtHostWindow } from 'vs/workbench/api/common/extHostWindow';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+import { NotImplementedProxy } from 'vs/base/common/types';
// register singleton services
registerSingleton(ILogService, ExtHostLogService);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -49,3 +51,4 @@ registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
registerSingleton(IExtHostExtensionService, ExtHostExtensionService);
registerSingleton(IExtHostStorage, ExtHostStorage);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
registerSingleton(IExtHostTunnelService, ExtHostTunnelService);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+registerSingleton(IExtHostNodeProxy, class extends NotImplementedProxy<IExtHostNodeProxy>(String(IExtHostNodeProxy)) { whenReady = Promise.resolve(); });
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
index 3a02c5ce0b..3e1594129c 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -13,6 +13,8 @@ import { ExtHostDownloadService } from 'vs/workbench/api/node/extHostDownloadSer
import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
import { URI } from 'vs/base/common/uri';
import { Schemas } from 'vs/base/common/network';
+import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { joinPath } from 'vs/base/common/resources';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
class NodeModuleRequireInterceptor extends RequireInterceptor {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
@@ -76,7 +78,10 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
};
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
- protected _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
+ protected _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
+ if (!URI.isUri(module)) {
+ module = joinPath(module.extensionLocation, module.main!);
+ }
if (module.scheme !== Schemas.file) {
throw new Error(`Cannot load URI: '${module}', must be of file-scheme`);
}
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
diff --git a/src/vs/workbench/api/node/extHostStoragePaths.ts b/src/vs/workbench/api/node/extHostStoragePaths.ts
Fix workspace storage creation Fixes #1308.
2020-02-25 19:47:22 +01:00
index afdd6bf398..1633daf93d 100644
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
--- a/src/vs/workbench/api/node/extHostStoragePaths.ts
+++ b/src/vs/workbench/api/node/extHostStoragePaths.ts
@@ -5,13 +5,14 @@
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
import * as path from 'vs/base/common/path';
import { URI } from 'vs/base/common/uri';
-import * as pfs from 'vs/base/node/pfs';
-import { IEnvironment, IStaticWorkspaceData } from 'vs/workbench/api/common/extHost.protocol';
+import { IEnvironment, IStaticWorkspaceData, MainContext } from 'vs/workbench/api/common/extHost.protocol';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
import { withNullAsUndefined } from 'vs/base/common/types';
import { ILogService } from 'vs/platform/log/common/log';
+import { IExtHostRpcService } from '../common/extHostRpcService';
+import { VSBuffer } from 'vs/base/common/buffer';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
export class ExtensionStoragePaths implements IExtensionStoragePaths {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
@@ -26,6 +27,7 @@ export class ExtensionStoragePaths implements IExtensionStoragePaths {
constructor(
@IExtHostInitDataService initData: IExtHostInitDataService,
@ILogService private readonly _logService: ILogService,
+ @IExtHostRpcService private readonly _extHostRpc: IExtHostRpcService,
) {
this._workspace = withNullAsUndefined(initData.workspace);
this._environment = initData.environment;
Fix workspace storage creation Fixes #1308.
2020-02-25 19:47:22 +01:00
@@ -54,21 +56,26 @@ export class ExtensionStoragePaths implements IExtensionStoragePaths {
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
const storageName = this._workspace.id;
const storagePath = path.join(this._environment.appSettingsHome.fsPath, 'workspaceStorage', storageName);
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
- const exists = await pfs.dirExists(storagePath);
Fix workspace storage creation Fixes #1308.
2020-02-25 19:47:22 +01:00
-
- if (exists) {
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
+ // NOTE@coder: Use the file system proxy so this will work in the browser.
+ const fileSystem = this._extHostRpc.getProxy(MainContext.MainThreadFileSystem);
Fix workspace storage creation Fixes #1308.
2020-02-25 19:47:22 +01:00
+ try {
+ await fileSystem.$stat(URI.file(storagePath));
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
return storagePath;
Fix workspace storage creation Fixes #1308.
2020-02-25 19:47:22 +01:00
+ } catch (error) {
+ // Doesn't exist.
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
try {
- await pfs.mkdirp(storagePath);
- await pfs.writeFile(
- path.join(storagePath, 'meta.json'),
- JSON.stringify({
- id: this._workspace.id,
- configuration: this._workspace.configuration && URI.revive(this._workspace.configuration).toString(),
- name: this._workspace.name
- }, undefined, 2)
Fix workspace storage creation Fixes #1308.
2020-02-25 19:47:22 +01:00
+ // NOTE@coder: $writeFile performs a mkdirp.
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
+ await fileSystem.$writeFile(
+ URI.file(path.join(storagePath, 'meta.json')),
+ VSBuffer.fromString(
+ JSON.stringify({
+ id: this._workspace.id,
+ configuration: this._workspace.configuration && URI.revive(this._workspace.configuration).toString(),
+ name: this._workspace.name
+ }, undefined, 2)
+ )
);
return storagePath;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index dd8f4e1fe7..0f4a6ad216 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -8,6 +8,9 @@ import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHost
import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import { URI } from 'vs/base/common/uri';
import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+import { joinPath } from 'vs/base/common/resources';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { loadCommonJSModule } from 'vs/server/browser/worker';
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
class WorkerRequireInterceptor extends RequireInterceptor {
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -40,7 +43,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
await this._fakeModules.install();
}
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
- protected async _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ protected async _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
+ if (!URI.isUri(module) && module.extensionKind !== 'web') {
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
+ return loadCommonJSModule(module, activationTimesBuilder, this._nodeProxy, this._logService, this._fakeModules!.getModule('vscode', module.extensionLocation));
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ }
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+ if (!URI.isUri(module)) {
+ module = joinPath(module.extensionLocation, module.main!);
+ }
Always create globalStorageHome Closes #1693
2020-06-04 11:13:55 +02:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
module = module.with({ path: ensureSuffix(module.path, '.js') });
const response = await fetch(module.toString(true));
Pin to vscode 1.45.1 1.46 isn't released yet and has bugs. Closes #1667
2020-05-18 23:34:22 +02:00
@@ -57,7 +67,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
const _exports = {};
const _module = { exports: _exports };
const _require = (request: string) => {
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
- const result = this._fakeModules!.getModule(request, module);
+ const result = this._fakeModules!.getModule(request, <URI>module);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
if (result === undefined) {
throw new Error(`Cannot load module '${request}'`);
}
Make extension sidebar work
2019-07-10 23:29:15 +02:00
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 7eba37aa9f..1824a7c8fc 100644
Make extension sidebar work
2019-07-10 23:29:15 +02:00
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -45,6 +45,7 @@ import { FileLogService } from 'vs/platform/log/common/fileLogService';
import { toLocalISOString } from 'vs/base/common/date';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows';
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { initialize } from 'vs/server/browser/client';
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
import { coalesce } from 'vs/base/common/arrays';
import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
import { WebResourceIdentityService, IResourceIdentityService } from 'vs/platform/resource/common/resourceIdentityService';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -84,6 +85,8 @@ class BrowserMain extends Disposable {
Implement status bar API
2019-09-03 23:38:53 +02:00
// Startup
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
const instantiationService = workbench.startup();
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ await initialize(services.serviceCollection);
+
// Return API Facade
return instantiationService.invokeFunction(accessor => {
const commandService = accessor.get(ICommandService);
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
index 2a7844da48..2812092983 100644
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
--- a/src/vs/workbench/common/resources.ts
+++ b/src/vs/workbench/common/resources.ts
@@ -15,6 +15,7 @@ import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
import { withNullAsUndefined } from 'vs/base/common/types';
+import { Schemas } from 'vs/base/common/network';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
export class ResourceContextKey extends Disposable implements IContextKey<URI> {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
@@ -67,7 +68,8 @@ export class ResourceContextKey extends Disposable implements IContextKey<URI> {
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
set(value: URI | null) {
if (!ResourceContextKey._uriEquals(this._resourceKey.get(), value)) {
this._resourceKey.set(value);
- this._schemeKey.set(value ? value.scheme : null);
Implement new structure
2020-02-04 20:27:46 +01:00
+ // NOTE@coder: Fixes extensions matching against file schemas.
Fix schema matching against vscode-remote Fixes #1104.
2019-10-29 17:31:00 +01:00
+ this._schemeKey.set(value ? (value.scheme === Schemas.vscodeRemote ? Schemas.file : value.scheme) : null);
this._filenameKey.set(value ? basename(value) : null);
this._langIdKey.set(value ? this._modeService.getModeIdByFilepathOrFirstLine(value) : null);
this._extensionKey.set(value ? extname(value) : null);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index 867f31d6f1..ecd510216f 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -135,9 +135,11 @@
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
margin-right: 8px;
}
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
-.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
- flex-grow: 100;
-}
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+/* NOTE@coder: Causes the label to shrink to zero width in Firefox due to
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
+ * overflow:hidden. This isn't right anyway, as far as I can tell. */
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+/* .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions { */
Fix highlighted scmviewlet items in Firefox Fixes #1549.
2020-05-01 19:53:44 +02:00
+/* flex-grow: 100; */
+/* } */
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
.scm-view .monaco-list .monaco-list-row .resource-group > .actions,
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
diff --git a/src/vs/workbench/services/dialogs/browser/dialogService.ts b/src/vs/workbench/services/dialogs/browser/dialogService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index bf9a892d41..5f0d720dca 100644
Add code-server version into VS Code about Closes #1506
2020-05-15 03:30:34 +02:00
--- a/src/vs/workbench/services/dialogs/browser/dialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/dialogService.ts
@@ -124,11 +124,12 @@ export class DialogService implements IDialogService {
async about(): Promise<void> {
const detailString = (useAgo: boolean): string => {
return nls.localize('aboutDetail',
- "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
+ "code-server: v{4}\n VS Code: v{0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
this.productService.version || 'Unknown',
this.productService.commit || 'Unknown',
this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
- navigator.userAgent
+ navigator.userAgent,
+ this.productService.codeServerVersion || 'Unknown',
);
};
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 9369ad3a7d..b32102c84f 100644
Implement multiple extension directories
2019-07-12 23:39:38 +02:00
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -16,6 +16,7 @@ import { memoize } from 'vs/base/common/decorators';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
import { onUnexpectedError } from 'vs/base/common/errors';
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
import { LIGHT } from 'vs/platform/theme/common/themeService';
import { parseLineAndColumnAware } from 'vs/base/common/extpath';
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+import * as paths from 'vs/base/common/path';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
export class BrowserEnvironmentConfiguration implements IEnvironmentConfiguration {
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -224,6 +225,20 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
return this.webviewExternalEndpoint.replace('{{uuid}}', '*');
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ // NOTE@coder: vscodevim uses the global storage home.
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
+ @memoize
+ get userDataPath(): string {
+ const dataPath = this.payload?.get("userDataPath");
+ if (!dataPath) {
+ throw new Error("userDataPath was not provided to environment service");
+ }
+ return dataPath;
+ }
+ @memoize
+ get appSettingsHome(): URI { return URI.file(paths.join(this.userDataPath, 'User')); }
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
+ @memoize
+ get globalStorageHome(): string { return paths.join(this.appSettingsHome.fsPath, 'globalStorage'); }
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
+
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
get disableTelemetry(): boolean { return false; }
get verbose(): boolean { return this.payload?.get('verbose') === 'true'; }
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index c28b147740..6090200d9c 100644
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
--- a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -163,7 +163,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
}
}
}
- return true;
+ return false; // NOTE@coder: Don't disable anything by extensionKind.
}
return false;
}
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 5a79d9e39a..ad5bd9674b 100644
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -237,6 +237,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
return this.extensionManagementServerService.webExtensionManagementServer.extensionManagementService.installFromGallery(gallery);
Allow extensions of any kind This enables vscode-icons among others.
2020-04-29 00:08:43 +02:00
}
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
+ // NOTE@coder: Fall back to installing on the remote server.
+ if (this.extensionManagementServerService.remoteExtensionManagementServer) {
+ return this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.installFromGallery(gallery);
+ }
+
if (this.extensionManagementServerService.remoteExtensionManagementServer) {
const error = new Error(localize('cannot be installed', "Cannot install '{0}' because this extension has defined that it cannot run on the remote server.", gallery.displayName || gallery.name));
error.name = INSTALL_ERROR_NOT_SUPPORTED;
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index afcf8322e3..ca0d7ed9a8 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -127,6 +127,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
} else {
// remote: only enabled and none-web'ish extension
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
+ localExtensions.push(...remoteEnv.extensions.filter(extension => this._isEnabled(extension) && canExecuteOnWeb(extension, this._productService, this._configService)));
remoteEnv.extensions = remoteEnv.extensions.filter(extension => this._isEnabled(extension) && !canExecuteOnWeb(extension, this._productService, this._configService));
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
this._checkEnableProposedApi(remoteEnv.extensions);
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
index ad19603078..90df69f4cb 100644
--- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
@@ -152,7 +152,7 @@ export class WebWorkerExtensionHost implements IExtensionHost {
Fill out some missing browser environment values Pass the user data dir to the browser environment service then derive all the paths we can based off that path like the global storage path which the vim extension uses to store history (otherwise it gets stored in the working directory from when code-server was spawned). Arguably the better solution is to use the userdata scheme but that won't work because the vim extension ignores the VS Code API. Fixes #1551.
2020-04-27 23:51:38 +02:00
appLanguage: platform.language,
extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
- globalStorageHome: URI.parse('fake:globalStorageHome'), //todo@joh URI.file(this._environmentService.globalStorageHome),
+ globalStorageHome: URI.file(this._environmentService.globalStorageHome),
userHome: URI.parse('fake:userHome'), //todo@joh URI.file(this._environmentService.userHome),
webviewResourceRoot: this._environmentService.webviewResourceRoot,
webviewCspSource: this._environmentService.webviewCspSource,
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/services/extensions/common/extensionsUtil.ts b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 93e7069d65..aa9d973b69 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/services/extensions/common/extensionsUtil.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsUtil.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -37,7 +37,8 @@ export function canExecuteOnWorkspace(manifest: IExtensionManifest, productServi
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
export function canExecuteOnWeb(manifest: IExtensionManifest, productService: IProductService, configurationService: IConfigurationService): boolean {
const extensionKind = getExtensionKind(manifest, productService, configurationService);
- return extensionKind.some(kind => kind === 'web');
Implement new structure
2020-02-04 20:27:46 +01:00
+ // NOTE@coder: Hardcode vim for now.
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
+ return extensionKind.some(kind => kind === 'web') || manifest.name === 'vim';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
export function getExtensionKind(manifest: IExtensionManifest, productService: IProductService, configurationService: IConfigurationService): ExtensionKind[] {
Make extension host reconnect
2019-09-10 01:44:17 +02:00
diff --git a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index ae4b2d3122..13d26e73f6 100644
Make extension host reconnect
2019-09-10 01:44:17 +02:00
--- a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
+++ b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
@@ -16,7 +16,7 @@ import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
import { MessageType, createMessageOfType, isMessageOfType, IExtHostSocketMessage, IExtHostReadyMessage, IExtHostReduceGraceTimeMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
import { ExtensionHostMain, IExitFn } from 'vs/workbench/services/extensions/common/extensionHostMain';
import { VSBuffer } from 'vs/base/common/buffer';
-import { IURITransformer, URITransformer, IRawURITransformer } from 'vs/base/common/uriIpc';
+import { IURITransformer, URITransformer } from 'vs/base/common/uriIpc';
import { exists } from 'vs/base/node/pfs';
import { realpath } from 'vs/base/node/extpath';
import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
@@ -55,12 +55,13 @@ const args = minimist(process.argv.slice(2), {
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
const Module = require.__$__nodeRequire('module') as any;
const originalLoad = Module._load;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
- Module._load = function (request: string) {
+ Module._load = function (request: string, parent: object, isMain: boolean) {
if (request === 'natives') {
throw new Error('Either the extension or a NPM dependency is using the "natives" node module which is unsupported as it can cause a crash of the extension host. Click [here](https://go.microsoft.com/fwlink/?linkid=871887) to find out more');
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
- return originalLoad.apply(this, arguments);
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+ // NOTE@coder: Map node_module.asar requests to regular node_modules.
Fix extensions that try to load from node_modules.asar Should allow manual installation of bracket pair colorizer 2: #544.
2019-09-13 20:07:50 +02:00
+ return originalLoad.apply(this, [request.replace(/node_modules\.asar(\.unpacked)?/, 'node_modules'), parent, isMain]);
};
})();
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.44.2
2020-04-21 21:25:27 +02:00
@@ -133,8 +134,11 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
// Wait for rich client to reconnect
protocol.onSocketClose(() => {
- // The socket has closed, let's give the renderer a certain amount of time to reconnect
- disconnectRunner1.schedule();
+ // NOTE@coder: Inform the server so we can manage offline
+ // connections there instead. Our goal is to persist connections
+ // forever (to a reasonable point) to account for things like
+ // hibernating overnight.
+ process.send!({ type: 'VSCODE_EXTHOST_DISCONNECTED' });
});
Make extension host reconnect
2019-09-10 01:44:17 +02:00
}
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
}
Remove transformer file Also remove some unused imports that were causing build errors (they were left over from the fix that allowed installing any extension kind).
2020-04-29 19:13:11 +02:00
@@ -307,11 +311,9 @@ export async function startExtensionHostProcess(): Promise<void> {
// Attempt to load uri transformer
let uriTransformer: IURITransformer | null = null;
- if (initData.remote.authority && args.uriTransformerPath) {
+ if (initData.remote.authority) {
try {
- const rawURITransformerFactory = <any>require.__$__nodeRequire(args.uriTransformerPath);
- const rawURITransformer = <IRawURITransformer>rawURITransformerFactory(initData.remote.authority);
- uriTransformer = new URITransformer(rawURITransformer);
+ uriTransformer = new URITransformer(initData.remote.authority);
} catch (e) {
console.error(e);
}
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
diff --git a/src/vs/workbench/services/extensions/worker/extHost.services.ts b/src/vs/workbench/services/extensions/worker/extHost.services.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 564c71149e..900d92afc1 100644
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
--- a/src/vs/workbench/services/extensions/worker/extHost.services.ts
+++ b/src/vs/workbench/services/extensions/worker/extHost.services.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -20,10 +20,11 @@ import { IExtHostStorage, ExtHostStorage } from 'vs/workbench/api/common/extHost
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensionService';
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
import { ILogService } from 'vs/platform/log/common/log';
import { ExtHostLogService } from 'vs/workbench/api/worker/extHostLogService';
Implement new structure
2020-02-04 20:27:46 +01:00
+import { ExtHostNodeProxy, IExtHostNodeProxy } from 'vs/server/browser/extHostNodeProxy';
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
+import { ExtensionStoragePaths } from 'vs/workbench/api/node/extHostStoragePaths';
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
import { IExtHostTunnelService, ExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';
import { IExtHostApiDeprecationService, ExtHostApiDeprecationService, } from 'vs/workbench/api/common/extHostApiDeprecationService';
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
import { IExtHostWindow, ExtHostWindow } from 'vs/workbench/api/common/extHostWindow';
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
-import { NotImplementedProxy } from 'vs/base/common/types';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
// register singleton services
registerSingleton(ILogService, ExtHostLogService);
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -38,9 +39,10 @@ registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
registerSingleton(IExtHostStorage, ExtHostStorage);
registerSingleton(IExtHostExtensionService, ExtHostExtensionService);
Update VS Code to 1.41.0
2019-12-16 23:52:29 +01:00
registerSingleton(IExtHostSearch, ExtHostSearch);
Add support for running extensions in the browser
2019-10-05 01:14:07 +02:00
+registerSingleton(IExtHostNodeProxy, ExtHostNodeProxy);
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
registerSingleton(IExtHostTunnelService, ExtHostTunnelService);
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService);
registerSingleton(IExtHostTask, WorkerExtHostTask);
registerSingleton(IExtHostDebugService, WorkerExtHostDebugService);
Update VS Code to fix infinite refresh Fixes #1581.
2020-05-05 19:22:35 +02:00
-registerSingleton(IExtensionStoragePaths, class extends NotImplementedProxy<IExtensionStoragePaths>(String(IExtensionStoragePaths)) { whenReady = Promise.resolve(); });
Implement ExtHostStoragePaths for the browser This appears to make vscodevim work again.
2020-01-16 00:13:06 +01:00
+registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
Fix worker require paths when behind proxy
2020-03-03 00:44:16 +01:00
index 79455414c0..a407593b4d 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
+++ b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
@@ -14,7 +14,11 @@
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
require.config({
baseUrl: monacoBaseUrl,
- catchError: true
+ catchError: true,
+ paths: {
Fix worker require paths when behind proxy
2020-03-03 00:44:16 +01:00
+ '@coder/node-browser': `../node_modules/@coder/node-browser/out/client/client.js`,
+ '@coder/requirefs': `../node_modules/@coder/requirefs/out/requirefs.js`,
Implement new structure
2020-02-04 20:27:46 +01:00
+ }
});
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
require(['vs/workbench/services/extensions/worker/extensionHostWorker'], () => { }, err => console.error(err));
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
diff --git a/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts b/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 44999bd842..601b1c5408 100644
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
--- a/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
+++ b/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
@@ -5,17 +5,17 @@
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
export class LocalizationsService {
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
declare readonly _serviceBrand: undefined;
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
constructor(
- @ISharedProcessService sharedProcessService: ISharedProcessService,
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
) {
- return createChannelSender<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
+ return createChannelSender<ILocalizationsService>(remoteAgentService.getConnection()!.getChannel('localizations'));
}
}
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Make extension sidebar work
2019-07-10 23:29:15 +02:00
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
index 153ac595d0..a6eb49c5dd 100644
Make extension sidebar work
2019-07-10 23:29:15 +02:00
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
Update VS Code to 1.46.1
2020-07-07 00:30:31 +02:00
@@ -35,7 +35,8 @@ import 'vs/workbench/services/textfile/browser/browserTextFileService';
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
import 'vs/workbench/services/keybinding/browser/keymapService';
import 'vs/workbench/services/extensions/browser/extensionService';
import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
-import 'vs/workbench/services/telemetry/browser/telemetryService';
Update to 1.39.2 Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
2019-10-19 01:20:02 +02:00
+// NOTE@coder: We send it all to the server side to be processed there instead.
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
+// import 'vs/workbench/services/telemetry/browser/telemetryService';
Update VS Code to 1.37.0
2019-08-10 01:50:05 +02:00
import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
Target a recent commit for VS Code This is so we can try out the web worker extension host.
2019-08-30 02:05:48 +02:00
import 'vs/workbench/services/credentials/browser/credentialsService';
import 'vs/workbench/services/url/browser/urlService';
Implement new structure
2020-02-04 20:27:46 +01:00
diff --git a/yarn.lock b/yarn.lock
Force minimist update
2020-07-23 20:00:38 +02:00
index 6bc96e8377..a2baf909d6 100644
Implement new structure
2020-02-04 20:27:46 +01:00
--- a/yarn.lock
+++ b/yarn.lock
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
@@ -140,6 +140,23 @@
lodash "^4.17.13"
Implement new structure
2020-02-04 20:27:46 +01:00
to-fast-properties "^2.0.0"
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+"@coder/logger@^1.1.12":
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-1.1.12.tgz#def113b7183abc35a8da2b57f0929f7e9626f4e0"
+ integrity sha512-oM0j3lTVPqApUm3e0bKKcXpfAiJEys31fgEfQlHmvEA13ujsC4zDuXnt0uzDtph48eMoNRLOF/EE4mNShVJKVw==
Implement new structure
2020-02-04 20:27:46 +01:00
+
+"@coder/node-browser@^1.0.8":
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/@coder/node-browser/-/node-browser-1.0.8.tgz#c22f581b089ad7d95ad1362fd351c57b7fbc6e70"
+ integrity sha512-NLF9sYMRCN9WK1C224pHax1Cay3qKypg25BhVg7VfNbo3Cpa3daata8RF/rT8JK3lPsu8PmFgDRQjzGC9X1Lrw==
+
Compress when sending client-side extension tars
2020-02-28 21:25:28 +01:00
+"@coder/requirefs@^1.1.5":
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/@coder/requirefs/-/requirefs-1.1.5.tgz#259db370d563a79a96fb150bc9d69c7db6edc9fb"
+ integrity sha512-3jB47OFCql9+9FI6Vc4YX0cfFnG5rxBfrZUH45S4XYtYGOz+/Xl4h4d2iMk50b7veHkeSWGlB4VHC3UZ16zuYQ==
Implement new structure
2020-02-04 20:27:46 +01:00
+ optionalDependencies:
+ jszip "2.6.0"
+
Update VS Code to 1.43.0
2020-03-13 23:31:24 +01:00
"@electron/get@^1.0.1":
version "1.7.2"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.2.tgz#286436a9fb56ff1a1fcdf0e80131fd65f4d1e0fd"
Update VS Code to 1.47.0
2020-07-09 01:12:10 +02:00
@@ -5407,6 +5424,13 @@ jsprim@^1.2.2:
Implement new structure
2020-02-04 20:27:46 +01:00
json-schema "0.2.3"
verror "1.10.0"
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
+jszip@2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/jszip/-/jszip-2.6.0.tgz#7fb3e9c2f11c8a9840612db5dabbc8cf3a7534b7"
+ integrity sha1-f7PpwvEciphAYS212rvIzzp1NLc=
+ dependencies:
+ pako "~1.0.0"
+
just-debounce@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
Force minimist update
2020-07-23 20:00:38 +02:00
@@ -6009,26 +6033,11 @@ minimatch@0.3:
dependencies:
brace-expansion "^1.1.7"
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.5:
+minimist@0.0.8, minimist@^1.2.0, minimist@^1.2.5, minimist@~0.0.1:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-minimist@~0.0.1:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
- integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
minipass@^2.2.1, minipass@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
@@ -6798,6 +6807,11 @@ p-try@^2.0.0:
Implement new structure
2020-02-04 20:27:46 +01:00
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
Fix node version mismatch
2020-03-26 19:34:32 +01:00
Implement new structure
2020-02-04 20:27:46 +01:00
+pako@~1.0.0:
Update VS Code to 1.42.0
2020-02-13 18:54:18 +01:00
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
Implement new structure
2020-02-04 20:27:46 +01:00
+
pako@~1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
Copy Permalink