From dce1d6e172cc5f935b9732e7dee4b7a992529eda Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Fri, 14 Jun 2024 21:31:58 +0200 Subject: [PATCH 001/134] Update Code to 1.90.1 (#6840) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 89de5a8d4d62..611f9bfce64f 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 89de5a8d4d6205e5b11647eb6a74844ca23d2573 +Subproject commit 611f9bfce64f25108829dd295f54a6894e87339d From ed069310a485e22d87315a5d5ba0d960f747151b Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 17 Jun 2024 10:41:35 -0800 Subject: [PATCH 002/134] v4.90.2 --- CHANGELOG.md | 10 ++++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73961f68008a..4c0b9c2f03d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,16 @@ Code v99.99.999 ## Unreleased +## [4.90.2](https://github.com/coder/code-server/releases/tag/v4.90.2) - 2024-06-14 + +Code v1.90.1 + +### Changed + +- Updated to Code 1.90.1. + +## [4.90.1](https://github.com/coder/code-server/releases/tag/v4.90.1) - 2024-06-12 + Code v1.90.0 ### Fixed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 3f4687efa222..08c806b6afe2 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.20.0 +version: 3.21.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.89.1 +appVersion: 4.90.2 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index b4e6816258a4..87babfa70a70 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.89.1' + tag: '4.90.2' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From d449729e18ed7d6cb00d36d2edf4dc31357774a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:43:23 -0800 Subject: [PATCH 003/134] chore: bump braces from 3.0.2 to 3.0.3 in /test (#6844) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/yarn.lock b/test/yarn.lock index 8fdcafaa82be..483c17855b60 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -1198,11 +1198,11 @@ brace-expansion@^1.1.7: concat-map "0.0.1" braces@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" browser-process-hrtime@^1.0.0: version "1.0.0" @@ -1668,10 +1668,10 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" From c26ac35b25b09e9d58e6716f2aae41d8d1dfbb6c Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Fri, 21 Jun 2024 00:14:21 +0200 Subject: [PATCH 004/134] Update Code to 1.90.2 (#6853) --- lib/vscode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vscode b/lib/vscode index 611f9bfce64f..5437499feb04 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 611f9bfce64f25108829dd295f54a6894e87339d +Subproject commit 5437499feb04f7a586f677b155b039bc2b3669eb From d431c9cd9d52c318230668f67593aae30b53fdf2 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 21 Jun 2024 09:45:23 -0800 Subject: [PATCH 005/134] Fix log file path The first argument is a file name, not a path. When the log gets rotated it prepends the date which ends up creating a path in the current working directory. --- src/node/wrapper.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/node/wrapper.ts b/src/node/wrapper.ts index 4b84198f3724..607512e2c9fb 100644 --- a/src/node/wrapper.ts +++ b/src/node/wrapper.ts @@ -248,9 +248,10 @@ export class ParentProcess extends Process { const opts = { size: "10M", maxFiles: 10, + path: path.join(paths.data, "coder-logs"), } - this.logStdoutStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stdout.log"), opts) - this.logStderrStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stderr.log"), opts) + this.logStdoutStream = rfs.createStream("code-server-stdout.log", opts) + this.logStderrStream = rfs.createStream("code-server-stderr.log", opts) this.onDispose(() => this.disposeChild()) From 26c763485b9101fcae2ce56fc0903f0e2d48abe3 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 21 Jun 2024 09:51:50 -0800 Subject: [PATCH 006/134] Update JSON parse error matcher Looks like this text changed? --- test/unit/node/settings.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/node/settings.test.ts b/test/unit/node/settings.test.ts index 68bf51784fbd..59c6f46a50bc 100644 --- a/test/unit/node/settings.test.ts +++ b/test/unit/node/settings.test.ts @@ -29,7 +29,7 @@ describe("settings", () => { const settings = new SettingsProvider(pathToMockSettingsFile) await settings.read() // This happens when we can't parse a JSON (usually error in file) - expect(logger.warn).toHaveBeenCalledWith("Unexpected token t in JSON at position 29") + expect(logger.warn).toHaveBeenCalledWith(expect.stringMatching(/Unexpected token/)) }) }) describe("with invalid settings file path", () => { From c7d88abf9f57d0576f913b9365532f0e2b885c0c Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 21 Jun 2024 11:01:16 -0800 Subject: [PATCH 007/134] v4.90.3 --- CHANGELOG.md | 15 +++++++++++++++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c0b9c2f03d8..09e90fa09d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,21 @@ Code v99.99.999 ## Unreleased +## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21 + +Code v1.90.2 + +### Changed + +- Updated to Code 1.90.2. + +### Fixed + +- When the log gets rotated it will no longer incorrectly be moved to a new + directory created in the current working directory named with a date. + Instead, the file itself is prepended with the date and kept in the same + directory, as originally intended. + ## [4.90.2](https://github.com/coder/code-server/releases/tag/v4.90.2) - 2024-06-14 Code v1.90.1 diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 08c806b6afe2..97ca8d81741f 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.21.0 +version: 3.21.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.90.2 +appVersion: 4.90.3 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 87babfa70a70..0e899556b800 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.90.2' + tag: '4.90.3' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 603e467f3815999b0a26600222c399b325593faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:27:36 -0800 Subject: [PATCH 008/134] chore: bump ws from 8.17.0 to 8.17.1 (#6851) Bumps [ws](https://github.com/websockets/ws) from 8.17.0 to 8.17.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.17.0...8.17.1) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 031a54774f90..dc5f202d862e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3664,9 +3664,9 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.14.2: - version "8.17.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" - integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== xdg-basedir@^4.0.0: version "4.0.0" From 93f31e6a74a43e39bd45fb4477dbda54f8c440d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:27:58 -0800 Subject: [PATCH 009/134] chore: bump ws from 7.5.6 to 7.5.10 in /test (#6845) Bumps [ws](https://github.com/websockets/ws) from 7.5.6 to 7.5.10. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.5.6...7.5.10) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/yarn.lock b/test/yarn.lock index 483c17855b60..8644bd54d75a 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -3544,9 +3544,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.6: - version "7.5.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" - integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== + version "7.5.10" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" + integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== wtfnode@^0.9.1: version "0.9.1" From 250281d0717753147470243b1d582690d0dfa9eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:28:34 -0800 Subject: [PATCH 010/134] chore: bump braces from 3.0.2 to 3.0.3 (#6843) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index dc5f202d862e..3433ec6c879a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -743,11 +743,11 @@ brace-expansion@^2.0.1: balanced-match "^1.0.0" braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -1551,10 +1551,10 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" From 6514ba4bf3e094f92d0fc0898693c80b3759a3a6 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 3 Jul 2024 13:30:33 -0800 Subject: [PATCH 011/134] Update contributing docs --- docs/CONTRIBUTING.md | 135 +++++++++++++++---------------- docs/MAINTAINING.md | 185 ++++++++++--------------------------------- 2 files changed, 103 insertions(+), 217 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 79da7cbca49b..5f1e010ac35f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -5,8 +5,6 @@ - [Requirements](#requirements) - [Linux-specific requirements](#linux-specific-requirements) -- [Creating pull requests](#creating-pull-requests) - - [Commits and commit history](#commits-and-commit-history) - [Development workflow](#development-workflow) - [Version updates to Code](#version-updates-to-code) - [Patching Code](#patching-code) @@ -28,13 +26,10 @@ -- [Detailed CI and build process docs](../ci) - ## Requirements The prerequisites for contributing to code-server are almost the same as those -for [VS -Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). +for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). Here is what is needed: - `node` v20.x @@ -60,30 +55,15 @@ Here is what is needed: ### Linux-specific requirements -If you're developing code-server on Linux, make sure you have installed or install the following dependencies: +If you're developing code-server on Linux, make sure you have installed or +install the following dependencies: ```shell sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3 ``` -These are required by Code. See [their Wiki](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites) for more information. - -## Creating pull requests - -Please create a [GitHub Issue](https://github.com/coder/code-server/issues) that -includes context for issues that you see. You can skip this if the proposed fix -is minor. - -In your pull requests (PR), link to the issue that the PR solves. - -Please ensure that the base of your PR is the **main** branch. - -### Commits and commit history - -We prefer a clean commit history. This means you should squash all fixups and -fixup-type commits before asking for a review (e.g., clean up, squash, then force -push). If you need help with this, feel free to leave a comment in your PR, and -we'll guide you. +These are required by Code. See [their Wiki](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites) +for more information. ## Development workflow @@ -99,55 +79,62 @@ need to apply them with `quilt`. If you pull down changes that update the `vscode` submodule you will need to run `git submodule update --init` and re-apply the patches. -### Version updates to Code +When you make a change that affects people deploying the marketplace please +update the changelog as part of your PR. -1. Update the `lib/vscode` submodule to the desired upstream version branch. - 1. `cd lib/vscode && git checkout release/1.66 && cd ../..` - 2. `git add lib && git commit -m "chore: update Code"` -2. Apply the patches (`quilt push -a`) or restore your stashed changes. At this - stage you may need to resolve conflicts. For example use `quilt push -f`, - manually apply the rejected portions, then `quilt refresh`. -3. From the code-server **project root**, run `yarn install`. -4. Test code-server locally to make sure everything works. -5. Check the Node.js version that's used by Electron (which is shipped with VS - Code. If necessary, update your version of Node.js to match. -6. Commit the updated submodule and patches to `code-server`. -7. Open a PR. +Note that building code-server takes a very, very long time, and loading it in +the browser in development mode also takes a very, very long time. -Tip: if you're certain all patches are applied correctly and you simply need to -refresh, you can use this trick: +Display language (Spanish, etc) support only works in a full build; it will not +work in development mode. -```shell -while quilt push; do quilt refresh; done -``` +Generally we prefer that PRs be squashed into `main` but you can rebase or merge +if it is important to keep the individual commits (make sure to clean up the +commits first if you are doing this). + +### Version updates to Code -[Source](https://raphaelhertzog.com/2012/08/08/how-to-use-quilt-to-manage-patches-in-debian-packages/) +1. Remove any patches with `quilt pop -a`. +2. Update the `lib/vscode` submodule to the desired upstream version branch. + 1. `cd lib/vscode && git checkout release/1.66 && cd ../..` + 2. `git add lib && git commit -m "chore: update to Code "` +3. Apply the patches one at a time (`quilt push`). If the application succeeds + but the lines changed, update the patch with `quilt refresh`. If there are + conflicts, then force apply with `quilt push -f`, manually add back the + rejected code, then run `quilt refresh`. +4. From the code-server **project root**, run `yarn install`. +5. Check the Node.js version that's used by Electron (which is shipped with VS + Code. If necessary, update our version of Node.js to match. ### Patching Code -0. You can go through the patch stack with `quilt push` and `quilt pop`. -1. Create a new patch (`quilt new {name}.diff`) or use an existing patch. -1. Add the file(s) you are patching (`quilt add [-P patch] {file}`). A file +1. You can go through the patch stack with `quilt push` and `quilt pop`. +2. Create a new patch (`quilt new {name}.diff`) or use an existing patch. +3. Add the file(s) you are patching (`quilt add [-P patch] {file}`). A file **must** be added before you make changes to it. -1. Make your changes. Patches do not need to be independent of each other but +4. Make your changes. Patches do not need to be independent of each other but each patch must result in a working code-server without any broken in-between states otherwise they are difficult to test and modify. -1. Add your changes to the patch (`quilt refresh`) -1. Add a comment in the patch about the reason for the patch and how to +5. Add your changes to the patch (`quilt refresh`) +6. Add a comment in the patch about the reason for the patch and how to reproduce the behavior it fixes or adds. Every patch should have an e2e test as well. ### Build -You can build as follows: +You can build a full production as follows: ```shell +git submodule update --init +quilt push -a +yarn install yarn build -yarn build:vscode +VERSION=0.0.0 yarn build:vscode yarn release ``` -_NOTE: this does not keep `node_modules`. If you want them to be kept, use `KEEP_MODULES=1 yarn release` (if you're testing in Coder, you'll want to do this)_ +This does not keep `node_modules`. If you want them to be kept, use +`KEEP_MODULES=1 yarn release` Run your build: @@ -158,7 +145,7 @@ npm install --omit=dev # Skip if you used KEEP_MODULES=1 node . ``` -Build the release packages (make sure that you run `yarn release` first): +Then, to build the release package: ```shell yarn release:standalone @@ -167,7 +154,7 @@ yarn package ``` > On Linux, the currently running distro will become the minimum supported -> version. In our GitHub Actions CI, we use CentOS 7 for maximum compatibility. +> version. In our GitHub Actions CI, we use CentOS 8 for maximum compatibility. > If you need your builds to support older distros, run the build commands > inside a Docker container with all the build requirements installed. @@ -181,9 +168,9 @@ writing, we do this for the following platforms/architectures: - Linux arm7l (.tar.gz) - Linux armhf.deb - Linux armhf.rpm -- macOS amd64 (Intel-based) +- macOS arm64.tar.gz -Currently, these are compiled in CI using the `yarn release-standalone` command +Currently, these are compiled in CI using the `yarn release:standalone` command in the `release.yaml` workflow. We then upload them to the draft release and distribute via GitHub Releases. @@ -191,17 +178,22 @@ distribute via GitHub Releases. #### I see "Forbidden access" when I load code-server in the browser -This means your patches didn't apply correctly. We have a patch to remove the auth from vanilla Code because we use our own. +This means your patches didn't apply correctly. We have a patch to remove the +auth from vanilla Code because we use our own. -Try popping off the patches with `quilt pop -a` and reapplying with `quilt push -a`. +Try popping off the patches with `quilt pop -a` and reapplying with `quilt push +-a`. #### "Can only have one anonymous define call per script" -Code might be trying to use a dev or prod HTML in the wrong context. You can try re-running code-server and setting `VSCODE_DEV=1`. +Code might be trying to use a dev or prod HTML in the wrong context. You can try +re-running code-server and setting `VSCODE_DEV=1`. ### Help -If you get stuck or need help, you can always start a new GitHub Discussion [here](https://github.com/coder/code-server/discussions). One of the maintainers will respond and help you out. +If you get stuck or need help, you can always start a new GitHub Discussion +[here](https://github.com/coder/code-server/discussions). One of the maintainers +will respond and help you out. ## Test @@ -219,7 +211,9 @@ Our unit tests are written in TypeScript and run using These live under [test/unit](../test/unit). -We use unit tests for functions and things that can be tested in isolation. The file structure is modeled closely after `/src` so it's easy for people to know where test files should live. +We use unit tests for functions and things that can be tested in isolation. The +file structure is modeled closely after `/src` so it's easy for people to know +where test files should live. ### Script tests @@ -227,12 +221,14 @@ Our script tests are written in bash and run using [bats](https://github.com/bat These tests live under `test/scripts`. -We use these to test anything related to our scripts (most of which live under `ci`). +We use these to test anything related to our scripts (most of which live under +`ci`). ### Integration tests -These are a work in progress. We build code-server and run tests with `yarn test:integration`, which ensures that code-server builds work on their respective -platforms. +These are a work in progress. We build code-server and run tests with `yarn +test:integration`, which ensures that code-server builds work on their +respective platforms. Our integration tests look at components that rely on one another. For example, testing the CLI requires us to build and package code-server. @@ -253,15 +249,10 @@ Take a look at `codeServer.test.ts` to see how you would use it (see We also have a model where you can create helpers to use within tests. See [models/CodeServer.ts](../test/e2e/models/CodeServer.ts) for an example. -Generally speaking, e2e means testing code-server while running in the browser -and interacting with it in a way that's similar to how a user would interact -with it. When running these tests with `yarn test:e2e`, you must have -code-server running locally. In CI, this is taken care of for you. - ## Structure -The `code-server` script serves as an HTTP API for login and starting a remote -Code process. +code-server essentially serves as an HTTP API for logging in and starting a +remote Code process. The CLI code is in [src/node](../src/node) and the HTTP routes are implemented in [src/node/routes](../src/node/routes). diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index cabe7869672c..2cfd945a8640 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -3,24 +3,13 @@ # Maintaining -- [Team](#team) - - [Onboarding](#onboarding) - - [Offboarding](#offboarding) -- [Workflow](#workflow) - - [Milestones](#milestones) - - [Triage](#triage) -- [Versioning](#versioning) -- [Pull requests](#pull-requests) - - [Merge strategies](#merge-strategies) - - [Changelog](#changelog) -- [Releases](#releases) - - [Publishing a release](#publishing-a-release) +- [Releasing](#releasing) - [Release Candidates](#release-candidates) - [AUR](#aur) - [Docker](#docker) - [Homebrew](#homebrew) + - [nixpkgs](#nixpkgs) - [npm](#npm) -- [Syncing with upstream Code](#syncing-with-upstream-code) - [Testing](#testing) - [Documentation](#documentation) - [Troubleshooting](#troubleshooting) @@ -28,131 +17,30 @@ -This document is meant to serve current and future maintainers of code-server, -as well as share our workflow for maintaining the project. +We keep code-server up to date with VS Code releases (there are usually two or +three a month) but we are not generally actively developing code-server aside +from fixing regressions. -## Team +Most of the work is keeping on top of issues and discussions. -Current maintainers: +## Releasing -- @code-asher -- @jsjoeio - -Occasionally, other Coder employees may step in time to time to assist with code-server. - -### Onboarding - -To onboard a new maintainer to the project, please make sure to do the following: - -- [ ] Add to [coder/code-server](https://github.com/orgs/coder/teams/code-server) -- [ ] Add as Admin under [Repository Settings > Access](https://github.com/coder/code-server/settings/access) -- [ ] Add to [npm Coder org](https://www.npmjs.com/org/coder) -- [ ] Add as [AUR maintainer](https://aur.archlinux.org/packages/code-server/) (talk to Colin) -- [ ] Introduce to community via Discussion (see [example](https://github.com/coder/code-server/discussions/3955)) - -### Offboarding - -Very similar to Onboarding but Remove maintainer from all teams and revoke access. Please also do the following: - -- [ ] Write farewell post via Discussion (see [example](https://github.com/coder/code-server/discussions/3933)) - -## Workflow - -The workflow used by code-server maintainers aims to be easy to understood by -the community and easy enough for new maintainers to jump in and start -contributing on day one. - -### Milestones - -We operate mainly using -[milestones](https://github.com/coder/code-server/milestones). This was heavily -inspired by our friends over at [vscode](https://github.com/microsoft/vscode). - -Here are the milestones we use and how we use them: - -- "Backlog" -> Work not yet planned for a specific release. -- "On Deck" -> Work under consideration for upcoming milestones. -- "Backlog Candidates" -> Work that is not yet accepted for the backlog. We wait - for the community to weigh in. -- "" -> Work to be done for said month. - -With this flow, any un-assigned issues are essentially in triage state. Once -triaged, issues are either "Backlog" or "Backlog Candidates". They will -eventually move to "On Deck" (or be closed). Lastly, they will end up on a -version milestone where they will be worked on. - -### Triage - -We use the following process for triaging GitHub issues: - -1. Create an issue -1. Add appropriate labels to the issue (including "needs-investigation" if we - should look into it further) -1. Add the issue to a milestone - 1. If it should be fixed soon, add to version milestone or "On Deck" - 2. If not urgent, add to "Backlog" - 3. Otherwise, add to "Backlog Candidate" for future consideration - -## Versioning - -`` - -The code-server project follows traditional [semantic -versioning](https://semver.org/), with the objective of minimizing major changes -that break backward compatibility. We increment the patch level for all -releases, except when the upstream Visual Studio Code project increments its -minor version or we change the plugin API in a backward-compatible manner. In -those cases, we increment the minor version rather than the patch level. - -## Pull requests - -Ideally, every PR should fix an issue. If it doesn't, make sure it's associated -with a version milestone. - -If a PR does fix an issue, don't add it to the version milestone. Otherwise, the -version milestone will have duplicate information: the issue and the PR fixing -the issue. - -### Merge strategies - -For most things, we recommend the **squash and merge** strategy. There -may be times where **creating a merge commit** makes sense as well. Use your -best judgment. If you're unsure, you can always discuss in the PR with the team. - -### Changelog - -To save time when creating a new release for code-server, we keep a running -changelog at `CHANGELOG.md`. - -If either the author or reviewer of a PR believes the change should be mentioned -in the changelog, then it should be added. - -If there is not a **Next Version** when you modify `CHANGELOG.md`, please add it -using the template you see near the top of the changelog. - -When writing your changelog item, ask yourself: - -1. How do these changes affect code-server users? -2. What actions do they need to take (if any)? - -If you need inspiration, we suggest looking at the [Emacs -changelog](https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS). - -## Releases - -### Publishing a release - -1. Go to GitHub Actions > Draft release > Run workflow on the commit you want to +1. Check that the changelog lists all the important changes. +2. Make sure the changelog entry lists the current version of VS Code. +3. Update the changelog with the release date. +4. Go to GitHub Actions > Draft release > Run workflow on the commit you want to release. Make sure CI has finished the build workflow on that commit or this - will fail. -2. CI will automatically grab the build artifact on that commit, inject the - version into the `package.json`, put together platform-specific packages, and - upload those packages to a draft release. -3. Summarize the major changes in the `CHANGELOG.md`. -4. Copy the relevant changelog section to the release then publish it. -5. CI will automatically publish the NPM package, Docker image, and update - Homebrew using the published release assets. -6. Bump the chart version in `Chart.yaml` and merge in the changelog updates. + will fail. For the version we match VS Code's minor and patch version. The + patch number may become temporarily out of sync if we need to put out a + patch, but if we make our own minor change then we will not release it until + the next minor VS Code release. +5. CI will automatically grab the build artifact on that commit (which is why CI + has to have completed), inject the provided version into the `package.json`, + put together platform-specific packages, and upload those packages to a draft + release. +6. Update the resulting draft release with the changelog contents. +7. Publish the draft release after validating it. +8. Bump the Helm chart version once the Docker images have published. #### Release Candidates @@ -186,37 +74,44 @@ This is currently automated with the release process (but may fail occasionally) brew bump-formula-pr --version="${VERSION}" code-server --no-browse --no-audit ``` +#### nixpkgs + +We publish code-server in nixpkgs but it must be updated manually. + #### npm We publish code-server as a npm package [here](https://www.npmjs.com/package/code-server/v/latest). This is currently automated with the release process. -## Syncing with upstream Code - -Refer to the [contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#version-updates-to-code) for information on how to update Code within code-server. - ## Testing Our testing structure is laid out under our [Contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#test). -We hope to eventually hit 100% test coverage with our unit tests, and maybe one day our scripts (coverage not tracked currently). - If you're ever looking to add more tests, here are a few ways to get started: -- run `yarn test:unit` and look at the coverage chart. You'll see all the uncovered lines. This is a good place to start. -- look at `test/scripts` to see which scripts are tested. We can always use more tests there. +- run `yarn test:unit` and look at the coverage chart. You'll see all the + uncovered lines. This is a good place to start. +- look at `test/scripts` to see which scripts are tested. We can always use more + tests there. - look at `test/e2e`. We can always use more end-to-end tests. -Otherwise, talk to a current maintainer and ask which part of the codebase is lacking most when it comes to tests. +Otherwise, talk to a current maintainer and ask which part of the codebase is +lacking most when it comes to tests. ## Documentation ### Troubleshooting -Our docs are hosted on [Vercel](https://vercel.com/). Vercel only shows logs in realtime, which means you need to have the logs open in one tab and reproduce your error in another tab. Since our logs are private to Coder the organization, you can only follow these steps if you're a Coder employee. Ask a maintainer for help if you need it. +Our docs are hosted on [Vercel](https://vercel.com/). Vercel only shows logs in +realtime, which means you need to have the logs open in one tab and reproduce +your error in another tab. Since our logs are private to Coder the organization, +you can only follow these steps if you're a Coder employee. Ask a maintainer for +help if you need it. -Taking a real scenario, let's say you wanted to troubleshoot [this docs change](https://github.com/coder/code-server/pull/4042). Here is how you would do it: +Taking a real scenario, let's say you wanted to troubleshoot [this docs +change](https://github.com/coder/code-server/pull/4042). Here is how you would +do it: 1. Go to https://vercel.com/codercom/codercom 2. Click "View Function Logs" From 090e0fad76152d6a0c10903a3bbf8a83d09e93d0 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 8 Jul 2024 22:10:34 +0000 Subject: [PATCH 012/134] Update to Code 1.91.0 (#6885) --- CHANGELOG.md | 8 ++++++++ lib/vscode | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 16 ++++++++-------- patches/getting-started.diff | 4 ++-- patches/proposed-api.diff | 2 +- patches/sourcemaps.diff | 8 ++++---- patches/store-socket.diff | 4 ++-- patches/webview.diff | 12 ++++++------ 9 files changed, 33 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e90fa09d34..17da5c769d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ Code v99.99.999 ## Unreleased +## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-08 + +Code v1.91.0 + +### Changed + +- Updated to Code 1.91.0. + ## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21 Code v1.90.2 diff --git a/lib/vscode b/lib/vscode index 5437499feb04..ea1445cc7016 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 5437499feb04f7a586f677b155b039bc2b3669eb +Subproject commit ea1445cc7016315d0f5728f8e8b12a45dc0a7286 diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index c251a49a2af7..d1f844868f5d 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -285,6 +285,10 @@ export class Extension implements IExten +@@ -287,6 +287,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable') { return false; } diff --git a/patches/display-language.diff b/patches/display-language.diff index c64efe8c592b..0a223c746201 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -348,17 +348,17 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -341,9 +341,6 @@ export class InstallAction extends Exten +@@ -411,9 +411,6 @@ export class InstallAction extends Exten if (this.extension.isBuiltin) { return; } - if (this.extensionsWorkbenchService.canSetLanguage(this.extension)) { - return; - } - if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) { - this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion; - this.updateLabel(); -@@ -614,7 +611,7 @@ export abstract class InstallInOtherServ + if (this.extension.state !== ExtensionState.Uninstalled) { + return; + } +@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ } if (isLanguagePackExtension(this.extension.local.manifest)) { @@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } // Prefers to run on UI -@@ -1848,17 +1845,6 @@ export class SetLanguageAction extends E +@@ -1928,17 +1925,6 @@ export class SetLanguageAction extends E update(): void { this.enabled = false; this.class = SetLanguageAction.DisabledClass; @@ -385,7 +385,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } override async run(): Promise { -@@ -1875,7 +1861,6 @@ export class ClearLanguageAction extends +@@ -1955,7 +1941,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`; constructor( @@ -393,7 +393,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -1885,17 +1870,6 @@ export class ClearLanguageAction extends +@@ -1965,17 +1950,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/getting-started.diff b/patches/getting-started.diff index cb9568ef90a5..302052693008 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor'; import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview'; import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors'; -@@ -816,6 +816,72 @@ export class GettingStartedPage extends +@@ -804,6 +804,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -887,6 +953,9 @@ export class GettingStartedPage extends +@@ -839,6 +905,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } diff --git a/patches/proposed-api.diff b/patches/proposed-api.diff index f81bccbff2a4..78eda7572758 100644 --- a/patches/proposed-api.diff +++ b/patches/proposed-api.diff @@ -26,7 +26,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts -@@ -24,7 +24,7 @@ export class ExtensionsProposedApi { +@@ -31,7 +31,7 @@ export class ExtensionsProposedApi { this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id))); diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 366566f17a8d..04787784b2f5 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.js +++ code-server/lib/vscode/build/gulpfile.reh.js -@@ -236,8 +236,7 @@ function packageTask(type, platform, arc +@@ -237,8 +237,7 @@ function packageTask(type, platform, arc const src = gulp.src(sourceFolderName + '/**', { base: '.' }) .pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); })) @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js const workspaceExtensionPoints = ['debuggers', 'jsonValidation']; const isUIExtension = (manifest) => { -@@ -276,9 +275,9 @@ function packageTask(type, platform, arc +@@ -277,9 +276,9 @@ function packageTask(type, platform, arc .map(name => `.build/extensions/${name}/**`); const extensions = gulp.src(extensionPaths, { base: '.build', dot: true }); @@ -32,11 +32,11 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js let version = packageJson.version; const quality = product.quality; -@@ -439,7 +438,7 @@ function tweakProductForServerWeb(produc +@@ -440,7 +439,7 @@ function tweakProductForServerWeb(produc const minifyTask = task.define(`minify-vscode-${type}`, task.series( optimizeTask, util.rimraf(`out-vscode-${type}-min`), -- optimize.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) +- optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`) + optimize.minifyTask(`out-vscode-${type}`, ``) )); gulp.task(minifyTask); diff --git a/patches/store-socket.diff b/patches/store-socket.diff index e91a3bcae027..236aae276199 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -94,10 +94,10 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts *--------------------------------------------------------------------------------------------*/ +import * as _http from 'http'; + import minimist from 'minimist'; import * as nativeWatchdog from 'native-watchdog'; import * as net from 'net'; - import * as minimist from 'minimist'; -@@ -418,7 +419,28 @@ async function startExtensionHostProcess +@@ -421,7 +422,28 @@ async function startExtensionHostProcess ); // rewrite onTerminate-function to be a proper shutdown diff --git a/patches/webview.diff b/patches/webview.diff index 4c324ce25147..2616db81fb48 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -66,16 +66,16 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html -@@ -5,7 +5,7 @@ - +@@ -6,7 +6,7 @@ -+ content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + +- content="default-src 'none'; script-src 'sha256-ikaxwm2UFoiIKkEZTEU4mnSxpYf3lmsrhy5KqqJZfek=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + - Date: Mon, 8 Jul 2024 17:48:56 -0800 Subject: [PATCH 013/134] Remove display language test It is not working. I test this manually anyway so for now just remove the test, but I think maybe we have to watch for code-server to extract the language files, and then reload the page, or maybe we have to install the language from the UI. Ideally we can drop our patch in the future anyway... --- test/e2e/displayLang.test.ts | 19 ---------- .../package.json | 38 ------------------- .../translations/main.i18n.json | 15 -------- 3 files changed, 72 deletions(-) delete mode 100644 test/e2e/displayLang.test.ts delete mode 100644 test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json delete mode 100644 test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json diff --git a/test/e2e/displayLang.test.ts b/test/e2e/displayLang.test.ts deleted file mode 100644 index e71e8a31993f..000000000000 --- a/test/e2e/displayLang.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as path from "path" -import { describe, test, expect } from "./baseFixture" - -// Given a code-server environment with Spanish Language Pack extension installed -// and a languagepacks.json in the data-dir -describe( - "--locale es", - ["--disable-workspace-trust", "--extensions-dir", path.join(__dirname, "./extensions"), "--locale", "es"], - {}, - () => { - test("should load code-server in Spanish", async ({ codeServerPage }) => { - // When - const visible = await codeServerPage.page.isVisible("text=Explorador") - - // Then - expect(visible).toBe(true) - }) - }, -) diff --git a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json b/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json deleted file mode 100644 index 2b69924413dc..000000000000 --- a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "vscode-language-pack-es", - "displayName": "Spanish Language Pack for Visual Studio Code", - "description": "Language pack extension for Spanish", - "version": "1.70.0", - "publisher": "MS-CEINTL", - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/vscode-loc" - }, - "engines": { - "vscode": "^1.70.0" - }, - "categories": [ - "Language Packs" - ], - "contributes": { - "localizations": [ - { - "languageId": "es", - "languageName": "Spanish", - "localizedLanguageName": "espaƱol", - "translations": [ - { - "id": "vscode", - "path": "./translations/main.i18n.json" - } - ] - } - ] - }, - "__metadata": { - "id": "47e020a1-33db-4cc0-a1b4-42f97781749a", - "publisherDisplayName": "MS-CEINTL", - "publisherId": "0b0882c3-aee3-4d7c-b5f9-872f9be0a115", - "isPreReleaseVersion": false - } -} diff --git a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json b/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json deleted file mode 100644 index e0f43689c75b..000000000000 --- a/test/e2e/extensions/ms-ceintl.vscode-language-pack-es-1.70.0/translations/main.i18n.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "": [ - "--------------------------------------------------------------------------------------------", - "Copyright (c) Microsoft Corporation. All rights reserved.", - "Licensed under the MIT License. See License.txt in the project root for license information.", - "--------------------------------------------------------------------------------------------", - "Do not edit this file. It is machine generated." - ], - "version": "1.0.0", - "contents": { - "vs/workbench/contrib/files/browser/explorerViewlet": { - "explore": "Explorador" - } - } -} From 901191e0f96af661a4df7b7988b8f90e854c65b4 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 8 Jul 2024 17:51:47 -0800 Subject: [PATCH 014/134] Update changelog --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17da5c769d1c..3bf76e5f758d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,8 +22,6 @@ Code v99.99.999 ## Unreleased -## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-08 - Code v1.91.0 ### Changed From fb3e3e1546d571e9973e86482bcd925c1918ec27 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Jul 2024 12:47:24 -0800 Subject: [PATCH 015/134] Log custom extensions gallery --- src/node/main.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/node/main.ts b/src/node/main.ts index 4a53de9d84cc..5a8b1a0af85d 100644 --- a/src/node/main.ts +++ b/src/node/main.ts @@ -164,6 +164,11 @@ export const runCodeServer = async ( logger.info(`Session server listening on ${sessionServerAddress.toString()}`) } + if (process.env.EXTENSIONS_GALLERY) { + logger.info("Using custom extensions gallery") + logger.debug(` - ${process.env.EXTENSIONS_GALLERY}`) + } + if (args.enable && args.enable.length > 0) { logger.info("Enabling the following experimental features:") args.enable.forEach((feature) => { From d83ba4b46f18cc82470db88769239fc65b2155d3 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Jul 2024 23:23:16 -0800 Subject: [PATCH 016/134] Release v4.91.0 --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bf76e5f758d..ef97088f8b14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10 + Code v1.91.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 97ca8d81741f..9eccb70608b9 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.21.1 +version: 3.22.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.90.3 +appVersion: 4.91.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 0e899556b800..af34fbaf6dab 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.90.3' + tag: '4.91.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 3031f8599c0da844d18569dca252cecbd054f676 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 10 Jul 2024 21:39:03 +0300 Subject: [PATCH 017/134] ci: updates actionlint to 1.7.1 version (#6887) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ce483c40beb3..41b8aba49ee8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -147,7 +147,7 @@ jobs: uses: actions/checkout@v4 - name: Check workflow files run: | - bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/7fdc9630cc360ea1a469eed64ac6d78caeda1234/scripts/download-actionlint.bash) + bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.1 ./actionlint -color -shellcheck= -ignore "set-output" shell: bash From c86c4e8bb6f738990de117ce2183f3dbdb2643c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 19:26:02 +0000 Subject: [PATCH 018/134] chore: bump dawidd6/action-download-artifact from 3 to 6 (#6876) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 3 to 6. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v3...v6) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 90f08eae4cab..630f0ba43c38 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -282,7 +282,7 @@ jobs: timeout-minutes: 15 steps: - name: Download artifacts - uses: dawidd6/action-download-artifact@v3 + uses: dawidd6/action-download-artifact@v6 id: download with: branch: ${{ github.ref }} From 97bcc3b9347d77849fa3d405d106b624d8689719 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:08:52 -0800 Subject: [PATCH 019/134] chore: bump robinraju/release-downloader from 1.10 to 1.11 (#6875) Bumps [robinraju/release-downloader](https://github.com/robinraju/release-downloader) from 1.10 to 1.11. - [Release notes](https://github.com/robinraju/release-downloader/releases) - [Commits](https://github.com/robinraju/release-downloader/compare/v1.10...v1.11) --- updated-dependencies: - dependency-name: robinraju/release-downloader dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0ec6126d9733..b959b2c35127 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -36,7 +36,7 @@ jobs: cache: "yarn" - name: Download npm package from release artifacts - uses: robinraju/release-downloader@v1.10 + uses: robinraju/release-downloader@v1.11 with: repository: "coder/code-server" tag: ${{ github.event.inputs.version || github.ref_name }} @@ -184,7 +184,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Download deb artifacts - uses: robinraju/release-downloader@v1.10 + uses: robinraju/release-downloader@v1.11 with: repository: "coder/code-server" tag: v${{ env.VERSION }} @@ -192,7 +192,7 @@ jobs: out-file-path: "release-packages" - name: Download rpm artifacts - uses: robinraju/release-downloader@v1.10 + uses: robinraju/release-downloader@v1.11 with: repository: "coder/code-server" tag: v${{ env.VERSION }} From 2e098a2b901f8603e70613b1af62c5a0875f5894 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:09:11 -0800 Subject: [PATCH 020/134] chore: bump typescript from 5.4.3 to 5.5.2 (#6873) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.3 to 5.5.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.3...v5.5.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3433ec6c879a..9b90d0b39899 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3484,9 +3484,9 @@ typed-array-length@^1.0.4: is-typed-array "^1.1.9" typescript@^5.2.2: - version "5.4.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" - integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== + version "5.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507" + integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew== unbox-primitive@^1.0.2: version "1.0.2" From 8accfcc8ecdeda3697fe2832e84c2458b43df6b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:09:41 -0800 Subject: [PATCH 021/134] chore: bump prettier from 3.2.4 to 3.3.2 (#6878) Bumps [prettier](https://github.com/prettier/prettier) from 3.2.4 to 3.3.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.2.4...3.3.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9b90d0b39899..db3176e9d15a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2844,9 +2844,9 @@ prettier-plugin-sh@^0.14.0: sh-syntax "^0.4.1" prettier@^3.0.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" - integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a" + integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA== proxy-addr@~2.0.7: version "2.0.7" From 2b33ca8a3f5b453a571a2d0d1f8ddeb08655613c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:10:01 -0800 Subject: [PATCH 022/134] chore: bump aquasecurity/trivy-action from 0.21.0 to 0.24.0 (#6894) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.21.0 to 0.24.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/fd25fed6972e341ff0007ddb61f77e88103953c2...6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index e0f1878e118e..45d4186815cc 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -55,7 +55,7 @@ jobs: fetch-depth: 0 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 with: scan-type: "fs" scan-ref: "." diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 13c98468ea0a..db73b8c23240 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in image mode - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 with: image-ref: "docker.io/codercom/code-server:latest" ignore-unfixed: true From a9eb923790de016554eb2ba50ec263201a9467a8 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 10 Jul 2024 13:15:15 -0800 Subject: [PATCH 023/134] Remove unused audit-ci dependency There is a `yarn ci` script which was using audit-ci but this does not appear to be called anywhere. The security worflow uses `yarn audit` and `npm audit` which seem fine enough anyway. --- .github/workflows/security.yaml | 2 +- ci/README.md | 2 - ci/dev/audit.sh | 12 --- ci/dev/ci.sh | 13 --- docs/SECURITY.md | 6 +- package.json | 3 - yarn.lock | 158 +------------------------------- 7 files changed, 8 insertions(+), 188 deletions(-) delete mode 100755 ci/dev/audit.sh delete mode 100755 ci/dev/ci.sh diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 45d4186815cc..2c617cc371ae 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: - audit-ci: + audit: name: Audit node modules runs-on: ubuntu-latest timeout-minutes: 15 diff --git a/ci/README.md b/ci/README.md index 4869d65a276b..5f11717a8ecf 100644 --- a/ci/README.md +++ b/ci/README.md @@ -24,8 +24,6 @@ This directory contains scripts used for the development of code-server. - Runs unit tests. - [./ci/dev/test-e2e.sh](./dev/test-e2e.sh) (`yarn test:e2e`) - Runs end-to-end tests. -- [./ci/dev/ci.sh](./dev/ci.sh) (`yarn ci`) - - Runs `yarn fmt`, `yarn lint` and `yarn test`. - [./ci/dev/watch.ts](./dev/watch.ts) (`yarn watch`) - Starts a process to build and launch code-server and restart on any code changes. - Example usage in [./docs/CONTRIBUTING.md](../docs/CONTRIBUTING.md). diff --git a/ci/dev/audit.sh b/ci/dev/audit.sh deleted file mode 100755 index 0142eac2a906..000000000000 --- a/ci/dev/audit.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -main() { - cd "$(dirname "$0")/../.." - - # Prevents integration with moderate or higher vulnerabilities - # Docs: https://github.com/IBM/audit-ci#options - yarn audit-ci --moderate -} - -main "$@" diff --git a/ci/dev/ci.sh b/ci/dev/ci.sh deleted file mode 100755 index daf4ecc69414..000000000000 --- a/ci/dev/ci.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -main() { - cd "$(dirname "$0")/../.." - - yarn fmt - yarn lint - yarn _audit - yarn test:unit -} - -main "$@" diff --git a/docs/SECURITY.md b/docs/SECURITY.md index 0b4062ef0749..c2ed7542a616 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -17,10 +17,8 @@ We use the following tools to help us stay on top of vulnerability mitigation. - Comprehensive vulnerability scanner that runs on PRs into the default branch and scans both our container image and repository code (see `trivy-scan-repo` and `trivy-scan-image` jobs in `build.yaml`) -- [`audit-ci`](https://github.com/IBM/audit-ci) - - Audits npm and Yarn dependencies in CI (see `Audit for vulnerabilities` step - in `build.yaml`) on PRs into the default branch and fails CI if moderate or - higher vulnerabilities (see the `audit.sh` script) are present. +- `yarn audit` and `npm audit` + - Audits Yarn/NPM dependencies. ## Supported Versions diff --git a/package.json b/package.json index 250efd0db510..366a4d39fbbe 100644 --- a/package.json +++ b/package.json @@ -27,12 +27,10 @@ "postinstall": "./ci/dev/postinstall.sh", "publish:npm": "./ci/steps/publish-npm.sh", "publish:docker": "./ci/steps/docker-buildx-push.sh", - "_audit": "./ci/dev/audit.sh", "fmt": "yarn prettier && ./ci/dev/doctoc.sh", "lint:scripts": "./ci/dev/lint-scripts.sh", "lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.js' | grep -v 'lib/vscode')", "test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1", - "ci": "./ci/dev/ci.sh", "watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts", "icons": "./ci/dev/gen_icons.sh" }, @@ -53,7 +51,6 @@ "@types/ws": "^8.5.5", "@typescript-eslint/eslint-plugin": "^7.0.0", "@typescript-eslint/parser": "^6.7.2", - "audit-ci": "^6.6.1", "doctoc": "^2.2.1", "eslint": "^8.49.0", "eslint-config-prettier": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index db3176e9d15a..e6fbfd3d09f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -485,14 +485,6 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -557,7 +549,7 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -676,20 +668,6 @@ ast-types@^0.13.4: dependencies: tslib "^2.0.1" -audit-ci@^6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/audit-ci/-/audit-ci-6.6.1.tgz#7c53808f6f94adbe60baf1d7c24f53c626619453" - integrity sha512-zqZEoYfEC4QwX5yBkDNa0h7YhZC63HWtKtP19BVq+RS0dxRBInfmHogxe4VUeOzoADQjuTLZUI7zp3Pjyl+a5g== - dependencies: - JSONStream "^1.3.5" - cross-spawn "^7.0.3" - escape-string-regexp "^4.0.0" - event-stream "4.0.1" - jju "^1.4.0" - readline-transform "1.0.0" - semver "^7.0.0" - yargs "^17.0.0" - available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -839,15 +817,6 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -935,7 +904,7 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1111,11 +1080,6 @@ domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" -duplexer@^0.1.1, duplexer@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -1246,11 +1210,6 @@ es6-promisify@^7.0.0: resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-7.0.0.tgz#9a710008dd6a4ab75a89e280bad787bfb749927b" integrity sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q== -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -1437,19 +1396,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-stream@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65" - integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA== - dependencies: - duplexer "^0.1.1" - from "^0.1.7" - map-stream "0.0.7" - pause-stream "^0.0.11" - split "^1.0.1" - stream-combiner "^0.2.2" - through "^2.3.8" - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -1620,11 +1566,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -from@^0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== - fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -1686,11 +1627,6 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" @@ -2172,11 +2108,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jju@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" - integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== - js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -2213,11 +2144,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== - just-performance@4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/just-performance/-/just-performance-4.3.0.tgz#cc2bc8c9227f09e97b6b1df4cd0de2df7ae16db1" @@ -2286,11 +2212,6 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -map-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" - integrity sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ== - markdown-table@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b" @@ -2801,13 +2722,6 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -pause-stream@^0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A== - dependencies: - through "~2.3" - pem@^1.14.8: version "1.14.8" resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.8.tgz#9c414bee991b138a24617f423059e809d01aa720" @@ -2923,11 +2837,6 @@ readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readline-transform@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/readline-transform/-/readline-transform-1.0.0.tgz#3157f97428acaec0f05a5c1ff2c3120f4e6d904b" - integrity sha512-7KA6+N9IGat52d83dvxnApAWN+MtVb1MiVuMR/cf1O4kYsJG+g/Aav0AHcHKsb6StinayfPLne0+fMX2sOzAKg== - regenerator-runtime@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" @@ -2978,11 +2887,6 @@ repeat-string@^1.0.0: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -3090,7 +2994,7 @@ semver@^6.0.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.5, semver@^7.5.4: +semver@^7.3.5, semver@^7.5.4: version "7.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== @@ -3231,27 +3135,12 @@ source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -split@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -stream-combiner@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" - integrity sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ== - dependencies: - duplexer "~0.1.1" - through "~2.3.4" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3294,7 +3183,7 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -3353,11 +3242,6 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -through@2, "through@>=2.2.7 <3", through@^2.3.8, through@~2.3, through@~2.3.4: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -3649,15 +3533,6 @@ wide-align@^1.1.2: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -3673,34 +3548,11 @@ xdg-basedir@^4.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^17.0.0: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 6a140706642578ea8bd290254457f25d77499956 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 11 Jul 2024 11:49:56 -0800 Subject: [PATCH 024/134] Add faq entry about web views Closes #5671. --- docs/FAQ.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/FAQ.md b/docs/FAQ.md index f300d410eea4..c46c003b8800 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -37,6 +37,7 @@ - [How do I hide the coder/coder promotion in Help: Getting Started?](#how-do-i-hide-the-codercoder-promotion-in-help-getting-started) - [How do I disable the proxy?](#how-do-i-disable-the-proxy) - [How do I disable file download?](#how-do-i-disable-file-download) +- [Why do web views not work?](#why-do-web-views-not-work) @@ -487,3 +488,22 @@ when using the option. ## How do I disable file download? You can pass the flag `--disable-file-downloads` to `code-server` + +## Why do web views not work? + +Web views rely on service workers, and service workers are only available in a +secure context, so most likely the answer is that you are using an insecure +context (for example an IP address). + +If this happens, in the browser log you will see something like: + +> Error loading webview: Error: Could not register service workers: SecurityError: Failed to register a ServiceWorker for scope with script: An SSL certificate error occurred when fetching the script.. + +To fix this, you must either: + +- Access over localhost/127.0.0.1 which is always considered secure. +- Use a domain with a real certificate (for example with Let's Encrypt). +- Use a trusted self-signed certificate with [mkcert](https://mkcert.dev) (or + create and trust a certificate manually). +- Disable security if your browser allows it. For example, in Chromium see + `chrome://flags/#unsafely-treat-insecure-origin-as-secure` From 37a72ce63b6b4e8d5b22dd727326e81ceef581c0 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 14:48:55 -0800 Subject: [PATCH 025/134] Enforce yarn version Closes https://github.com/coder/code-server/issues/6695. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 366a4d39fbbe..9c85b3ee2c33 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,8 @@ "remote-development" ], "engines": { - "node": "20" + "node": "20", + "yarn": "1" }, "jest": { "transform": { From f2c326147de9975c5ab91369c37dc8c9d9163619 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 15:01:30 -0800 Subject: [PATCH 026/134] Fix login page assets over proxy domain --- src/node/routes/domainProxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/routes/domainProxy.ts b/src/node/routes/domainProxy.ts index fc0f91daddf8..0a9bb4a324f7 100644 --- a/src/node/routes/domainProxy.ts +++ b/src/node/routes/domainProxy.ts @@ -65,7 +65,7 @@ router.all(/.*/, async (req, res, next) => { const isAuthenticated = await authenticated(req) if (!isAuthenticated) { // Let the assets through since they're used on the login page. - if (req.path.startsWith("/static/") && req.method === "GET") { + if (req.path.startsWith("/_static/") && req.method === "GET") { return next() } From d9812a5970bde37601adf9ba90f6b3d03b0e6f10 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 16:23:29 -0800 Subject: [PATCH 027/134] Use version in npm install Closes #4832. --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0a17cd9d2bb9..fd44adb2abe6 100755 --- a/install.sh +++ b/install.sh @@ -424,7 +424,7 @@ install_standalone() { } install_npm() { - echoh "Installing latest from npm." + echoh "Installing v$VERSION from npm." echoh NPM_PATH="${YARN_PATH-npm}" @@ -436,7 +436,7 @@ install_npm() { fi echoh "Installing with npm." echoh - "$sh_c" "$NPM_PATH" install -g code-server --unsafe-perm + "$sh_c" "$NPM_PATH" install -g "code-server@$VERSION" --unsafe-perm NPM_BIN_DIR="\$($NPM_PATH bin -g)" echo_npm_postinstall return fi From 6467c60166a53c758113bf9754d01e4e918654c9 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 12 Jul 2024 17:02:40 -0800 Subject: [PATCH 028/134] Remove section about VS Code Remote It has nothing to do with code-server and will not connect to or use code-server in any way. Closes #5613. --- docs/guide.md | 93 --------------------------------------------------- 1 file changed, 93 deletions(-) diff --git a/docs/guide.md b/docs/guide.md index 5bf2fc9dac68..6d164c694dea 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -20,9 +20,6 @@ - [Proxying to a Vue app](#proxying-to-a-vue-app) - [Proxying to an Angular app](#proxying-to-an-angular-app) - [Proxying to a Svelte app](#proxying-to-a-svelte-app) -- [SSH into code-server on VS Code](#ssh-into-code-server-on-vs-code) - - [Option 1: cloudflared tunnel](#option-1-cloudflared-tunnel) - - [Option 2: ngrok tunnel](#option-2-ngrok-tunnel) @@ -435,93 +432,3 @@ const config = { 3. Access app at `/absproxy/5173/` e.g. `http://localhost:8080/absproxy/5173/ For additional context, see [this Github Issue](https://github.com/sveltejs/kit/issues/2958) - -## SSH into code-server on VS Code - -[![SSH](https://img.shields.io/badge/SSH-363636?style=for-the-badge&logo=GNU+Bash&logoColor=ffffff)](https://ohmyz.sh/) [![Terminal](https://img.shields.io/badge/Terminal-2E2E2E?style=for-the-badge&logo=Windows+Terminal&logoColor=ffffff)](https://img.shields.io/badge/Terminal-2E2E2E?style=for-the-badge&logo=Windows+Terminal&logoColor=ffffff) [![Visual Studio Code](https://img.shields.io/badge/Visual_Studio_Code-007ACC?style=for-the-badge&logo=Visual+Studio+Code&logoColor=ffffff)](vscode:extension/ms-vscode-remote.remote-ssh) - -Follow these steps where code-server is running: - -1. Install `openssh-server`, `wget`, and `unzip`. - -```bash -# example for Debian and Ubuntu operating systems -sudo apt update -sudo apt install wget unzip openssh-server -``` - -2. Start the SSH server and set the password for your user, if you haven't already. If you use [deploy-code-server](https://github.com/coder/deploy-code-server), - -```bash -sudo service ssh start -sudo passwd {user} # replace user with your code-server user -``` - -### Option 1: cloudflared tunnel - -[![Cloudflared](https://img.shields.io/badge/Cloudflared-E4863B?style=for-the-badge&logo=cloudflare&logoColor=ffffff)](https://github.com/cloudflare/cloudflared) - -1. Install [cloudflared](https://github.com/cloudflare/cloudflared#installing-cloudflared) on your local computer and remote server -2. Then go to `~/.ssh/config` and add the following on your local computer: - -```shell -Host *.trycloudflare.com -HostName %h -User user -Port 22 -ProxyCommand "cloudflared location" access ssh --hostname %h -``` - -3. Run `cloudflared tunnel --url ssh://localhost:22` on the remote server - -4. Finally on VS Code or any IDE that supports SSH, run `ssh user@https://your-link.trycloudflare.com` or `ssh user@your-link.trycloudflare.com` - -### Option 2: ngrok tunnel - -[![Ngrok](https://img.shields.io/badge/Ngrok-1F1E37?style=for-the-badge&logo=ngrok&logoColor=ffffff)](https://ngrok.com/) - -1. Make a new account for ngrok [here](https://dashboard.ngrok.com/login) - -2. Now, get the ngrok binary with `wget` and unzip it with `unzip`: - -```bash -wget "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip" -unzip "ngrok-stable-linux-amd64.zip" -``` - -5. Then, go to [dashboard.ngrok.com](https://dashboard.ngrok.com) and go to the `Your Authtoken` section. -6. Copy the Authtoken shown there. -7. Now, go to the folder where you unzipped ngrok and store the Authtoken from the ngrok Dashboard. - -```bash -./ngrok authtoken YOUR_AUTHTOKEN # replace YOUR_AUTHTOKEN with the ngrok authtoken. -``` - -8. Now, forward port 22, which is the SSH port with this command: - -```bash -./ngrok tcp 22 -``` - -Now, you get a screen in the terminal like this: - -```console -ngrok by @inconshreveable(Ctrl+C to quit) - -Session Status online -Account {Your name} (Plan: Free) -Version 2.3.40 -Region United States (us) -Web Interface http://127.0.0.1:4040 -Forwarding tcp://0.tcp.ngrok.io:19028 -> localhost:22 -``` - -In this case, copy the forwarded link `0.tcp.ngrok.io` and remember the port number `19028`. Type this on your local Visual Studio Code: - -```bash -ssh user@0.tcp.ngrok.io -p 19028 -``` - -The port redirects you to the default SSH port 22, and you can then successfully connect to code-server by entering the password you set for the user. - -Note: the port and the url provided by ngrok will change each time you run it so modify as needed. From 1962f48b7f71772dc2c060dbaa5a6b4c0792a549 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Mon, 15 Jul 2024 19:57:32 +0200 Subject: [PATCH 029/134] Update Code to 1.91.1 (#6900) --- lib/vscode | 2 +- patches/webview.diff | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vscode b/lib/vscode index ea1445cc7016..f1e16e1e6214 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit ea1445cc7016315d0f5728f8e8b12a45dc0a7286 +Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729 diff --git a/patches/webview.diff b/patches/webview.diff index 2616db81fb48..c115e550855d 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -70,8 +70,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-dvxt5dlghGbz8hrqqochfoKEaHIMZ+yJVRvjJnGopzs=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-gzcLnrLeKQp7L5f+d7tdtNmK8h1NxVu1TdCfnv9uU+o=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> From 0f9436e7b966f1bfa8dc68cab3c8e73d0f0a3d2c Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 19 Jul 2024 10:49:26 -0800 Subject: [PATCH 030/134] Remove Ranger for now - We have a labeling bot that is marking issues as upstream (so far correctly) now Ranger is closing them right away and it felt too aggressive to me. - It keeps posting its comment twice. Not sure how to fix that. --- .github/ranger.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/ranger.yml diff --git a/.github/ranger.yml b/.github/ranger.yml deleted file mode 100644 index 4a7044e4d5e4..000000000000 --- a/.github/ranger.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for the repo ranger bot -# See docs: https://www.notion.so/Documentation-8d7627bb1f3c42b7b1820e8d6f157a57#9879d1374fab4d1f9c607c230fd5123d -default: - close: - # Default time to wait before closing the label. Can either be a number in milliseconds - # or a string specified by the `ms` package (https://www.npmjs.com/package/ms) - delay: "2 days" - - # Default comment to post when an issue is first marked with a closing label - comment: "āš ļø This issue has been marked $LABEL and will be closed in $DELAY." - -labels: - duplicate: close - wontfix: close - "squash when passing": merge - "rebase when passing": merge - "merge when passing": merge - "new contributor": - action: comment - delay: 5s - message: "Thanks for making your first contribution! :slightly_smiling_face:" - "upstream:vscode": - action: close - delay: 5s - comment: > - This issue has been marked as 'upstream:vscode'. - Please file this upstream: [link to open issue](https://github.com/microsoft/vscode/issues/new/choose) - - This issue will automatically close in $DELAY. From 31bc0c6b1a19fcfd3d2e7ac7e44601d65c3d0679 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 25 Jul 2024 09:16:15 -0800 Subject: [PATCH 031/134] Fix dangling links in standalone release The fix will now run both to the GitHub and npm release instead of only for the npm releases. Closes #5157. --- ci/build/build-packages.sh | 5 ----- ci/build/build-standalone-release.sh | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/build/build-packages.sh b/ci/build/build-packages.sh index 1844dc7410fd..d9840d1c367d 100755 --- a/ci/build/build-packages.sh +++ b/ci/build/build-packages.sh @@ -50,11 +50,6 @@ release_nfpm() { export NFPM_ARCH - # Code deletes some files from the extension node_modules directory which - # leaves broken symlinks in the corresponding .bin directory. nfpm will fail - # on these broken symlinks so clean them up. - rm -fr "./release-standalone/lib/vscode/extensions/node_modules/.bin" - PKG_FORMAT="deb" NFPM_ARCH="$(get_nfpm_arch $PKG_FORMAT "$ARCH")" nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)" diff --git a/ci/build/build-standalone-release.sh b/ci/build/build-standalone-release.sh index aed25ee3f3fc..78e665de7a60 100755 --- a/ci/build/build-standalone-release.sh +++ b/ci/build/build-standalone-release.sh @@ -24,6 +24,10 @@ main() { pushd "$RELEASE_PATH" npm install --unsafe-perm --omit=dev + # Code deletes some files from the extension node_modules directory which + # leaves broken symlinks in the corresponding .bin directory. nfpm will fail + # on these broken symlinks so clean them up. + rm -fr "./lib/vscode/extensions/node_modules/.bin" popd } From 461d4cba59754c587db936bdff1cb6559da892f9 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 1 Aug 2024 11:31:44 -0800 Subject: [PATCH 032/134] Update script tests Installing from npm now tells you the version. --- test/scripts/install.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/scripts/install.bats b/test/scripts/install.bats index c9fd8c0fadaf..976069cd4443 100644 --- a/test/scripts/install.bats +++ b/test/scripts/install.bats @@ -26,14 +26,14 @@ function should-fallback-npm() { [ "$status" -eq 0 ] [ "${lines[1]}" = "No standalone releases for $2." ] [ "${lines[2]}" = "Falling back to installation from npm." ] - [ "${lines[3]}" = "Installing latest from npm." ] + [ "${lines[3]}" = "Installing v$VERSION from npm." ] [ "${lines[-6]}" = "npm package has been installed." ] } function should-use-npm() { YARN_PATH=true DISTRO=$1 ARCH=$2 OS=linux run "$SCRIPT" --dry-run [ "$status" -eq 0 ] - [ "${lines[1]}" = "Installing latest from npm." ] + [ "${lines[1]}" = "Installing v$VERSION from npm." ] [ "${lines[-6]}" = "npm package has been installed." ] } @@ -51,7 +51,7 @@ function should-fallback-npm-brew() { [ "${lines[2]}" = "Falling back to standalone installation." ] [ "${lines[3]}" = "No standalone releases for $1." ] [ "${lines[4]}" = "Falling back to installation from npm." ] - [ "${lines[5]}" = "Installing latest from npm." ] + [ "${lines[5]}" = "Installing v$VERSION from npm." ] [ "${lines[-6]}" = "npm package has been installed." ] } From 34c6751bf8ae4e343f908d8aee691a4778f1d3a2 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 15 Aug 2024 21:33:21 -0800 Subject: [PATCH 033/134] Update VS Code to 1.92.2 (#6941) * Update VS Code to 1.92.2 * Use server-main.js to load VS Code It looks like the bootstrap files are now bundled so we can no longer require them. We could make them included again, but maybe it is better to go through the main entrypoint anyway because it includes some nls stuff which is maybe necessary. This also fixes what looks like a bug where we could create two servers if two requests came in. I am not sure what the practical consequences of that would be, but it will no longer do that. * Drop es2020 patch Unfortunately, VS Code will not load with this. It seems to be because `this` is being used in static properties, and it becomes `void 0` for some reason under the es2020 target. For example: static PREFIX_BY_CATEGORY = `${this.PREFIX}${this.SCOPE_PREFIX}`; becomes AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY = `${(void 0).PREFIX}${(void 0).SCOPE_PREFIX}`; Which, obviously, will not work. Older versions of Safari (and maybe other browsers) are likely affected. * Fix display language * Update Playwright I think maybe because of the dropped es2020 patch that Webkit is now failing because it is too old. * Do not wait for networkidle in e2e tests I am not sure what is going on but some tests on Webkit are timing out and it seems the page is loaded but something is still trying to download. Not good, but for now try to at least get the tests passing. --- CHANGELOG.md | 13 + lib/vscode | 2 +- patches/base-path.diff | 44 ++- patches/clipboard.diff | 4 +- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 285 +++++++------- patches/external-file-actions.diff | 6 +- patches/getting-started.diff | 10 +- patches/integration.diff | 17 +- patches/keepalive.diff | 2 +- patches/local-storage.diff | 2 +- patches/logout.diff | 2 +- patches/marketplace.diff | 14 +- patches/proxy-uri.diff | 2 +- patches/safari.diff | 68 ---- patches/series | 3 +- patches/service-worker.diff | 2 +- patches/sourcemaps.diff | 6 +- patches/store-socket.diff | 6 +- patches/telemetry.diff | 18 +- patches/update-check.diff | 2 +- patches/webview.diff | 28 +- src/node/cli.ts | 5 - src/node/main.ts | 16 +- src/node/routes/vscode.ts | 69 +++- src/node/util.ts | 26 -- test/e2e/models/CodeServer.ts | 2 +- test/package.json | 4 +- test/yarn.lock | 496 ++---------------------- 29 files changed, 352 insertions(+), 804 deletions(-) delete mode 100644 patches/safari.diff diff --git a/CHANGELOG.md b/CHANGELOG.md index ef97088f8b14..5b0af9972bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,19 @@ Code v99.99.999 ## Unreleased +Code v1.92.1 + +### Breaking changes + +- Dropped a patch that changed the compile target from es2022 to es2020 because + it no longer works with the way VS Code uses static properties. This may break + older browsers, so those browsers will either have to be updated or use an + older version of code-server. + +### Changed + +- Updated to Code 1.92.1. + ## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10 Code v1.91.0 diff --git a/lib/vscode b/lib/vscode index f1e16e1e6214..fee1edb8d6d7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729 +Subproject commit fee1edb8d6d72a0ddff41e5f71a671c23ed924b9 diff --git a/patches/base-path.diff b/patches/base-path.diff index 6705ec088da0..05bfbbf4a3b8 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -86,10 +86,10 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html -@@ -38,7 +38,7 @@ - - +@@ -40,7 +40,7 @@ + + - + + + + - -