chore: upgrade Code to 1.74.1 #5909
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I don't know what the impact of this is but in microsoft/vscode@192c67d they removed the usage of `require` in `server.main.ts`. More details in PR: microsoft/vscode#165831
If my logic is right, then this patch is now simplified thanks to this: https://github.com/microsoft/vscode/blob/1.74.1/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts#L1238
jsjoeio
commented
Dec 19, 2022
Comment on lines
-25
to
-28
| + if (installed.type !== ExtensionType.User) { | ||
| + // Never update builtin extensions. | ||
| + continue; | ||
| + } |
There was a problem hiding this comment.
Unsure if we still need this. See 6751c82
cc @code-asher
There was a problem hiding this comment.
I think you are right! One way to see is if on load Code downloads a bunch of builtin extensions into the extensions dir.
| - content="default-src 'none'; script-src 'sha256-lC8sxUeeYqUtmkCpPt/OX/HQdE0JbHG1Z3dzrilsRU0=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> | ||
| + content="default-src 'none'; script-src 'sha256-/9/YQU12wvTeVXCsIGB4shLwdWrMceCpKojfkloNjPU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> | ||
| - content="default-src 'none'; script-src 'sha256-6s2fEapj0jmA7ZDjzz23Uv4xLlM7KX3p9DYidJX7Zmk=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> | ||
| + content="default-src 'none'; script-src 'sha256-6/HBKMr5Cr24xXtQ+U/BxvVfCvBLYE55u8Jq3j/nzcI=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> |
There was a problem hiding this comment.
I checked webviews via Markdown Preview and Simple Browser. Unless the HTML files were cached, I didn't see any issues. I will double-check.
Downloading @vscode/ripgrep is failing only in CI so adding this environment variable to see if it increases the rate limit. Ref: https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
code-asher
reviewed
Dec 19, 2022
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #5909 +/- ##
==========================================
- Coverage 74.94% 71.62% -3.32%
==========================================
Files 30 30
Lines 1688 1688
Branches 371 371
==========================================
- Hits 1265 1209 -56
- Misses 361 401 +40
- Partials 62 78 +16
Continue to review full report at Codecov.
|
This reverts commit 3999279.
|
Blocked by #5911 |
* wip: migrate vscode tests to e2e * feat: add codeWorkspace to global setup * refactor: only use dir in spawn when we should * wip: migrate more tests * refactor: move all vscode tests to e2e * refactor(ci): move unit to own job * fixup: add codecov to unit test step * Update test/e2e/models/CodeServer.ts * Update test/e2e/models/CodeServer.ts * docs: add note about intercept requests * refactor: rm unused clean() calls * refactor: delete duplicate test * refactor: update 'should not redirect' test
code-asher
reviewed
Dec 21, 2022
This reverts commit a059129.
code-asher
approved these changes
Dec 22, 2022
code-asher
reviewed
Dec 22, 2022
| @@ -8,7 +8,7 @@ To test: | |||
| 2. Open code-server | |||
| 3. Open terminal | |||
| 4. Open another code-server window | |||
| 5. Run code-server with a file or directory argument | |||
| 5. Run node ./out/node/entry.js with a file or directory argument | |||
There was a problem hiding this comment.
FYI node . can be used as a shortcut since it will use the main entry in package.json which points to out/node/entry.js.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR upgrades Code to 1.74.1
Patches tested manually
Fixes #5846