Skip to content

feat(vscode): update to version 1.54.2 #2862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e8cd17a
Squashed 'lib/vscode/' changes from 622cb03f7e0..fd6f3bce670
jsjoeio Mar 11, 2021
0cd3e39
chore(vscode): update to 1.54.2
jsjoeio Mar 11, 2021
548b6fb
fix(lib/vscode): package.json and yarn.lock
jsjoeio Mar 11, 2021
e79ca99
feat(lib/vscode): update src/vs/base/node/languagePacks.js
jsjoeio Mar 11, 2021
dac44ec
feat(update-vscode): use todo items for conflicts in pr body
jsjoeio Mar 11, 2021
dc5c271
fix(lib/vscode): replace doStore with getSotrage
jsjoeio Mar 11, 2021
325f21f
fix(lib/vscode): change doStore > doInitialize AbstractStorageService
jsjoeio Mar 11, 2021
d1ad3fa
fix(lib/vscode): update storageService getStorage methods
jsjoeio Mar 11, 2021
42ff0ec
fix(lib/vscode): update dialogHandler
jsjoeio Mar 11, 2021
8512be8
fix(lib/vscode): update electron-sandbox localizationService
jsjoeio Mar 11, 2021
cc8e4ee
fix(lib/vscode): update extensionManagementService
jsjoeio Mar 11, 2021
eaf63de
fix(lib/vscode): fix return type shutdown in ptyService
jsjoeio Mar 11, 2021
350ddc3
fix(lib/vscode): update log service in server.ts
jsjoeio Mar 11, 2021
c42240f
fix(lib/vscode): refactor mkdirp to fs.promises
jsjoeio Mar 11, 2021
e5b7438
fix(lib/vscode): update imports in channel.ts for terminal
jsjoeio Mar 11, 2021
dc08bc6
fix(lib/vscode): fix terminalLayoutInfoArgs
jsjoeio Mar 11, 2021
34189e4
fix(lib/vscode): add getAppRoot to VariableResolverService
jsjoeio Mar 11, 2021
25dbb5b
fix(lib/vscode0: localizations import in client
jsjoeio Mar 11, 2021
8f414b5
fix(lib/vscode): make mkdir recursive
jsjoeio Mar 11, 2021
875dfb6
fix(lib/vscode): update path for logService
jsjoeio Mar 12, 2021
050a1bb
Fix localizations service import
code-asher Mar 12, 2021
ae02023
fix(lib/vscode): register LogLevelChannel
jsjoeio Mar 15, 2021
0c27083
refactor: remove --home flag/feature
jsjoeio Mar 16, 2021
bcdca86
refactor: change goHome test to helpAbout
jsjoeio Mar 16, 2021
3d9d2e5
refactor: add helpAbout test instead of goHome
jsjoeio Mar 16, 2021
608871e
wip: change name back to goHome
jsjoeio Mar 16, 2021
445d7d6
fix: update testPathIgnorePatterns for jest
jsjoeio Mar 16, 2021
481dd1f
fixup: rename test
jsjoeio Mar 16, 2021
d3df963
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54
jsjoeio Mar 16, 2021
36714da
fixup: move openHelpAbout
jsjoeio Mar 16, 2021
071c8e1
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54
jsjoeio Mar 17, 2021
19c2f31
fixup: remove comment in server.ts
jsjoeio Mar 22, 2021
aae17cb
fixup: fix comment in server.ts
jsjoeio Mar 22, 2021
b04104c
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54
jsjoeio Mar 22, 2021
f09ebc0
fix: add no-extra-semi off to eslint config
jsjoeio Mar 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/dev/test-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/dev/update-vscode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 0 additions & 11 deletions docs/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/vscode/.devcontainer/cache/build-cache-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
2 changes: 1 addition & 1 deletion lib/vscode/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions lib/vscode/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 4 additions & 3 deletions lib/vscode/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
},
Expand All @@ -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}/**"
]
Expand Down Expand Up @@ -807,7 +807,6 @@
"**/vs/platform/**/{common,node}/**",
"**/vs/workbench/**/{common,node}/**",
"**/vs/server/**",
"**/vs/code/**/{common,node}/**",
"*" // node modules
]
},
Expand Down Expand Up @@ -985,7 +984,8 @@
"TreeDataProvider",
"CustomEditorProvider",
"CustomReadonlyEditorProvider",
"TerminalLinkProvider"
"TerminalLinkProvider",
"AuthenticationProvider"
]
}
],
Expand All @@ -1009,6 +1009,7 @@
"end",
"expand",
"hide",
"invalidate",
"open",
"override",
"receive",
Expand Down
15 changes: 9 additions & 6 deletions lib/vscode/.github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
2 changes: 0 additions & 2 deletions lib/vscode/.github/actions/build-chat/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions lib/vscode/.github/actions/build-chat/action.yml

This file was deleted.

23 changes: 0 additions & 23 deletions lib/vscode/.github/actions/build-chat/package.json

This file was deleted.

Loading