-
-
-
-[Visual Studio Code](https://code.visualstudio.com) is a distribution of the `Code - OSS` repository with Microsoft-specific customizations released under a traditional [Microsoft product license](https://code.visualstudio.com/License/).
+## Why?
-[Visual Studio Code](https://code.visualstudio.com) combines the simplicity of a code editor with what developers need for their core edit-build-debug cycle. It provides comprehensive code editing, navigation, and understanding support along with lightweight debugging, a rich extensibility model, and lightweight integration with existing tools.
+VS Code has traditionally been a desktop IDE built with web technologies. A few years back, people started patching it in order to run it in a remote context and to make it accessible through web browsers. These efforts have been complex and error prone, because many changes had to be made across the large code base of VS Code.
-Visual Studio Code is updated monthly with new features and bug fixes. You can download it for Windows, macOS, and Linux on [Visual Studio Code's website](https://code.visualstudio.com/Download). To get the latest releases every day, install the [Insiders build](https://code.visualstudio.com/insiders).
+Luckily, in 2019 the VS Code team started to refactor its architecture to support a browser-based working mode. While this architecture has been adopted by Gitpod and GitHub, the important bits have not been open-sourced, until now. As a result, many people in the community still use the old, hard to maintain and error-prone approach.
-## Contributing
+At Gitpod, we've been asked a lot about how we do it. So we thought we might as well share the minimal set of changes needed so people can rely on the latest version of VS Code, have a straightforward upgrade path and low maintenance effort.
-There are many ways in which you can participate in this project, for example:
+## Getting started
-* [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues), and help us verify as they are checked in
-* Review [source code changes](https://github.com/microsoft/vscode/pulls)
-* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to additional and new content
+### Docker
-If you are interested in fixing issues and contributing directly to the code base,
-please see the document [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute), which covers the following:
+- Start the server:
+```bash
+docker run -it --init -p 3000:3000 -v "$(pwd):/home/workspace:cached" gitpod/openvscode-server
+```
+- Visit the URL printed in your terminal.
-* [How to build and run from source](https://github.com/microsoft/vscode/wiki/How-to-Contribute)
-* [The development workflow, including debugging and running tests](https://github.com/microsoft/vscode/wiki/How-to-Contribute#debugging)
-* [Coding guidelines](https://github.com/microsoft/vscode/wiki/Coding-Guidelines)
-* [Submitting pull requests](https://github.com/microsoft/vscode/wiki/How-to-Contribute#pull-requests)
-* [Finding an issue to work on](https://github.com/microsoft/vscode/wiki/How-to-Contribute#where-to-contribute)
-* [Contributing to translations](https://aka.ms/vscodeloc)
-## Feedback
+_Note_: Feel free to use the `nightly` tag to test the latest version, i.e. `gitpod/openvscode-server:nightly`.
-* Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode)
-* [Request a new feature](CONTRIBUTING.md)
-* Upvote [popular feature requests](https://github.com/microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
-* [File an issue](https://github.com/microsoft/vscode/issues)
-* Connect with the extension author community on [GitHub Discussions](https://github.com/microsoft/vscode-discussions/discussions) or [Slack](https://aka.ms/vscode-dev-community)
-* Follow [@code](https://twitter.com/code) and let us know what you think!
+#### Custom Environment
+- If you want to add dependencies to this Docker image, here is a template to help:
+ ```Dockerfile
-See our [wiki](https://github.com/microsoft/vscode/wiki/Feedback-Channels) for a description of each of these channels and information on some other available community-driven channels.
+ FROM gitpod/openvscode-server:latest
-## Related Projects
+ USER root # to get permissions to install packages and such
+ RUN # the installation process for software needed
+ USER openvscode-server # to restore permissions for the web interface
-Many of the core components and extensions to VS Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug) repositories are separate from each other. For a complete list, please visit the [Related Projects](https://github.com/microsoft/vscode/wiki/Related-Projects) page on our [wiki](https://github.com/microsoft/vscode/wiki).
+ ```
+- For additional possibilities, please consult the `Dockerfile` for OpenVSCode Server at https://github.com/gitpod-io/openvscode-releases/
-## Bundled Extensions
+#### Pre-installing VSCode extensions
-VS Code includes a set of built-in extensions located in the [extensions](extensions) folder, including grammars and snippets for many languages. Extensions that provide rich language support (inline suggestions, Go to Definition) for a language have the suffix `language-features`. For example, the `json` extension provides coloring for `JSON` and the `json-language-features` extension provides rich language support for `JSON`.
+You can pre-install vscode extensions in such a way:
-## Development Container
+```dockerfile
+FROM gitpod/openvscode-server:latest
-This repository includes a Visual Studio Code Dev Containers / GitHub Codespaces development container.
+ENV OPENVSCODE_SERVER_ROOT="/home/.openvscode-server"
+ENV OPENVSCODE="${OPENVSCODE_SERVER_ROOT}/bin/openvscode-server"
-* For [Dev Containers](https://aka.ms/vscode-remote/download/containers), use the **Dev Containers: Clone Repository in Container Volume...** command which creates a Docker volume for better disk I/O on macOS and Windows.
- * If you already have VS Code and Docker installed, you can also click [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. This will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
+SHELL ["/bin/bash", "-c"]
+RUN \
+ # Direct download links to external .vsix not available on https://open-vsx.org/
+ # The two links here are just used as example, they are actually available on https://open-vsx.org/
+ urls=(\
+ https://github.com/rust-lang/rust-analyzer/releases/download/2022-12-26/rust-analyzer-linux-x64.vsix \
+ https://github.com/VSCodeVim/Vim/releases/download/v1.24.3/vim-1.24.3.vsix \
+ )\
+ # Create a tmp dir for downloading
+ && tdir=/tmp/exts && mkdir -p "${tdir}" && cd "${tdir}" \
+ # Download via wget from $urls array.
+ && wget "${urls[@]}" && \
+ # List the extensions in this array
+ exts=(\
+ # From https://open-vsx.org/ registry directly
+ gitpod.gitpod-theme \
+ # From filesystem, .vsix that we downloaded (using bash wildcard '*')
+ "${tdir}"/* \
+ )\
+ # Install the $exts
+ && for ext in "${exts[@]}"; do ${OPENVSCODE} --install-extension "${ext}"; done
+```
-* For Codespaces, install the [GitHub Codespaces](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces) extension in VS Code, and use the **Codespaces: Create New Codespace** command.
+### Linux
-Docker / the Codespace should have at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run a full build. See the [development container README](.devcontainer/README.md) for more information.
+- [Download the latest release](https://github.com/gitpod-io/openvscode-server/releases/latest)
+- Untar and run the server
+ ```bash
+ tar -xzf openvscode-server-v${OPENVSCODE_SERVER_VERSION}.tar.gz
+ cd openvscode-server-v${OPENVSCODE_SERVER_VERSION}
+ ./bin/openvscode-server # you can add arguments here, use --help to list all of the possible options
+ ```
+
+ From the possible entrypoint arguments, the most notable ones are
+ - `--port` - the port number to start the server on, this is 3000 by default
+ - `--without-connection-token` - used by default in the docker image
+ - `--connection-token` & `--connection-token-file` for securing access to the IDE, you can read more about it in [Securing access to your IDE](#securing-access-to-your-ide).
+ - `--host` - determines the host the server is listening on. It defaults to `localhost`, so for accessing remotely it's a good idea to add `--host 0.0.0.0` to your launch arguments.
+
+- Visit the URL printed in your terminal.
+
+_Note_: You can use [pre-releases](https://github.com/gitpod-io/openvscode-server/releases) to test nightly changes.
+
+### Securing access to your IDE
+
+Since OpenVSCode Server v1.64, you can access the Web UI without authentication (anyone can access the IDE using just the hostname and port), if you need some kind of basic authentication then you can start the server with `--connection-token YOUR_TOKEN`, the provided `YOUR_TOKEN` will be used and the authenticated URL will be displayed in your terminal once you start the server. You can also create a plaintext file with the desired token as its contents and provide it to the server with `--connection-token-file YOUR_SECRET_TOKEN_FILE`.
+
+If you want to use a connection token and are working with OpenVSCode Server via [the Docker image](https://hub.docker.com/r/gitpod/openvscode-server), you will have to edit the `ENTRYPOINT` in [the Dockerfile](https://github.com/gitpod-io/openvscode-releases/blob/main/Dockerfile) or modify it with the [`entrypoint` option](https://docs.docker.com/compose/compose-file/compose-file-v3/#entrypoint) when working with `docker-compose`.
+
+### Deployment guides
+
+Please refer to [Guides](https://github.com/gitpod-io/openvscode-server/tree/docs/guides) to learn how to deploy OpenVSCode Server to your cloud provider of choice.
+
+## The scope of this project
+
+This project only adds minimal bits required to run VS Code in a server scenario. We have no intention of changing VS Code in any way or to add additional features to VS Code itself. Please report feature requests, bug fixes, etc. in the upstream repository.
+
+> **For any feature requests, bug reports, or contributions that are not specific to running VS Code in a server context, please go to [Visual Studio Code - Open Source "OSS"](https://github.com/microsoft/vscode)**
-## Code of Conduct
+## Documentation
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+All documentation is available in [the `docs` branch](https://github.com/gitpod-io/openvscode-server/tree/docs) of this project.
-## License
+## Supporters
-Copyright (c) Microsoft Corporation. All rights reserved.
+The project is supported by companies such as [GitLab](https://gitlab.com/), [VMware](https://www.vmware.com/), [Uber](https://www.uber.com/), [SAP](https://www.sap.com/), [Sourcegraph](https://sourcegraph.com/), [RStudio](https://www.rstudio.com/), [SUSE](https://rancher.com/), [Tabnine](https://www.tabnine.com/), [Render](https://render.com/) and [TypeFox](https://www.typefox.io/).
+
+## Contributing
+
+Thanks for your interest in contributing to the project 🙏. You can start a development environment with the following button:
+
+[](https://gitpod.io/from-referrer)
+
+To learn about the code structure and other topics related to contributing, please refer to the [development docs](https://github.com/gitpod-io/openvscode-server/blob/docs/development.md).
+
+## Bundled Extensions
+
+VS Code includes a set of built-in extensions located in the [extensions](extensions) folder, including grammars and snippets for many languages. Extensions that provide rich language support (inline suggestions, Go to Definition) for a language have the suffix `language-features`. For example, the `json` extension provides coloring for `JSON` and the `json-language-features` extension provides rich language support for `JSON`.
+
+## Development Container
+
+This repository includes a Visual Studio Code Dev Containers / GitHub Codespaces development container.
+
+- For [Dev Containers](https://aka.ms/vscode-remote/download/containers), use the **Dev Containers: Clone Repository in Container Volume...** command which creates a Docker volume for better disk I/O on macOS and Windows.
+ - If you already have VS Code and Docker installed, you can also click [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. This will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
+- For Codespaces, install the [GitHub Codespaces](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces) extension in VS Code, and use the **Codespaces: Create New Codespace** command.
+
+Docker / the Codespace should have at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run a full build. See the [development container README](.devcontainer/README.md) for more information.
-Licensed under the [MIT](LICENSE.txt) license.
+## Legal
+This project is not affiliated with Microsoft Corporation.
diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
index 5744a5f77d422..8aba426294021 100644
--- a/build/checksums/vscode-sysroot.txt
+++ b/build/checksums/vscode-sysroot.txt
@@ -4,4 +4,4 @@ b4fb7a62ee7a474cfb11d5fb2b73accd6a8c875a559db81d6dfccd0b4a3da442 aarch64-linux-
6e251200607ac4c4709ebd08b2dc0d9a353ddcfdb47f43a10c2b4cc4b49920c0 arm-rpi-linux-gnueabihf-glibc-2.28-gcc-10.5.0.tar.gz
f82c8dacbb9dd85819e4801909eb4e842ac12c899632aa75b4839383a18c7501 arm-rpi-linux-gnueabihf-glibc-2.28-gcc-8.5.0.tar.gz
3122af49c493c5c767c2b0772a41119cbdc9803125a705683445b4066dc88b82 x86_64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz
-84acc5a15566c98ddf80631731d672e0ce9febcf3f2e969101e0dfd7ef2405e3 x86_64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz
+84acc5a15566c98ddf80631731d672e0ce9febcf3f2e969101e0dfd7ef2405e3 x86_64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz
\ No newline at end of file
diff --git a/build/gulpfile.js b/build/gulpfile.js
index 97971eec63e13..37fa6aa29c04f 100644
--- a/build/gulpfile.js
+++ b/build/gulpfile.js
@@ -34,6 +34,8 @@ gulp.task(compileClientTask);
const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask)));
gulp.task(watchClientTask);
+gulp.task(task.define('watch-init', require('./lib/compilation').watchTask('out', false)));
+
// All
const _compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
gulp.task(_compileTask);
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index fb326dfd2b16a..c79343923bcad 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -1,39 +1,43 @@
"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
- if (k2 === undefined) k2 = k;
- var desc = Object.getOwnPropertyDescriptor(m, k);
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
- desc = { enumerable: true, get: function() { return m[k]; } };
- }
- Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
- if (k2 === undefined) k2 = k;
- o[k2] = m[k];
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function (o, m, k, k2) {
+ if (k2 === undefined) k2 = k;
+ var desc = Object.getOwnPropertyDescriptor(m, k);
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+ desc = { enumerable: true, get: function () { return m[k]; } };
+ }
+ Object.defineProperty(o, k2, desc);
+}) : (function (o, m, k, k2) {
+ if (k2 === undefined) k2 = k;
+ o[k2] = m[k];
}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
- Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
- o["default"] = v;
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function (o, v) {
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function (o, v) {
+ o["default"] = v;
});
var __importStar = (this && this.__importStar) || (function () {
- var ownKeys = function(o) {
- ownKeys = Object.getOwnPropertyNames || function (o) {
- var ar = [];
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
- return ar;
- };
- return ownKeys(o);
- };
- return function (mod) {
- if (mod && mod.__esModule) return mod;
- var result = {};
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
- __setModuleDefault(result, mod);
- return result;
- };
+ var ownKeys = function (o) {
+ ownKeys = Object.getOwnPropertyNames || function (o) {
+ var ar = [];
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+ return ar;
+ };
+ return ownKeys(o);
+ };
+ return function (mod) {
+ if (mod && mod.__esModule) return mod;
+ var result = {};
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+ __setModuleDefault(result, mod);
+ return result;
+ };
})();
var __importDefault = (this && this.__importDefault) || function (mod) {
- return (mod && mod.__esModule) ? mod : { "default": mod };
+ return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.watchApiProposalNamesTask = exports.compileApiProposalNamesTask = void 0;
@@ -61,280 +65,294 @@ const task = __importStar(require("./task"));
const index_1 = require("./mangle/index");
const ts = require("typescript");
const watch = require('./watch');
+const packageJson = require('../../package.json');
+const productJson = require('../../product.json');
+const replace = require('gulp-replace');
// --- gulp-tsb: compile and transpile --------------------------------
const reporter = (0, reporter_1.createReporter)();
function getTypeScriptCompilerOptions(src) {
- const rootDir = path_1.default.join(__dirname, `../../${src}`);
- const options = {};
- options.verbose = false;
- options.sourceMap = true;
- if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
- options.sourceMap = false;
- }
- options.rootDir = rootDir;
- options.baseUrl = rootDir;
- options.sourceRoot = util.toFileUri(rootDir);
- options.newLine = /\r\n/.test(fs_1.default.readFileSync(__filename, 'utf8')) ? 0 : 1;
- return options;
+ const rootDir = path_1.default.join(__dirname, `../../${src}`);
+ const options = {};
+ options.verbose = false;
+ options.sourceMap = true;
+ if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
+ options.sourceMap = false;
+ }
+ options.rootDir = rootDir;
+ options.baseUrl = rootDir;
+ options.sourceRoot = util.toFileUri(rootDir);
+ options.newLine = /\r\n/.test(fs_1.default.readFileSync(__filename, 'utf8')) ? 0 : 1;
+ return options;
}
function createCompile(src, { build, emitError, transpileOnly, preserveEnglish }) {
- const tsb = require('./tsb');
- const sourcemaps = require('gulp-sourcemaps');
- const projectPath = path_1.default.join(__dirname, '../../', src, 'tsconfig.json');
- const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
- if (!build) {
- overrideOptions.inlineSourceMap = true;
- }
- const compilation = tsb.create(projectPath, overrideOptions, {
- verbose: false,
- transpileOnly: Boolean(transpileOnly),
- transpileWithEsbuild: typeof transpileOnly !== 'boolean' && transpileOnly.esbuild
- }, err => reporter(err));
- function pipeline(token) {
- const bom = require('gulp-bom');
- const tsFilter = util.filter(data => /\.ts$/.test(data.path));
- const isUtf8Test = (f) => /(\/|\\)test(\/|\\).*utf8/.test(f.path);
- const isRuntimeJs = (f) => f.path.endsWith('.js') && !f.path.includes('fixtures');
- const noDeclarationsFilter = util.filter(data => !(/\.d\.ts$/.test(data.path)));
- const input = event_stream_1.default.through();
- const output = input
- .pipe(util.$if(isUtf8Test, bom())) // this is required to preserve BOM in test files that loose it otherwise
- .pipe(util.$if(!build && isRuntimeJs, util.appendOwnPathSourceURL()))
- .pipe(tsFilter)
- .pipe(util.loadSourcemaps())
- .pipe(compilation(token))
- .pipe(noDeclarationsFilter)
- .pipe(util.$if(build, nls.nls({ preserveEnglish })))
- .pipe(noDeclarationsFilter.restore)
- .pipe(util.$if(!transpileOnly, sourcemaps.write('.', {
- addComment: false,
- includeContent: !!build,
- sourceRoot: overrideOptions.sourceRoot
- })))
- .pipe(tsFilter.restore)
- .pipe(reporter.end(!!emitError));
- return event_stream_1.default.duplex(input, output);
- }
- pipeline.tsProjectSrc = () => {
- return compilation.src({ base: src });
- };
- pipeline.projectPath = projectPath;
- return pipeline;
+ const tsb = require('./tsb');
+ const sourcemaps = require('gulp-sourcemaps');
+ const projectPath = path_1.default.join(__dirname, '../../', src, 'tsconfig.json');
+ const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
+ if (!build) {
+ overrideOptions.inlineSourceMap = true;
+ }
+ const compilation = tsb.create(projectPath, overrideOptions, {
+ verbose: false,
+ transpileOnly: Boolean(transpileOnly),
+ transpileWithEsbuild: typeof transpileOnly !== 'boolean' && transpileOnly.esbuild
+ }, err => reporter(err));
+ function pipeline(token) {
+ const bom = require('gulp-bom');
+ const tsFilter = util.filter(data => /\.ts$/.test(data.path));
+ const isUtf8Test = (f) => /(\/|\\)test(\/|\\).*utf8/.test(f.path);
+ const isRuntimeJs = (f) => f.path.endsWith('.js') && !f.path.includes('fixtures');
+ const noDeclarationsFilter = util.filter(data => !(/\.d\.ts$/.test(data.path)));
+ const productJsFilter = util.filter(data => !build && data.path.endsWith('vs/platform/product/common/product.ts'));
+ const productConfiguration = JSON.stringify({
+ ...productJson,
+ version: `${packageJson.version}-dev`,
+ nameShort: `${productJson.nameShort} Dev`,
+ nameLong: `${productJson.nameLong} Dev`,
+ dataFolderName: `${productJson.dataFolderName}-dev`
+ });
+ const input = event_stream_1.default.through();
+ const output = input
+ .pipe(productJsFilter)
+ .pipe(replace(/{\s*\/\*BUILD->INSERT_PRODUCT_CONFIGURATION\*\/\s*}/, productConfiguration, { skipBinary: true }))
+ .pipe(productJsFilter.restore)
+ .pipe(util.$if(isUtf8Test, bom())) // this is required to preserve BOM in test files that loose it otherwise
+ .pipe(util.$if(!build && isRuntimeJs, util.appendOwnPathSourceURL()))
+ .pipe(tsFilter)
+ .pipe(util.loadSourcemaps())
+ .pipe(compilation(token))
+ .pipe(noDeclarationsFilter)
+ .pipe(util.$if(build, nls.nls({ preserveEnglish })))
+ .pipe(noDeclarationsFilter.restore)
+ .pipe(util.$if(!transpileOnly, sourcemaps.write('.', {
+ addComment: false,
+ includeContent: !!build,
+ sourceRoot: overrideOptions.sourceRoot
+ })))
+ .pipe(tsFilter.restore)
+ .pipe(reporter.end(!!emitError));
+ return event_stream_1.default.duplex(input, output);
+ }
+ pipeline.tsProjectSrc = () => {
+ return compilation.src({ base: src });
+ };
+ pipeline.projectPath = projectPath;
+ return pipeline;
}
function transpileTask(src, out, esbuild) {
- const task = () => {
- const transpile = createCompile(src, { build: false, emitError: true, transpileOnly: { esbuild: !!esbuild }, preserveEnglish: false });
- const srcPipe = gulp_1.default.src(`${src}/**`, { base: `${src}` });
- return srcPipe
- .pipe(transpile())
- .pipe(gulp_1.default.dest(out));
- };
- task.taskName = `transpile-${path_1.default.basename(src)}`;
- return task;
+ const task = () => {
+ const transpile = createCompile(src, { build: false, emitError: true, transpileOnly: { esbuild: !!esbuild }, preserveEnglish: false });
+ const srcPipe = gulp_1.default.src(`${src}/**`, { base: `${src}` });
+ return srcPipe
+ .pipe(transpile())
+ .pipe(gulp_1.default.dest(out));
+ };
+ task.taskName = `transpile-${path_1.default.basename(src)}`;
+ return task;
}
function compileTask(src, out, build, options = {}) {
- const task = () => {
- if (os_1.default.totalmem() < 4_000_000_000) {
- throw new Error('compilation requires 4GB of RAM');
- }
- const compile = createCompile(src, { build, emitError: true, transpileOnly: false, preserveEnglish: !!options.preserveEnglish });
- const srcPipe = gulp_1.default.src(`${src}/**`, { base: `${src}` });
- const generator = new MonacoGenerator(false);
- if (src === 'src') {
- generator.execute();
- }
- // mangle: TypeScript to TypeScript
- let mangleStream = event_stream_1.default.through();
- if (build && !options.disableMangle) {
- let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
- const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
- mangleStream = event_stream_1.default.through(async function write(data) {
- const tsNormalPath = ts.normalizePath(data.path);
- const newContents = (await newContentsByFileName).get(tsNormalPath);
- if (newContents !== undefined) {
- data.contents = Buffer.from(newContents.out);
- data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
- }
- this.push(data);
- }, async function end() {
- // free resources
- (await newContentsByFileName).clear();
- this.push(null);
- ts2tsMangler = undefined;
- });
- }
- return srcPipe
- .pipe(mangleStream)
- .pipe(generator.stream)
- .pipe(compile())
- .pipe(gulp_1.default.dest(out));
- };
- task.taskName = `compile-${path_1.default.basename(src)}`;
- return task;
+ const task = () => {
+ if (os_1.default.totalmem() < 4_000_000_000) {
+ throw new Error('compilation requires 4GB of RAM');
+ }
+ const compile = createCompile(src, { build, emitError: true, transpileOnly: false, preserveEnglish: !!options.preserveEnglish });
+ const srcPipe = gulp_1.default.src(`${src}/**`, { base: `${src}` });
+ const generator = new MonacoGenerator(false);
+ if (src === 'src') {
+ generator.execute();
+ }
+ // mangle: TypeScript to TypeScript
+ let mangleStream = event_stream_1.default.through();
+ if (build && !options.disableMangle) {
+ let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
+ const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
+ mangleStream = event_stream_1.default.through(async function write(data) {
+ const tsNormalPath = ts.normalizePath(data.path);
+ const newContents = (await newContentsByFileName).get(tsNormalPath);
+ if (newContents !== undefined) {
+ data.contents = Buffer.from(newContents.out);
+ data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
+ }
+ this.push(data);
+ }, async function end() {
+ // free resources
+ (await newContentsByFileName).clear();
+ this.push(null);
+ ts2tsMangler = undefined;
+ });
+ }
+ return srcPipe
+ .pipe(mangleStream)
+ .pipe(generator.stream)
+ .pipe(compile())
+ .pipe(gulp_1.default.dest(out));
+ };
+ task.taskName = `compile-${path_1.default.basename(src)}`;
+ return task;
}
function watchTask(out, build, srcPath = 'src') {
- const task = () => {
- const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
- const src = gulp_1.default.src(`${srcPath}/**`, { base: srcPath });
- const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
- const generator = new MonacoGenerator(true);
- generator.execute();
- return watchSrc
- .pipe(generator.stream)
- .pipe(util.incremental(compile, src, true))
- .pipe(gulp_1.default.dest(out));
- };
- task.taskName = `watch-${path_1.default.basename(out)}`;
- return task;
+ const task = () => {
+ const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
+ const src = gulp_1.default.src(`${srcPath}/**`, { base: srcPath });
+ const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
+ const generator = new MonacoGenerator(true);
+ generator.execute();
+ return watchSrc
+ .pipe(generator.stream)
+ .pipe(util.incremental(compile, src, true))
+ .pipe(gulp_1.default.dest(out));
+ };
+ task.taskName = `watch-${path_1.default.basename(out)}`;
+ return task;
}
const REPO_SRC_FOLDER = path_1.default.join(__dirname, '../../src');
class MonacoGenerator {
- _isWatch;
- stream;
- _watchedFiles;
- _fsProvider;
- _declarationResolver;
- constructor(isWatch) {
- this._isWatch = isWatch;
- this.stream = event_stream_1.default.through();
- this._watchedFiles = {};
- const onWillReadFile = (moduleId, filePath) => {
- if (!this._isWatch) {
- return;
- }
- if (this._watchedFiles[filePath]) {
- return;
- }
- this._watchedFiles[filePath] = true;
- fs_1.default.watchFile(filePath, () => {
- this._declarationResolver.invalidateCache(moduleId);
- this._executeSoon();
- });
- };
- this._fsProvider = new class extends monacodts.FSProvider {
- readFileSync(moduleId, filePath) {
- onWillReadFile(moduleId, filePath);
- return super.readFileSync(moduleId, filePath);
- }
- };
- this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
- if (this._isWatch) {
- fs_1.default.watchFile(monacodts.RECIPE_PATH, () => {
- this._executeSoon();
- });
- }
- }
- _executeSoonTimer = null;
- _executeSoon() {
- if (this._executeSoonTimer !== null) {
- clearTimeout(this._executeSoonTimer);
- this._executeSoonTimer = null;
- }
- this._executeSoonTimer = setTimeout(() => {
- this._executeSoonTimer = null;
- this.execute();
- }, 20);
- }
- _run() {
- const r = monacodts.run3(this._declarationResolver);
- if (!r && !this._isWatch) {
- // The build must always be able to generate the monaco.d.ts
- throw new Error(`monaco.d.ts generation error - Cannot continue`);
- }
- return r;
- }
- _log(message, ...rest) {
- (0, fancy_log_1.default)(ansi_colors_1.default.cyan('[monaco.d.ts]'), message, ...rest);
- }
- execute() {
- const startTime = Date.now();
- const result = this._run();
- if (!result) {
- // nothing really changed
- return;
- }
- if (result.isTheSame) {
- return;
- }
- fs_1.default.writeFileSync(result.filePath, result.content);
- fs_1.default.writeFileSync(path_1.default.join(REPO_SRC_FOLDER, 'vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
- this._log(`monaco.d.ts is changed - total time took ${Date.now() - startTime} ms`);
- if (!this._isWatch) {
- this.stream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
- }
- }
+ _isWatch;
+ stream;
+ _watchedFiles;
+ _fsProvider;
+ _declarationResolver;
+ constructor(isWatch) {
+ this._isWatch = isWatch;
+ this.stream = event_stream_1.default.through();
+ this._watchedFiles = {};
+ const onWillReadFile = (moduleId, filePath) => {
+ if (!this._isWatch) {
+ return;
+ }
+ if (this._watchedFiles[filePath]) {
+ return;
+ }
+ this._watchedFiles[filePath] = true;
+ fs_1.default.watchFile(filePath, () => {
+ this._declarationResolver.invalidateCache(moduleId);
+ this._executeSoon();
+ });
+ };
+ this._fsProvider = new class extends monacodts.FSProvider {
+ readFileSync(moduleId, filePath) {
+ onWillReadFile(moduleId, filePath);
+ return super.readFileSync(moduleId, filePath);
+ }
+ };
+ this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
+ if (this._isWatch) {
+ fs_1.default.watchFile(monacodts.RECIPE_PATH, () => {
+ this._executeSoon();
+ });
+ }
+ }
+ _executeSoonTimer = null;
+ _executeSoon() {
+ if (this._executeSoonTimer !== null) {
+ clearTimeout(this._executeSoonTimer);
+ this._executeSoonTimer = null;
+ }
+ this._executeSoonTimer = setTimeout(() => {
+ this._executeSoonTimer = null;
+ this.execute();
+ }, 20);
+ }
+ _run() {
+ const r = monacodts.run3(this._declarationResolver);
+ if (!r && !this._isWatch) {
+ // The build must always be able to generate the monaco.d.ts
+ throw new Error(`monaco.d.ts generation error - Cannot continue`);
+ }
+ return r;
+ }
+ _log(message, ...rest) {
+ (0, fancy_log_1.default)(ansi_colors_1.default.cyan('[monaco.d.ts]'), message, ...rest);
+ }
+ execute() {
+ const startTime = Date.now();
+ const result = this._run();
+ if (!result) {
+ // nothing really changed
+ return;
+ }
+ if (result.isTheSame) {
+ return;
+ }
+ fs_1.default.writeFileSync(result.filePath, result.content);
+ fs_1.default.writeFileSync(path_1.default.join(REPO_SRC_FOLDER, 'vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+ this._log(`monaco.d.ts is changed - total time took ${Date.now() - startTime} ms`);
+ if (!this._isWatch) {
+ this.stream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
+ }
+ }
}
function generateApiProposalNames() {
- let eol;
- try {
- const src = fs_1.default.readFileSync('src/vs/platform/extensions/common/extensionsApiProposals.ts', 'utf-8');
- const match = /\r?\n/m.exec(src);
- eol = match ? match[0] : os_1.default.EOL;
- }
- catch {
- eol = os_1.default.EOL;
- }
- const pattern = /vscode\.proposed\.([a-zA-Z\d]+)\.d\.ts$/;
- const versionPattern = /^\s*\/\/\s*version\s*:\s*(\d+)\s*$/mi;
- const proposals = new Map();
- const input = event_stream_1.default.through();
- const output = input
- .pipe(util.filter((f) => pattern.test(f.path)))
- .pipe(event_stream_1.default.through((f) => {
- const name = path_1.default.basename(f.path);
- const match = pattern.exec(name);
- if (!match) {
- return;
- }
- const proposalName = match[1];
- const contents = f.contents.toString('utf8');
- const versionMatch = versionPattern.exec(contents);
- const version = versionMatch ? versionMatch[1] : undefined;
- proposals.set(proposalName, {
- proposal: `https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${proposalName}.d.ts`,
- version: version ? parseInt(version) : undefined
- });
- }, function () {
- const names = [...proposals.keys()].sort();
- const contents = [
- '/*---------------------------------------------------------------------------------------------',
- ' * Copyright (c) Microsoft Corporation. All rights reserved.',
- ' * Licensed under the MIT License. See License.txt in the project root for license information.',
- ' *--------------------------------------------------------------------------------------------*/',
- '',
- '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
- '',
- 'const _allApiProposals = {',
- `${names.map(proposalName => {
- const proposal = proposals.get(proposalName);
- return `\t${proposalName}: {${eol}\t\tproposal: '${proposal.proposal}',${eol}${proposal.version ? `\t\tversion: ${proposal.version}${eol}` : ''}\t}`;
- }).join(`,${eol}`)}`,
- '};',
- 'export const allApiProposals = Object.freeze<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>(_allApiProposals);',
- 'export type ApiProposalName = keyof typeof _allApiProposals;',
- '',
- ].join(eol);
- this.emit('data', new vinyl_1.default({
- path: 'vs/platform/extensions/common/extensionsApiProposals.ts',
- contents: Buffer.from(contents)
- }));
- this.emit('end');
- }));
- return event_stream_1.default.duplex(input, output);
+ let eol;
+ try {
+ const src = fs_1.default.readFileSync('src/vs/platform/extensions/common/extensionsApiProposals.ts', 'utf-8');
+ const match = /\r?\n/m.exec(src);
+ eol = match ? match[0] : os_1.default.EOL;
+ }
+ catch {
+ eol = os_1.default.EOL;
+ }
+ const pattern = /vscode\.proposed\.([a-zA-Z\d]+)\.d\.ts$/;
+ const versionPattern = /^\s*\/\/\s*version\s*:\s*(\d+)\s*$/mi;
+ const proposals = new Map();
+ const input = event_stream_1.default.through();
+ const output = input
+ .pipe(util.filter((f) => pattern.test(f.path)))
+ .pipe(event_stream_1.default.through((f) => {
+ const name = path_1.default.basename(f.path);
+ const match = pattern.exec(name);
+ if (!match) {
+ return;
+ }
+ const proposalName = match[1];
+ const contents = f.contents.toString('utf8');
+ const versionMatch = versionPattern.exec(contents);
+ const version = versionMatch ? versionMatch[1] : undefined;
+ proposals.set(proposalName, {
+ proposal: `https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${proposalName}.d.ts`,
+ version: version ? parseInt(version) : undefined
+ });
+ }, function () {
+ const names = [...proposals.keys()].sort();
+ const contents = [
+ '/*---------------------------------------------------------------------------------------------',
+ ' * Copyright (c) Microsoft Corporation. All rights reserved.',
+ ' * Licensed under the MIT License. See License.txt in the project root for license information.',
+ ' *--------------------------------------------------------------------------------------------*/',
+ '',
+ '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
+ '',
+ 'const _allApiProposals = {',
+ `${names.map(proposalName => {
+ const proposal = proposals.get(proposalName);
+ return `\t${proposalName}: {${eol}\t\tproposal: '${proposal.proposal}',${eol}${proposal.version ? `\t\tversion: ${proposal.version}${eol}` : ''}\t}`;
+ }).join(`,${eol}`)}`,
+ '};',
+ 'export const allApiProposals = Object.freeze<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>(_allApiProposals);',
+ 'export type ApiProposalName = keyof typeof _allApiProposals;',
+ '',
+ ].join(eol);
+ this.emit('data', new vinyl_1.default({
+ path: 'vs/platform/extensions/common/extensionsApiProposals.ts',
+ contents: Buffer.from(contents)
+ }));
+ this.emit('end');
+ }));
+ return event_stream_1.default.duplex(input, output);
}
const apiProposalNamesReporter = (0, reporter_1.createReporter)('api-proposal-names');
exports.compileApiProposalNamesTask = task.define('compile-api-proposal-names', () => {
- return gulp_1.default.src('src/vscode-dts/**')
- .pipe(generateApiProposalNames())
- .pipe(gulp_1.default.dest('src'))
- .pipe(apiProposalNamesReporter.end(true));
+ return gulp_1.default.src('src/vscode-dts/**')
+ .pipe(generateApiProposalNames())
+ .pipe(gulp_1.default.dest('src'))
+ .pipe(apiProposalNamesReporter.end(true));
});
exports.watchApiProposalNamesTask = task.define('watch-api-proposal-names', () => {
- const task = () => gulp_1.default.src('src/vscode-dts/**')
- .pipe(generateApiProposalNames())
- .pipe(apiProposalNamesReporter.end(true));
- return watch('src/vscode-dts/**', { readDelay: 200 })
- .pipe(util.debounce(task))
- .pipe(gulp_1.default.dest('src'));
+ const task = () => gulp_1.default.src('src/vscode-dts/**')
+ .pipe(generateApiProposalNames())
+ .pipe(apiProposalNamesReporter.end(true));
+ return watch('src/vscode-dts/**', { readDelay: 200 })
+ .pipe(util.debounce(task))
+ .pipe(gulp_1.default.dest('src'));
});
-//# sourceMappingURL=compilation.js.map
\ No newline at end of file
+//# sourceMappingURL=compilation.js.map
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index a8b7291492533..915c022562ecb 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -20,6 +20,9 @@ import { Mangler } from './mangle/index';
import { RawSourceMap } from 'source-map';
import ts = require('typescript');
const watch = require('./watch');
+const packageJson = require('../../package.json');
+const productJson = require('../../product.json');
+const replace = require('gulp-replace');
// --- gulp-tsb: compile and transpile --------------------------------
@@ -73,8 +76,21 @@ export function createCompile(src: string, { build, emitError, transpileOnly, pr
const isRuntimeJs = (f: File) => f.path.endsWith('.js') && !f.path.includes('fixtures');
const noDeclarationsFilter = util.filter(data => !(/\.d\.ts$/.test(data.path)));
+
+ const productJsFilter = util.filter(data => !build && data.path.endsWith('vs/platform/product/common/product.ts'));
+ const productConfiguration = JSON.stringify({
+ ...productJson,
+ version: `${packageJson.version}-dev`,
+ nameShort: `${productJson.nameShort} Dev`,
+ nameLong: `${productJson.nameLong} Dev`,
+ dataFolderName: `${productJson.dataFolderName}-dev`
+ });
+
const input = es.through();
const output = input
+ .pipe(productJsFilter)
+ .pipe(replace(/{\s*\/\*BUILD->INSERT_PRODUCT_CONFIGURATION\*\/\s*}/, productConfiguration, { skipBinary: true }))
+ .pipe(productJsFilter.restore)
.pipe(util.$if(isUtf8Test, bom())) // this is required to preserve BOM in test files that loose it otherwise
.pipe(util.$if(!build && isRuntimeJs, util.appendOwnPathSourceURL()))
.pipe(tsFilter)
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
index 1134130d780cd..f2e9363f21677 100644
--- a/build/linux/debian/install-sysroot.js
+++ b/build/linux/debian/install-sysroot.js
@@ -71,7 +71,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
const timeout = setTimeout(() => controller.abort(), 30 * 1000);
const version = '20250407-330404';
try {
- const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
+ const response = await fetch(`https://api.github.com/repos/microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
headers: ghApiHeaders,
signal: controller.signal
});
@@ -80,7 +80,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
const contents = Buffer.from(await response.arrayBuffer());
const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName);
if (!asset) {
- throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
+ throw new Error(`Could not find asset in release of microsoft/vscode-linux-build-agent @ ${version}`);
}
console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
const assetResponse = await fetch(asset.url, {
diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
index 4b7ebd1b846b1..2d5d94f366e9a 100644
--- a/build/linux/debian/install-sysroot.ts
+++ b/build/linux/debian/install-sysroot.ts
@@ -80,7 +80,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
const timeout = setTimeout(() => controller.abort(), 30 * 1000);
const version = '20250407-330404';
try {
- const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
+ const response = await fetch(`https://api.github.com/repos/microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
headers: ghApiHeaders,
signal: controller.signal
});
@@ -89,7 +89,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
const contents = Buffer.from(await response.arrayBuffer());
const asset = JSON.parse(contents.toString()).assets.find((a: { name: string }) => a.name === options.assetName);
if (!asset) {
- throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
+ throw new Error(`Could not find asset in release of microsoft/vscode-linux-build-agent @ ${version}`);
}
console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
const assetResponse = await fetch(asset.url, {
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index fa8da7d08c69e..a953b11ac3457 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -60,8 +60,8 @@ function npmInstall(dir, opts) {
'docker', 'run',
'-e', 'GITHUB_TOKEN',
'-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`,
- '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`,
- '-v', `${process.env['VSCODE_NPMRC_PATH']}:/root/.npmrc`,
+ // '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`,
+ // '-v', `${process.env['VSCODE_NPMRC_PATH']}:/root/.npmrc`,
'-w', path.resolve('/root/vscode', dir),
process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'],
'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && export PATH="/root/vscode/.build/nodejs-musl/usr/local/bin:$PATH" && npm i -g node-gyp-build && npm ci\"`
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 9ff385ce77fff..5c4744534086c 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -71,7 +71,7 @@
"title": "%command.continueInLocalClone%",
"category": "Git",
"icon": "$(repo-clone)",
- "enablement": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && remoteName"
+ "enablement": "false && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && remoteName"
},
{
"command": "git.clone",
@@ -1004,7 +1004,7 @@
{
"command": "git.continueInLocalClone",
"qualifiedName": "%command.continueInLocalClone.qualifiedName%",
- "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && remoteName",
+ "when": "false && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && remoteName",
"remoteGroup": "remote_42_git_0_local@0"
}
],
diff --git a/package.json b/package.json
index 880f7560ba159..e0fa99d62719e 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,9 @@
"extensions-ci": "node ./node_modules/gulp/bin/gulp.js extensions-ci",
"extensions-ci-pr": "node ./node_modules/gulp/bin/gulp.js extensions-ci-pr",
"perf": "node scripts/code-perf.js",
- "update-build-ts-version": "npm install -D typescript@next && npm install -D @typescript/native-preview && (cd build && npm run compile)"
+ "update-build-ts-version": "npm install -D typescript@next && npm install -D @typescript/native-preview && (cd build && npm run compile)",
+ "server:init": "npm run compile && npm run download-builtin-extensions",
+ "server:smoketest": "npm run smoketest -- --web --verbose --headless --electronArgs=\"--disable-dev-shm-usage --use-gl=swiftshader\""
},
"dependencies": {
"@microsoft/1ds-core-js": "^3.2.13",
diff --git a/product.json b/product.json
index f088e15a7720a..a3cf2f4115e39 100644
--- a/product.json
+++ b/product.json
@@ -1,38 +1,1108 @@
{
- "nameShort": "Code - OSS",
- "nameLong": "Code - OSS",
- "applicationName": "code-oss",
- "dataFolderName": ".vscode-oss",
- "win32MutexName": "vscodeoss",
+ "nameShort": "OpenVSCode Server",
+ "nameLong": "OpenVSCode Server",
+ "applicationName": "openvscode-server",
+ "dataFolderName": ".openvscode-server",
+ "win32MutexName": "openvscodeserver",
"licenseName": "MIT",
- "licenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
- "serverLicenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
+ "licenseUrl": "https://github.com/gitpod-io/openvscode-server/blob/main/LICENSE.txt",
+ "serverLicenseUrl": "https://github.com/gitpod-io/openvscode-server/blob/main/LICENSE.txt",
"serverGreeting": [],
"serverLicense": [],
"serverLicensePrompt": "",
- "serverApplicationName": "code-server-oss",
- "serverDataFolderName": ".vscode-server-oss",
- "tunnelApplicationName": "code-tunnel-oss",
- "win32DirName": "Microsoft Code OSS",
- "win32NameVersion": "Microsoft Code OSS",
- "win32RegValueName": "CodeOSS",
+ "serverApplicationName": "openvscode-server",
+ "serverDataFolderName": ".openvscode-server",
+ "tunnelApplicationName": "openvscode-server-tunnel",
+ "win32DirName": "OpenVSCode Server",
+ "win32NameVersion": "OpenVSCode Server",
+ "win32RegValueName": "OpenVSCodeServer",
"win32x64AppId": "{{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}",
"win32arm64AppId": "{{D1ACE434-89C5-48D1-88D3-E2991DF85475}",
"win32x64UserAppId": "{{CC6B787D-37A0-49E8-AE24-8559A032BE0C}",
"win32arm64UserAppId": "{{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}",
- "win32AppUserModelId": "Microsoft.CodeOSS",
- "win32ShellNameShort": "C&ode - OSS",
- "win32TunnelServiceMutex": "vscodeoss-tunnelservice",
- "win32TunnelMutex": "vscodeoss-tunnel",
- "darwinBundleIdentifier": "com.visualstudio.code.oss",
+ "win32AppUserModelId": "OpenVSCode Server",
+ "win32ShellNameShort": "OpenVSC&ode Server",
+ "win32TunnelServiceMutex": "openvscode.server-tunnelservice",
+ "win32TunnelMutex": "openvscode.server-tunnel",
+ "darwinBundleIdentifier": "openvscode.server",
"darwinProfileUUID": "47827DD9-4734-49A0-AF80-7E19B11495CC",
"darwinProfilePayloadUUID": "CF808BE7-53F3-46C6-A7E2-7EDB98A5E959",
- "linuxIconName": "code-oss",
+ "linuxIconName": "openvscode.server",
"licenseFileName": "LICENSE.txt",
- "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
+ "twitterUrl": "https://twitter.com/gitpod",
+ "reportIssueUrl": "https://github.com/gitpod-io/openvscode-server/issues/new",
+ "requestFeatureUrl": "https://github.com/gitpod-io/openvscode-server/issues",
+ "reportMarketplaceIssueUrl": "https://github.com/eclipse/openvsx/issues",
+ "sendASmile": {
+ "reportIssueUrl": "https://github.com/gitpod-io/openvscode-server/issues/new",
+ "requestFeatureUrl": "https://github.com/gitpod-io/openvscode-server/issues"
+ },
"nodejsRepository": "https://nodejs.org",
- "urlProtocol": "code-oss",
+ "urlProtocol": "openvscode-server",
+ "embedderIdentifier": "openvscode-server",
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
+ "extensionRecommendations": {
+ "muhammad-sammy.csharp": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.cs,**/global.json,**/*.csproj,**/*.cshtml,**/*.sln}",
+ "important": true
+ },
+ {
+ "languages": [
+ "csharp"
+ ],
+ "important": true
+ },
+ {
+ "pathGlob": "{**/project.json,**/appsettings.json}"
+ }
+ ]
+ },
+ "ms-python.python": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.py}",
+ "important": true
+ },
+ {
+ "languages": [
+ "python"
+ ],
+ "important": true
+ },
+ {
+ "pathGlob": "{**/*.ipynb}"
+ }
+ ]
+ },
+ "ms-toolsai.jupyter": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.py}",
+ "contentPattern": "^#\\s*%%$",
+ "important": true,
+ "whenInstalled": [
+ "ms-python.python"
+ ]
+ },
+ {
+ "pathGlob": "{**/*.ipynb}"
+ }
+ ]
+ },
+ "golang.Go": {
+ "onFileOpen": [
+ {
+ "pathGlob": "**/*.go",
+ "important": true
+ },
+ {
+ "languages": [
+ "go"
+ ],
+ "important": true
+ }
+ ]
+ },
+ "vscjava.vscode-java-pack": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.java}",
+ "important": true,
+ "whenNotInstalled": [
+ "ASF.apache-netbeans-java",
+ "Oracle.oracle-java"
+ ]
+ },
+ {
+ "languages": [
+ "java"
+ ],
+ "important": true,
+ "whenNotInstalled": [
+ "ASF.apache-netbeans-java",
+ "Oracle.oracle-java"
+ ]
+ }
+ ]
+ },
+ "ms-vscode.PowerShell": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.ps1,**/*.psd1,**/*.psm1}",
+ "important": true
+ },
+ {
+ "languages": [
+ "powershell"
+ ],
+ "important": true
+ },
+ {
+ "pathGlob": "{**/*.ps.config,**/*.ps1.config}"
+ }
+ ]
+ },
+ "ms-azuretools.vscode-docker": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/dockerfile,**/Dockerfile,**/docker-compose.yml,**/docker-compose.*.yml}",
+ "important": true
+ },
+ {
+ "languages": [
+ "dockerfile"
+ ],
+ "important": true
+ },
+ {
+ "pathGlob": "{**/*.cs,**/project.json,**/global.json,**/*.csproj,**/*.cshtml,**/*.sln,**/appsettings.json,**/*.py,**/*.ipynb,**/*.js,**/*.ts,**/package.json}"
+ }
+ ]
+ },
+ "vue.volar": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.vue}",
+ "important": true
+ },
+ {
+ "languages": [
+ "vue"
+ ],
+ "important": true
+ }
+ ]
+ },
+ "ms-vscode.makefile-tools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/makefile,**/Makefile}",
+ "important": true
+ },
+ {
+ "languages": [
+ "makefile"
+ ],
+ "important": true
+ }
+ ]
+ },
+ "ms-vscode.cmake-tools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/CMakeLists.txt}",
+ "important": true
+ }
+ ]
+ },
+ "ms-azure-devops.azure-pipelines": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/azure-pipelines.yaml}",
+ "important": true
+ }
+ ]
+ },
+ "msazurermtools.azurerm-vscode-tools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/azuredeploy.json}",
+ "important": true
+ }
+ ]
+ },
+ "ms-vscode-remote.remote-containers": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/devcontainer.json}",
+ "important": true
+ }
+ ]
+ },
+ "ms-azuretools.vscode-bicep": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.bicep}",
+ "important": true,
+ "whenNotInstalled": [
+ "ms-azuretools.rad-vscode-bicep"
+ ]
+ }
+ ]
+ },
+ "svelte.svelte-vscode": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.svelte}",
+ "important": true
+ }
+ ]
+ },
+ "ms-vscode.vscode-github-issue-notebooks": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.github-issues}",
+ "important": true
+ }
+ ]
+ },
+ "ms-playwright.playwright": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*playwright*.config.ts,**/*playwright*.config.js,**/*playwright*.config.mjs}",
+ "important": true
+ }
+ ]
+ },
+ "vscjava.vscode-gradle": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/gradlew,**/gradlew.bat,**/build.gradle,**/build.gradle.kts,**/settings.gradle,**/settings.gradle.kts}",
+ "important": true
+ }
+ ]
+ },
+ "REditorSupport.r": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.r}",
+ "important": true
+ },
+ {
+ "languages": [
+ "r"
+ ],
+ "important": true
+ }
+ ]
+ },
+ "firefox-devtools.vscode-firefox-debug": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6,**/.babelrc}"
+ }
+ ]
+ },
+ "ms-edgedevtools.vscode-edge-devtools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.ts,**/*.tsx,**/*.js,**/*.css,**/*.html}"
+ }
+ ]
+ },
+ "Ionide.Ionide-fsharp": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.fsx,**/*.fsi,**/*.fs,**/*.ml,**/*.mli}"
+ }
+ ]
+ },
+ "dbaeumer.vscode-eslint": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.js,**/*.jsx,**/*.es6,**/.eslintrc.*,**/.eslintrc,**/.babelrc,**/jsconfig.json}"
+ }
+ ]
+ },
+ "bmewburn.vscode-intelephense-client": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.php,**/php.ini}"
+ }
+ ]
+ },
+ "xdebug.php-debug": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.php,**/php.ini}"
+ }
+ ]
+ },
+ "rust-lang.rust-analyzer": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.rs,**/*.rslib}"
+ }
+ ]
+ },
+ "DavidAnson.vscode-markdownlint": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.md}"
+ }
+ ]
+ },
+ "EditorConfig.EditorConfig": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.editorconfig}"
+ }
+ ]
+ },
+ "HookyQR.beautify": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.jsbeautifyrc}"
+ }
+ ]
+ },
+ "donjayamanne.githistory": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.gitignore,**/.git}"
+ }
+ ]
+ },
+ "eamodio.gitlens": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.gitignore,**/.git}"
+ }
+ ]
+ },
+ "Shopify.ruby-lsp": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.rb,**/*.erb,**/*.reek,**/.fasterer.yml,**/ruby-lint.yml,**/.rubocop.yml}"
+ }
+ ]
+ },
+ "DotJoshJohnson.xml": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.xml}"
+ }
+ ]
+ },
+ "stylelint.vscode-stylelint": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.stylelintrc,**/stylelint.config.js}"
+ }
+ ]
+ },
+ "ms-mssql.mssql": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.sql}"
+ }
+ ]
+ },
+ "mtxr.sqltools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.sql}"
+ }
+ ]
+ },
+ "usqlextpublisher.usql-vscode-ext": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.usql}"
+ }
+ ]
+ },
+ "ms-vscode.sublime-keybindings": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.sublime-project,**/.sublime-workspace}"
+ }
+ ]
+ },
+ "k--kato.intellij-idea-keybindings": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.idea}"
+ }
+ ]
+ },
+ "christian-kohler.npm-intellisense": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/package.json}"
+ }
+ ]
+ },
+ "Angular.ng-template": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.angular-cli.json,**/angular.json,**/*.ng.html,**/*.ng,**/*.ngml}"
+ }
+ ]
+ },
+ "vscjava.vscode-maven": {
+ "onFileOpen": [
+ {
+ "pathGlob": "**/pom.xml"
+ }
+ ]
+ },
+ "ms-azuretools.vscode-azureterraform": {
+ "onFileOpen": [
+ {
+ "pathGlob": "**/*.tf"
+ }
+ ]
+ },
+ "HashiCorp.terraform": {
+ "onFileOpen": [
+ {
+ "pathGlob": "**/*.tf"
+ }
+ ]
+ },
+ "ms-kubernetes-tools.vscode-kubernetes-tools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/Chart.yaml}"
+ }
+ ]
+ },
+ "Oracle.oracledevtools": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.sql}"
+ }
+ ]
+ },
+ "betterthantomorrow.calva": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.clj,**/*.cljs}"
+ }
+ ]
+ },
+ "vmware.vscode-boot-dev-pack": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/application.properties}"
+ }
+ ]
+ },
+ "GitHub.copilot": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/*.ts,**/*.tsx,**/*.js,**/*.py,**/*.go,**/*.rb}"
+ }
+ ],
+ "onSettingsEditorOpen": {}
+ },
+ "GitHub.vscode-github-actions": {
+ "onFileOpen": [
+ {
+ "pathGlob": "{**/.github/workflows/*.yml}",
+ "important": true
+ }
+ ]
+ },
+ "mechatroner.rainbow-csv": {
+ "onFileOpen": [
+ {
+ "pathGlob": "**/*.csv",
+ "important": true
+ }
+ ]
+ },
+ "tomoki1207.pdf": {
+ "onFileOpen": [
+ {
+ "pathGlob": "**/*.pdf",
+ "important": true
+ }
+ ]
+ }
+ },
+ "commonlyUsedSettings": [
+ "files.autoSave",
+ "editor.fontSize",
+ "editor.fontFamily",
+ "GitHub.copilot.manageExtension",
+ "editor.tabSize",
+ "editor.renderWhitespace",
+ "editor.cursorStyle",
+ "editor.multiCursorModifier",
+ "editor.insertSpaces",
+ "editor.wordWrap",
+ "files.exclude",
+ "files.associations",
+ "workbench.editor.enablePreview"
+ ],
+ "keymapExtensionTips": [
+ "vscodevim.vim",
+ "ms-vscode.sublime-keybindings",
+ "ms-vscode.atom-keybindings",
+ "ms-vscode.brackets-keybindings",
+ "ms-vscode.vs-keybindings",
+ "ms-vscode.notepadplusplus-keybindings",
+ "k--kato.intellij-idea-keybindings",
+ "lfs.vscode-emacs-friendly",
+ "alphabotsec.vscode-eclipse-keybindings",
+ "alefragnani.delphi-keybindings"
+ ],
+ "languageExtensionTips": [
+ "ms-python.python",
+ "muhammad-sammy.csharp",
+ "ms-toolsai.jupyter",
+ "vscjava.vscode-java-pack",
+ "ecmel.vscode-html-css",
+ "vue.volar",
+ "bmewburn.vscode-intelephense-client",
+ "dsznajder.es7-react-js-snippets",
+ "golang.go",
+ "ms-vscode.powershell",
+ "dart-code.dart-code",
+ "rust-lang.rust-analyzer",
+ "Shopify.ruby-lsp"
+ ],
+ "configBasedExtensionTips": {
+ "git": {
+ "configPath": ".git/config",
+ "configName": "Git",
+ "recommendations": {
+ "github.vscode-pull-request-github": {
+ "name": "GitHub Pull Request",
+ "contentPattern": "^\\s*url\\s*=\\s*https:\\/\\/github\\.com.*$"
+ },
+ "eamodio.gitlens": {
+ "name": "GitLens"
+ }
+ }
+ },
+ "maven": {
+ "configPath": "pom.xml",
+ "configName": "Maven",
+ "recommendations": {
+ "vscjava.vscode-java-pack": {
+ "name": "Java",
+ "important": true,
+ "isExtensionPack": true,
+ "whenNotInstalled": [
+ "ASF.apache-netbeans-java"
+ ]
+ },
+ "vmware.vscode-boot-dev-pack": {
+ "name": "Spring Boot Extension Pack",
+ "isExtensionPack": true
+ }
+ }
+ },
+ "gradle": {
+ "configPath": "build.gradle",
+ "configName": "Gradle",
+ "recommendations": {
+ "vscjava.vscode-java-pack": {
+ "name": "Java",
+ "important": true,
+ "isExtensionPack": true,
+ "whenNotInstalled": [
+ "ASF.apache-netbeans-java"
+ ]
+ }
+ }
+ },
+ "github-pull-request": {
+ "configPath": ".vscode/.github-pull-request.rec",
+ "configName": "GitHub",
+ "configScheme": "vscode-vfs",
+ "recommendations": {
+ "github.vscode-pull-request-github": {
+ "name": "GitHub Pull Request",
+ "important": true
+ }
+ }
+ },
+ "pyproject-formatter": {
+ "configPath": "pyproject.toml",
+ "configName": "Python Formatter",
+ "recommendations": {
+ "ms-python.black-formatter": {
+ "name": "Black Formatter",
+ "contentPattern": "(^\\s*\\[\\[?\\s*\"?tool\"?\\s*\\.\\s*\"?black\"?\\s*[\\].])|(\"black\\s*[\"[(<=>!~;@])"
+ },
+ "ms-python.autopep8": {
+ "name": "Autopep8",
+ "contentPattern": "(^\\s*\\[\\[?\\s*\"?tool\"?\\s*\\.\\s*\"?autopep8\"?\\s*[\\].])|(\"autopep8\\s*[\"[(<=>!~;@])"
+ }
+ }
+ },
+ "pep8-formatter": {
+ "configPath": ".pep8",
+ "configName": "Python Formatter",
+ "recommendations": {
+ "ms-python.autopep8": {
+ "name": "Autopep8"
+ }
+ }
+ },
+ "python-setup-cgf-formatter": {
+ "configPath": "setup.cfg",
+ "configName": "Python Formatter",
+ "recommendations": {
+ "ms-python.autopep8": {
+ "name": "Autopep8",
+ "contentPattern": "^\\[pep8\\]"
+ }
+ }
+ },
+ "tox-ini-formatter": {
+ "configPath": "tox.ini",
+ "configName": "Python Formatter",
+ "recommendations": {
+ "ms-python.autopep8": {
+ "name": "Autopep8",
+ "contentPattern": "^\\[pep8\\]"
+ }
+ }
+ },
+ "pyproject-linter": {
+ "configPath": "pyproject.toml",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.pylint": {
+ "name": "Pylint",
+ "contentPattern": "(^\\s*\\[\\[?\\s*\"?tool\"?\\s*\\.\\s*\"?pylint\"?\\s*[\\].])|(\"pylint\\s*[\"[(<=>!~;@])"
+ },
+ "charliermarsh.ruff": {
+ "name": "Ruff",
+ "contentPattern": "(^\\s*\\[\\[?\\s*\"?tool\"?\\s*\\.\\s*\"?ruff\"?\\s*[\\].])|(\"ruff\\s*[\"[(<=>!~;@])"
+ },
+ "ms-python.mypy-type-checker": {
+ "name": "Mypy Type Checker",
+ "contentPattern": "(^\\s*\\[\\[?\\s*\"?tool\"?\\s*\\.\\s*\"?mypy\"?\\s*[\\].])|(\"mypy\\s*[\"[(<=>!~;@])"
+ },
+ "ms-python.flake8": {
+ "name": "Flake8",
+ "contentPattern": "(^\\s*\\[\\[?\\s*\"?tool\"?\\s*\\.\\s*\"?flake8\"?\\s*[\\].])|(\"flake8\\s*[\"[(<=>!~;@])"
+ }
+ }
+ },
+ ".pylintrc-linter": {
+ "configPath": ".pylintrc",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.pylint": {
+ "name": "Pylint"
+ }
+ }
+ },
+ "pylintrc-linter": {
+ "configPath": "pylintrc",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.pylint": {
+ "name": "Pylint"
+ }
+ }
+ },
+ "mypy-ini-linter": {
+ "configPath": ".mypy.ini",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.mypy-type-checker": {
+ "name": "Mypy Type Checker"
+ }
+ }
+ },
+ "tox-ini-linter": {
+ "configPath": "tox.ini",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.flake8": {
+ "name": "Flake8",
+ "contentPattern": "^\\[flake8\\]"
+ }
+ }
+ },
+ ".flake8-linter": {
+ "configPath": ".flake8",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.flake8": {
+ "name": "Flake8"
+ }
+ }
+ },
+ "python-setup-cgf-linter": {
+ "configPath": "setup.cfg",
+ "configName": "Python Linter",
+ "recommendations": {
+ "ms-python.flake8": {
+ "name": "Flake8",
+ "contentPattern": "^\\[flake8\\]"
+ }
+ }
+ }
+ },
+ "commandPaletteSuggestedCommandIds": [
+ "workbench.action.files.openFile",
+ "workbench.action.files.openFileFolder",
+ "workbench.action.files.openFolder",
+ "workbench.action.remote.showMenu",
+ "editor.action.formatDocument",
+ "editor.action.commentLine",
+ "workbench.action.tasks.runTask",
+ "workbench.action.openSettings2",
+ "workbench.action.selectTheme",
+ "workbench.action.openWalkthrough",
+ "workbench.action.openIssueReporter"
+ ],
+ "extensionKeywords": {
+ "md": [
+ "Markdown"
+ ],
+ "js": [
+ "JavaScript"
+ ],
+ "jsx": [
+ "JavaScript"
+ ],
+ "es6": [
+ "JavaScript"
+ ],
+ "html": [
+ "Html"
+ ],
+ "ts": [
+ "TypeScript"
+ ],
+ "tsx": [
+ "TypeScript"
+ ],
+ "css": [
+ "CSS"
+ ],
+ "scss": [
+ "SASS"
+ ],
+ "txt": [
+ "Text"
+ ],
+ "php": [
+ "PHP"
+ ],
+ "php3": [
+ "PHP"
+ ],
+ "php4": [
+ "PHP"
+ ],
+ "ph3": [
+ "PHP"
+ ],
+ "ph4": [
+ "PHP"
+ ],
+ "xml": [
+ "XML"
+ ],
+ "py": [
+ "Python"
+ ],
+ "pyc": [
+ "Python"
+ ],
+ "pyd": [
+ "Python"
+ ],
+ "pyo": [
+ "Python"
+ ],
+ "pyw": [
+ "Python"
+ ],
+ "pyz": [
+ "Python"
+ ],
+ "java": [
+ "Java"
+ ],
+ "class": [
+ "Java"
+ ],
+ "jar": [
+ "Java"
+ ],
+ "c": [
+ "c",
+ "objective c",
+ "objective-c"
+ ],
+ "m": [
+ "objective c",
+ "objective-c"
+ ],
+ "mm": [
+ "objective c",
+ "objective-c"
+ ],
+ "cpp": [
+ "cpp",
+ "c plus plus",
+ "c",
+ "c++"
+ ],
+ "cc": [
+ "cpp",
+ "c plus plus",
+ "c",
+ "c++"
+ ],
+ "cxx": [
+ "cpp",
+ "c plus plus",
+ "c++"
+ ],
+ "hh": [
+ "cpp",
+ "c plus plus",
+ "c++"
+ ],
+ "hpp": [
+ "cpp",
+ "c++"
+ ],
+ "h": [
+ "cpp",
+ "c plus plus",
+ "c++",
+ "c",
+ "objective c",
+ "objective-c"
+ ],
+ "sql": [
+ "sql"
+ ],
+ "sh": [
+ "bash"
+ ],
+ "bash": [
+ "bash"
+ ],
+ "zsh": [
+ "bash",
+ "zshell"
+ ],
+ "cs": [
+ "c#",
+ "csharp"
+ ],
+ "csproj": [
+ "c#",
+ "csharp"
+ ],
+ "sln": [
+ "c#",
+ "csharp"
+ ],
+ "go": [
+ "go"
+ ],
+ "sty": [
+ "latex"
+ ],
+ "tex": [
+ "latex"
+ ],
+ "ps": [
+ "powershell"
+ ],
+ "ps1": [
+ "powershell"
+ ],
+ "rs": [
+ "rust"
+ ],
+ "rslib": [
+ "rust"
+ ],
+ "hs": [
+ "haskell"
+ ],
+ "lhs": [
+ "haskell"
+ ],
+ "scm": [
+ "scheme"
+ ],
+ "ss": [
+ "scheme"
+ ],
+ "clj": [
+ "clojure"
+ ],
+ "cljs": [
+ "clojure"
+ ],
+ "cljc": [
+ "clojure"
+ ],
+ "edn": [
+ "clojure"
+ ],
+ "erl": [
+ "erlang"
+ ],
+ "hrl": [
+ "erlang"
+ ],
+ "scala": [
+ "scala"
+ ],
+ "sc": [
+ "scala"
+ ],
+ "pl": [
+ "perl"
+ ],
+ "pm": [
+ "perl"
+ ],
+ "t": [
+ "perl"
+ ],
+ "pod": [
+ "perl"
+ ],
+ "groovy": [
+ "groovy"
+ ],
+ "swift": [
+ "swift"
+ ],
+ "rb": [
+ "ruby"
+ ],
+ "rbw": [
+ "ruby"
+ ],
+ "jl": [
+ "julia"
+ ],
+ "f": [
+ "fortran"
+ ],
+ "for": [
+ "fortran"
+ ],
+ "f90": [
+ "fortran"
+ ],
+ "f95": [
+ "fortran"
+ ],
+ "coffee": [
+ "CoffeeScript"
+ ],
+ "litcoffee": [
+ "CoffeeScript"
+ ],
+ "yaml": [
+ "yaml"
+ ],
+ "yml": [
+ "yaml"
+ ],
+ "dart": [
+ "dart"
+ ],
+ "json": [
+ "json"
+ ]
+ },
+ "extensionAllowedBadgeProviders": [
+ "api.bintray.com",
+ "api.travis-ci.com",
+ "api.travis-ci.org",
+ "app.fossa.io",
+ "badge.buildkite.com",
+ "badge.fury.io",
+ "badge.waffle.io",
+ "badgen.net",
+ "badges.frapsoft.com",
+ "badges.gitter.im",
+ "badges.greenkeeper.io",
+ "cdn.travis-ci.com",
+ "cdn.travis-ci.org",
+ "ci.appveyor.com",
+ "circleci.com",
+ "cla.opensource.microsoft.com",
+ "codacy.com",
+ "codeclimate.com",
+ "codecov.io",
+ "coveralls.io",
+ "david-dm.org",
+ "deepscan.io",
+ "dev.azure.com",
+ "docs.rs",
+ "flat.badgen.net",
+ "gemnasium.com",
+ "githost.io",
+ "gitlab.com",
+ "godoc.org",
+ "goreportcard.com",
+ "img.shields.io",
+ "isitmaintained.com",
+ "marketplace.visualstudio.com",
+ "nodesecurity.io",
+ "opencollective.com",
+ "snyk.io",
+ "travis-ci.com",
+ "travis-ci.org",
+ "visualstudio.com",
+ "vsmarketplacebadge.apphb.com",
+ "www.bithound.io",
+ "www.versioneye.com"
+ ],
+ "extensionAllowedBadgeProvidersRegex": [
+ "^https:\\/\\/github\\.com\\/[^/]+\\/[^/]+\\/(actions\\/)?workflows\\/.*badge\\.svg"
+ ],
+ "extensionKind": {
+ "Shan.code-settings-sync": [
+ "ui"
+ ],
+ "shalldie.background": [
+ "ui"
+ ],
+ "techer.open-in-browser": [
+ "ui"
+ ],
+ "CoenraadS.bracket-pair-colorizer-2": [
+ "ui"
+ ],
+ "CoenraadS.bracket-pair-colorizer": [
+ "ui",
+ "workspace"
+ ],
+ "hiro-sun.vscode-emacs": [
+ "ui",
+ "workspace"
+ ],
+ "hnw.vscode-auto-open-markdown-preview": [
+ "ui",
+ "workspace"
+ ],
+ "wayou.vscode-todo-highlight": [
+ "ui",
+ "workspace"
+ ],
+ "aaron-bond.better-comments": [
+ "ui",
+ "workspace"
+ ],
+ "vscodevim.vim": [
+ "ui"
+ ],
+ "ollyhayes.colmak-vim": [
+ "ui"
+ ]
+ },
+ "extensionPointExtensionKind": {
+ "typescriptServerPlugins": [
+ "workspace"
+ ]
+ },
"builtInExtensions": [
{
"name": "ms-vscode.js-debug-companion",
@@ -83,64 +1153,17 @@
}
}
],
- "defaultChatAgent": {
- "extensionId": "GitHub.copilot",
- "chatExtensionId": "GitHub.copilot-chat",
- "documentationUrl": "https://aka.ms/github-copilot-overview",
- "termsStatementUrl": "https://aka.ms/github-copilot-terms-statement",
- "privacyStatementUrl": "https://aka.ms/github-copilot-privacy-statement",
- "skusDocumentationUrl": "https://aka.ms/github-copilot-plans",
- "publicCodeMatchesUrl": "https://aka.ms/github-copilot-match-public-code",
- "manageSettingsUrl": "https://aka.ms/github-copilot-settings",
- "managePlanUrl": "https://aka.ms/github-copilot-manage-plan",
- "manageOverageUrl": "https://aka.ms/github-copilot-manage-overage",
- "upgradePlanUrl": "https://aka.ms/github-copilot-upgrade-plan",
- "signUpUrl": "https://aka.ms/github-sign-up",
- "provider": {
- "default": {
- "id": "github",
- "name": "GitHub"
- },
- "enterprise": {
- "id": "github-enterprise",
- "name": "GHE.com"
- },
- "google": {
- "id": "google",
- "name": "Google"
- },
- "apple": {
- "id": "apple",
- "name": "Apple"
- }
- },
- "providerUriSetting": "github-enterprise.uri",
- "providerScopes": [
- [
- "user:email"
- ],
- [
- "read:user"
- ],
- [
- "read:user",
- "user:email",
- "repo",
- "workflow"
- ]
- ],
- "entitlementUrl": "https://api.github.com/copilot_internal/user",
- "entitlementSignupLimitedUrl": "https://api.github.com/copilot_internal/subscribe_limited_user",
- "chatQuotaExceededContext": "github.copilot.chat.quotaExceeded",
- "completionsQuotaExceededContext": "github.copilot.completions.quotaExceeded",
- "walkthroughCommand": "github.copilot.open.walkthrough",
- "completionsMenuCommand": "github.copilot.toggleStatusMenu",
- "completionsRefreshTokenCommand": "github.copilot.signIn",
- "chatRefreshTokenCommand": "github.copilot.refreshToken",
- "generateCommitMessageCommand": "github.copilot.git.generateCommitMessage",
- "resolveMergeConflictsCommand": "github.copilot.git.resolveMergeConflicts",
- "completionsAdvancedSetting": "github.copilot.advanced",
- "completionsEnablementSetting": "github.copilot.enable",
- "nextEditSuggestionsSetting": "github.copilot.nextEditSuggestions.enabled"
- }
+ "extensionsGallery": {
+ "serviceUrl": "https://open-vsx.org/vscode/gallery",
+ "itemUrl": "https://open-vsx.org/vscode/item",
+ "resourceUrlTemplate": "https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}",
+ "extensionUrlTemplate": "https://open-vsx.org/vscode/gallery/{publisher}/{name}/latest",
+ "controlUrl": "",
+ "recommendationsUrl": "",
+ "nlsBaseUrl": "",
+ "publisherUrl": ""
+ },
+ "linkProtectionTrustedDomains": [
+ "https://open-vsx.org"
+ ]
}
diff --git a/scripts/sync-helper.js b/scripts/sync-helper.js
new file mode 100644
index 0000000000000..9f49f8dfa1575
--- /dev/null
+++ b/scripts/sync-helper.js
@@ -0,0 +1,221 @@
+/* eslint-disable header/header */
+
+const path = require('path');
+const fs = require('fs');
+const https = require('https');
+
+const pickKeys = [
+ 'extensionTips',
+ 'extensionImportantTips',
+ 'keymapExtensionTips',
+ 'configBasedExtensionTips',
+ 'extensionKeywords',
+ 'extensionAllowedBadgeProviders',
+ 'extensionAllowedBadgeProvidersRegex',
+ 'extensionAllowedProposedApi',
+ 'extensionEnabledApiProposals',
+ 'extensionKind',
+ 'languageExtensionTips'
+];
+
+const AllowMissKeys = [
+ 'win32SetupExeBasename',
+ 'darwinCredits',
+ 'darwinExecutable',
+ 'downloadUrl',
+ 'updateUrl',
+ 'webEndpointUrl',
+ 'webEndpointUrlTemplate',
+ 'quality',
+ 'exeBasedExtensionTips',
+ 'webExtensionTips',
+ 'remoteExtensionTips',
+ 'crashReporter',
+ 'appCenter',
+ 'enableTelemetry',
+ 'aiConfig',
+ 'msftInternalDomains',
+ 'sendASmile',
+ 'documentationUrl',
+ 'releaseNotesUrl',
+ 'keyboardShortcutsUrlMac',
+ 'keyboardShortcutsUrlLinux',
+ 'keyboardShortcutsUrlWin',
+ 'introductoryVideosUrl',
+ 'tipsAndTricksUrl',
+ 'newsletterSignupUrl',
+ 'twitterUrl',
+ 'requestFeatureUrl',
+ 'reportMarketplaceIssueUrl',
+ 'privacyStatementUrl',
+ 'showTelemetryOptOut',
+ 'npsSurveyUrl',
+ 'cesSurveyUrl',
+ 'checksumFailMoreInfoUrl',
+ 'electronRepository',
+ 'settingsSearchUrl',
+ 'surveys',
+ 'tasConfig',
+ 'experimentsUrl',
+ 'extensionSyncedKeys',
+ 'extensionVirtualWorkspacesSupport',
+ 'auth',
+ 'configurationSync.store',
+ 'commit',
+ 'date',
+ 'checksums',
+ 'settingsSearchBuildId',
+ 'darwinUniversalAssetId',
+];
+
+const propiertaryExtension = [
+ 'ms-vscode-remote.remote-containers',
+ 'ms-dotnettools.csharp',
+ 'ms-vscode.cpptools-extension-pack',
+ 'ms-azure-devops.azure-pipelines',
+ 'msazurermtools.azurerm-vscode-tools',
+ 'ms-azuretools.vscode-bicep',
+ 'usqlextpublisher.usql-vscode-ext',
+ 'ms-azuretools.vscode-azureterraform',
+ 'VisualStudioExptTeam.vscodeintellicode-completions',
+ 'ms-vsliveshare.vsliveshare',
+ 'ms-toolsai.vscode-ai-remote',
+ 'GitHub.codespaces',
+ 'ms-vscode.azure-repos',
+ 'ms-vscode.remote-repositories',
+ 'ms-vscode-remote.remote-wsl',
+ 'ms-vscode-remote.remote-ssh',
+ 'ms-vscode.remote-server',
+ 'GitHub.copilot',
+ 'GitHub.copilot-nightly',
+ 'GitHub.remotehub',
+ 'GitHub.remotehub-insiders',
+ 'ms-python.vscode-pylance',
+ 'ms-vscode.azure-sphere-tools-ui',
+ 'ms-azuretools.vscode-azureappservice',
+];
+
+const openvsxExtensionMap = {
+ 'ms-dotnettools.csharp': 'muhammad-sammy.csharp'
+};
+
+function filterObj(obj, predicate) {
+ const result = Object.create(null);
+ for (const [key, value] of Object.entries(obj)) {
+ if (predicate(key, value)) {
+ result[key] = value;
+ }
+ }
+ return result;
+}
+
+function renameObjKey(obj, predicate) {
+ const result = Object.create(null);
+ for (const [key, value] of Object.entries(obj)) {
+ const newKey = predicate(key, value) ?? key;
+ result[newKey] = value;
+ }
+ return result;
+}
+
+async function start() {
+ const localPath = path.join(__dirname, '../product.json');
+ const releasePath = path.join(__dirname, '../product-release.json');
+ if (!fs.existsSync(releasePath)) {
+ console.error('product-release.json is not exists, please copy product.json from VSCode Desktop Stable');
+ return;
+ }
+
+ const branchProduct = JSON.parse(await fs.promises.readFile(localPath, { encoding: 'utf8' }));
+ const releaseProduct = JSON.parse(await fs.promises.readFile(releasePath, { encoding: 'utf8' }));
+ const tmpProductPath = path.join(__dirname, '../product-tmp.json');
+ for (let key of pickKeys) {
+ let newValue = releaseProduct[key];
+ if (Array.isArray(newValue) && newValue.length && typeof newValue[0] === 'string') {
+ newValue = newValue.map(v => openvsxExtensionMap[v] ?? v).filter(v => !propiertaryExtension.includes(v));
+ } else if (typeof newValue === 'object' && newValue !== null) {
+ newValue = renameObjKey(newValue, k => openvsxExtensionMap[k] ?? k);
+ newValue = filterObj(newValue, k => !propiertaryExtension.includes(k));
+ }
+ branchProduct[key] = newValue;
+ }
+
+ await fs.promises.writeFile(tmpProductPath, JSON.stringify(branchProduct, null, '\t'));
+
+ if (keysDiff(branchProduct, releaseProduct)) {
+ // allow-any-unicode-next-line
+ console.log('📦 check if you need these keys or not');
+ }
+ await checkProductExtensions(branchProduct);
+ // allow-any-unicode-next-line
+ console.log('📦 you can copy product-tmp.json file to product.json file and resolve logs above by yourself');
+ // allow-any-unicode-next-line
+ console.log('✅ done');
+}
+
+function keysDiff(branch, release) {
+ const toMap = (ret, e) => {
+ ret[e] = true;
+ return ret;
+ };
+ const map1 = Object.keys(branch).reduce(toMap, {});
+ const map2 = Object.keys(release).reduce(toMap, {});
+ let changed = false;
+ for (let key in branch) {
+ if (!!!map2[key]) {
+ changed = true;
+ // allow-any-unicode-next-line
+ console.log(`🟠 Remove key: ${key}`);
+ }
+ }
+ for (let key in release) {
+ if (!!!map1[key] && !AllowMissKeys.includes(key)) {
+ changed = true;
+ // allow-any-unicode-next-line
+ console.log(`🟠 Add key: ${key}`);
+ }
+ }
+ return changed;
+}
+
+async function checkProductExtensions(product) {
+ const uniqueExtIds = new Set();
+ // Allow extension that downloaded from ms marketplace by users to use proposed api
+ // uniqueExtIds.push(...product.extensionAllowedProposedApi);
+
+ // Check recommand extension tips
+ for (let key in product.configBasedExtensionTips) {
+ Object.keys(product.configBasedExtensionTips[key].recommendations ?? {}).forEach(id => uniqueExtIds.add(id));
+ }
+ Object.keys(product.extensionImportantTips).forEach(id => uniqueExtIds.add(id));
+ Object.keys(product.extensionTips).forEach(id => uniqueExtIds.add(id));
+ Object.keys(product.extensionEnabledApiProposals).forEach(id => uniqueExtIds.add(id));
+ product.keymapExtensionTips.forEach(id => uniqueExtIds.add(id));
+ product.languageExtensionTips.forEach(id => uniqueExtIds.add(id));
+
+ // Check if extensions exists in openvsx
+ for (let id of uniqueExtIds) {
+ if (propiertaryExtension.includes(id)) {
+ continue;
+ }
+
+ const openvsxUrl = `https://open-vsx.org/api/${id.replace(/\./g, '/')}`;
+ const ok = await urlExists(openvsxUrl);
+ if (!ok) {
+ // allow-any-unicode-next-line
+ console.error(`🔴 Extension not exists: ${id}`);
+ }
+ }
+}
+
+async function urlExists(url) {
+ return new Promise((resolve, reject) => {
+ https.get(url, res => {
+ resolve(res.statusCode === 200);
+ }).on('error', error => {
+ reject(error);
+ });
+ });
+}
+
+start().catch(console.error);
diff --git a/scripts/sync-with-upstream.sh b/scripts/sync-with-upstream.sh
new file mode 100755
index 0000000000000..4f0fe912064c0
--- /dev/null
+++ b/scripts/sync-with-upstream.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+echo "Syncing openvscode-server with upstream"
+
+upstream_url="https://github.com/microsoft/vscode.git"
+upstream_branch=${1:-"upstream/main"}
+local_branch=${2:-"main"}
+base_commit_msg=${3:-"code web server initial commit"}
+only_sync=${4:-"true"}
+
+exit_script() {
+ reason=$1
+ echo "Update script ended unsucessfully"
+ echo "Reason: $reason"
+ exit 1
+}
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+ realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+ ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+ ROOT=$(dirname $(dirname $(readlink -f $0)))
+ # --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm
+ # partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
+ LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader"
+fi
+
+# Checks is there's an upstream remote repository and if not
+# set it to $upstream_url
+check_upstream() {
+ git remote -v | grep --quiet upstream
+ if [[ $? -ne 0 ]]; then
+ echo "Upstream repository not configured"
+ echo "Setting upstream URL to ${upstream_url}"
+ git remote add upstream $upstream_url
+ fi
+}
+
+# Gets the base commit
+get_base_commit() {
+ local base_commit=$(git log --pretty="%H" --max-count=1 --grep "$base_commit_msg")
+ if [[ -z $base_commit ]]; then
+ exit_script "Could not find base commit"
+ fi
+ echo $base_commit
+}
+
+# Fetch updates from upstream and rebase
+sync() {
+ echo "Shallow fetching upstream..."
+ git fetch upstream
+ git checkout $local_branch
+ echo "Rebasing $local_branch branch onto $upstream_branch from upstream"
+ git rebase --onto=$upstream_branch $(get_base_commit)~ $local_branch
+ if [[ $? -ne 0 ]]; then
+ echo "There are merge conflicts doing the rebase."
+ echo "Please resolve them or abort the rebase."
+ exit_script "Could not rebase succesfully"
+ fi
+ echo "$local_branch sucessfully updated"
+}
+
+cd $ROOT
+
+# Sync
+check_upstream
+sync
+
+if [[ "$only_sync" == "true" ]]; then
+ exit 0
+fi
+
+# Clean and build
+# git clean -dfx
+yarn && yarn server:init
+if [[ $? -ne 0 ]]; then
+ exit_script "There are some errors during compilation"
+fi
+
+# Configuration
+export NODE_ENV=development
+export VSCODE_DEV=1
+export VSCODE_CLI=1
+
+# Run smoke tests
+yarn smoketest --web --headless --verbose --electronArgs=$LINUX_EXTRA_ARGS
+if [[ $? -ne 0 ]]; then
+ exit_script "Some smoke test are failing"
+fi
diff --git a/src/server-main.ts b/src/server-main.ts
index a589510cfc8a0..76a2a52ec0eb8 100644
--- a/src/server-main.ts
+++ b/src/server-main.ts
@@ -186,7 +186,7 @@ async function parsePort(host: string | undefined, strPort: string | undefined):
process.exit(1);
}
}
- return 8000;
+ return 3000;
}
function parseRange(strRange: string): { start: number; end: number } | undefined {
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index f2abf379f08ca..940dffdc52ed6 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -602,10 +602,14 @@ function readCookie(name: string): string | undefined {
if (!configElement || !configElementAttribute) {
throw new Error('Missing web configuration element');
}
- const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = JSON.parse(configElementAttribute);
+ const originalConfig: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = JSON.parse(configElementAttribute);
const secretStorageKeyPath = readCookie('vscode-secret-key-path');
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
+ const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
+ ...originalConfig,
+ remoteAuthority: window.location.host,
+ };
// Create workbench
create(mainWindow.document.body, {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 0b2e32095b205..a5c459f7fd792 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -337,10 +337,19 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
}
}
+ private disableSignatureVerification() {
+ return true;
+ }
+
private async downloadExtension(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionSignatureVerificationCode | undefined }> {
if (verifySignature) {
const value = this.configurationService.getValue(VerifyExtensionSignatureConfigKey);
verifySignature = isBoolean(value) ? value : true;
+
+ if (this.disableSignatureVerification()) {
+ // Note: disable extension signature verification
+ verifySignature = false;
+ }
}
const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
const shouldRequireSignature = shouldRequireRepositorySignatureFor(extension.private, await this.extensionGalleryManifestService.getExtensionGalleryManifest());
diff --git a/src/vs/server/node/server.main.ts b/src/vs/server/node/server.main.ts
index 0d1a1ddd81014..a7b4cd1bf049e 100644
--- a/src/vs/server/node/server.main.ts
+++ b/src/vs/server/node/server.main.ts
@@ -37,14 +37,14 @@ const errorReporter: ErrorReporter = {
const args = parseArgs(process.argv.slice(2), serverOptions, errorReporter);
const REMOTE_DATA_FOLDER = args['server-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote');
-const USER_DATA_PATH = join(REMOTE_DATA_FOLDER, 'data');
+const USER_DATA_PATH = args['user-data-dir'] || join(REMOTE_DATA_FOLDER, 'data');
const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User');
const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage');
const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
-args['user-data-dir'] = USER_DATA_PATH;
const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
+args['user-data-dir'] = USER_DATA_PATH;
args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
diff --git a/src/vs/server/node/webClientServer.ts b/src/vs/server/node/webClientServer.ts
index 13882a9b44b0c..2b033da0f1c06 100644
--- a/src/vs/server/node/webClientServer.ts
+++ b/src/vs/server/node/webClientServer.ts
@@ -320,7 +320,7 @@ export class WebClientServer {
const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH);
const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH);
- const webExtensionRoute = posix.join(basePath, this._productPath, WEB_EXTENSION_PATH);
+ // const webExtensionRoute = posix.join(basePath, this._productPath, WEB_EXTENSION_PATH);
const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
@@ -333,15 +333,15 @@ export class WebClientServer {
} : undefined;
const productConfiguration: Partial