Merge pull request #2862 from cdr/jsjoeio/upgrade-vscode-1.54

feat(vscode): update to version 1.54.2

Author: repo-ranger[bot]

.eslintrc.yaml

@@ -29,6 +29,7 @@ rules:
   "@typescript-eslint/no-var-requires": off
   "@typescript-eslint/explicit-module-boundary-types": off
   "@typescript-eslint/no-explicit-any": off
+  "@typescript-eslint/no-extra-semi": off
   eqeqeq: error
   import/order:
     [error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }]

.github/workflows/ci.yaml

@@ -54,7 +54,7 @@ jobs:
       - uses: microsoft/playwright-github-action@v1
       - name: Install dependencies and run end-to-end tests
         run: |
-          ./release-packages/code-server*-linux-amd64/bin/code-server --home $CODE_SERVER_ADDRESS/healthz &
+          ./release-packages/code-server*-linux-amd64/bin/code-server &
           yarn --frozen-lockfile
           yarn test:e2e
       - name: Upload test artifacts

ci/dev/test-e2e.sh

@@ -13,9 +13,6 @@ main() {
     echo "  \$PASSWORD"
     echo "  \$CODE_SERVER_ADDRESS"
     echo -e "\n"
-    echo "Please make sure you have code-server running locally with the flag:"
-    echo "  --home \$CODE_SERVER_ADDRESS/healthz "
-    echo -e "\n"
     exit 1
   fi
   CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --config ./test/jest.e2e.config.ts

ci/dev/update-vscode.sh

@@ -98,8 +98,8 @@ main() {
   git subtree pull --prefix lib/vscode vscode release/"${VSCODE_VERSION_TO_UPDATE}" --squash || true
 
   # Get the files with conflicts before we commit them
-  # so we can list them in the PR body
-  CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- $line"; done)
+  # so we can list them in the PR body as todo items
+  CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- [ ] $line"; done)
   PR_BODY=$(make_pr_body "$VSCODE_EXACT_VERSION" "$CONFLICTS")
 
   echo -e "\nForcing a commit with conflicts"

docs/FAQ.md

@@ -26,7 +26,6 @@
 - [Heartbeat File](#heartbeat-file)
 - [Healthz endpoint](#healthz-endpoint)
 - [How does the config file work?](#how-does-the-config-file-work)
-- [How do I customize the "Go Home" button?](#how-do-i-customize-the-go-home-button)
 - [Isn't an install script piped into sh insecure?](#isnt-an-install-script-piped-into-sh-insecure)
 - [How do I make my keyboard shortcuts work?](#how-do-i-make-my-keyboard-shortcuts-work)
 - [Differences compared to Theia?](#differences-compared-to-theia)
@@ -354,16 +353,6 @@ The `--config` flag or `$CODE_SERVER_CONFIG` can be used to change the config fi
 
 The default location also respects `$XDG_CONFIG_HOME`.
 
-## How do I customize the "Go Home" button?
-
-You can pass a URL to the `--home` flag like this:
-
-```
-code-server --home=https://my-website.com
-```
-
-Or you can define it in the config file with `home`.
-
 ## Isn't an install script piped into sh insecure?
 
 Please give

lib/vscode/.devcontainer/cache/build-cache-image.sh

@@ -8,7 +8,7 @@ set -e
 
 SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
 CONTAINER_IMAGE_REPOSITORY="$1"
-BRANCH="${2:-"master"}"
+BRANCH="${2:-"main"}"
 
 if [ "${CONTAINER_IMAGE_REPOSITORY}" = "" ]; then
 	echo "Container repository not specified!"

lib/vscode/.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 	"name": "Code - OSS",
 
 	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
-	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-master",
+	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-main",
 
 	"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
 	"workspaceFolder": "/home/node/workspace/vscode",

lib/vscode/.eslintignore

@@ -13,6 +13,7 @@
 **/extensions/**/out/**
 **/extensions/**/build/**
 **/extensions/markdown-language-features/media/**
+**/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
 **/extensions/**/dist/**
 # This is a code-server code symlink.

lib/vscode/.eslintrc.json

@@ -268,7 +268,6 @@
 					"**/vs/base/{common,node,electron-main}/**",
 					"**/vs/base/parts/*/{common,node,electron-main}/**",
 					"**/vs/platform/*/{common,node,electron-main}/**",
-					"**/vs/code/**",
 					"*" // node modules
 				]
 			},
@@ -279,6 +278,7 @@
 					"sinon",
 					"vs/nls",
 					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
 					"**/vs/platform/*/{common,browser}/**",
 					"**/vs/platform/*/test/{common,browser}/**"
 				]
@@ -807,7 +807,6 @@
 					"**/vs/platform/**/{common,node}/**",
 					"**/vs/workbench/**/{common,node}/**",
 					"**/vs/server/**",
-					"**/vs/code/**/{common,node}/**",
 					"*" // node modules
 				]
 			},
@@ -985,7 +984,8 @@
 							"TreeDataProvider",
 							"CustomEditorProvider",
 							"CustomReadonlyEditorProvider",
-							"TerminalLinkProvider"
+							"TerminalLinkProvider",
+							"AuthenticationProvider"
 						]
 					}
 				],
@@ -1009,6 +1009,7 @@
 							"end",
 							"expand",
 							"hide",
+							"invalidate",
 							"open",
 							"override",
 							"receive",

lib/vscode/.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,17 +4,20 @@ about: Create a report to help us improve
 ---
 <!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
 <!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
-<!-- Please search existing issues to avoid creating duplicates. -->
-<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->
-
-<!-- Use Help > Report Issue to prefill these. -->
-- VSCode Version:
+<!-- 🕮 Read our guide about submitting issues: https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions -->
+<!-- 🔎 Search existing issues to avoid creating duplicates. -->
+<!-- 🧪 Test using the latest Insiders build to see if your issue has already been fixed: https://code.visualstudio.com/insiders/ -->
+<!-- 💡 Instead of creating your report here, use 'Report Issue' from the 'Help' menu in VS Code to pre-fill useful information. -->
+- VS Code Version:
 - OS Version:
 
 Steps to Reproduce:
 
 1.
 2.
 
-<!-- Launch with `code --disable-extensions` to check. -->
+<!-- 🔧 Launch with `code --disable-extensions` to check. -->
 Does this issue occur when all extensions are disabled?: Yes/No
+
+<!-- 🪓 If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. -->
+<!-- 📣 Issues caused by an extension need to be reported direct to the extension publisher. The 'Help > Report Issue' dialog can assist with this. -->