chore: upgrade Code to 1.73.0 #5751

jsjoeio · 2022-11-03T21:05:26Z

Description

This upgrades Code to 1.73.0 via the tag.

Patches tested manually

TODOs

fix telemetry
fix update-check
fix failing unit tests

Fixes #5749

patches/base-path.diff

jsjoeio · 2022-11-03T22:19:23Z

patches/display-language.diff

+ 	async getBuiltInExtensionTranslationsUri(id: string): Promise<URI | undefined> {
+@@ -73,6 +79,6 @@ export class WebLanguagePacksService ext
+
+ 	// Web doesn't have a concept of language packs, so we just return an empty array
 	getInstalledLanguages(): Promise<ILanguagePackItem[]> {
 -		return Promise.resolve([]);
 +		return this.languagePackService.getInstalledLanguages()


This was the only change I was hesitant about. Hope I did it right. I will test them all after first review.

jsjoeio · 2022-11-03T22:20:22Z

patches/local-storage.diff

-@@ -53,7 +53,14 @@ export class BrowserWorkbenchEnvironment
- 	get logFile(): URI { return joinPath(this.logsHome, 'window.log'); }
+@@ -78,7 +78,14 @@ export class BrowserWorkbenchEnvironment
+ 	get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }

 	@memoize
 -	get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); }


Hmm...this seems like it got dropped unintentionally. Guessing I'll need to fixup this.

Okay doube-checked: seems fine as is.

patches/logout.diff

patches/marketplace.diff

patches/series

patches/telemetry.diff

patches/update-check.diff

jsjoeio · 2022-11-03T22:22:23Z

patches/webview.diff

-		content="default-src 'none'; script-src 'sha256-wwaDxsm1+SKIUb5YJXiZlYMyV7QPB8+zd6HPcTjigZs=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
-+		content="default-src 'none'; script-src 'sha256-IZkGO4jZeUn7pzM6pBZCZc9bUYm8oVNV3z8zEa8gxlk=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+-		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';">


From testing the markdown preview and simple browser, it seemed like these were okay.

jsjoeio · 2022-11-03T23:03:54Z

Weird CI failures:

error CodeServerRouteWrapper: TypeError: this.args.log?.find is not a function

Probably related to some of the patch work I need to address (i.e. unintended changes).

This upgrades Code to 1.73.0 via the tag.

Only change here was they moved lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts so I had to update it. Code still looks the same though.

Simlar to a previous patch, the location of lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts changed so I had to update this patch. No changes to code itself.

I believe there was only one to update but I may have missed one.

quilt couldn't apply it so I had to add one change in manually to lib/vscode/src/vs/server/node/serverEnvironmentService.ts

This kinda got removed but I added it back in.

This was accepted upstream! :tada

jsjoeio · 2022-11-08T20:23:50Z

Hmm...can't get the update-check to trigger 🤔 @code-asher do you mind testing?

jsjoeio · 2022-11-08T21:05:14Z

Hmm testing telemetry, I'm not seeing the logs when I set CS_TELEMETRY_URL and use RequestBin

Seems like upstream now uses a string[] for this. For now, support string. See microsoft/vscode@2b50ab0

This reverts commit 78c02a1.

github-actions · 2022-11-08T22:11:42Z

✨ code-server dev build published to npm for PR #5751!

Last publish status: success
Commit: 0b8ddc8

To install in a local project, run:

npm install @coder/code-server-pr@5751

To install globally, run:

npm install -g @coder/code-server-pr@5751

codecov · 2022-11-08T22:12:03Z

Codecov Report

Merging #5751 (0b8ddc8) into main (c885c96) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5751      +/-   ##
==========================================
+ Coverage   72.65%   72.66%   +0.01%     
==========================================
  Files          30       30              
  Lines        1682     1683       +1     
  Branches      369      370       +1     
==========================================
+ Hits         1222     1223       +1     
  Misses        397      397              
  Partials       63       63

Impacted Files	Coverage Δ
src/node/cli.ts	`91.76% <100.00%> (+0.03%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c885c96...0b8ddc8. Read the comment docs.

This was changed upstream from `string` to `string[]` so now we convert to an array in `toCodeArgs`. See 78c02a1

jsjoeio · 2022-11-09T20:25:00Z

Checked, all is good now!

code-asher

Nicely done!

jsjoeio self-assigned this Nov 3, 2022

jsjoeio force-pushed the jsjoeio/code-173 branch from 451d14a to 6b89422 Compare November 3, 2022 22:17

jsjoeio commented Nov 3, 2022

View reviewed changes

jsjoeio added 18 commits November 8, 2022 10:39

chore: upgrade Code to 1.73.0

568f0ac

This upgrades Code to 1.73.0 via the tag.

chore: refresh integration patch

134ab92

chore: clean up base-path patch

91575e1

Only change here was they moved lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts so I had to update it. Code still looks the same though.

chore: refresh proposed-api patch

95bfeac

chore: update marketplace patch

49fa8a2

Simlar to a previous patch, the location of lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts changed so I had to update this patch. No changes to code itself.

chore: update hash in webview patch

f58d91e

I believe there was only one to update but I may have missed one.

chore: refresh disable-builtin-ext-update.diff

9ee00a6

chore: refresh update-check

bf8b8e0

quilt couldn't apply it so I had to add one change in manually to lib/vscode/src/vs/server/node/serverEnvironmentService.ts

chore: refresh logout patch

2476e41

chore: refresh proxy-uri patch

cd0d1d2

chore: refresh local-storage patch

44fa1f3

chore: refresh sourcemaps patch

c2c6e37

chore: refresh disable-downloads patch

d888456

chore: refresh telemetry patch

8c15dfa

refactor: re-apply display-language patch

fd3427b

This kinda got removed but I added it back in.

refactor: drop exec-argv patch

a2860d2

This was accepted upstream! :tada

chore: refresh getting-started patch

0c149bf

fixup: add missing slash in marketplace

8b57956

jsjoeio force-pushed the jsjoeio/code-173 branch from 6b89422 to 8b57956 Compare November 8, 2022 17:50

jsjoeio added 3 commits November 8, 2022 14:51

fixup: update notes proposed-api patch

b53ca8a

fixup: support this.args.log as string

78c02a1

Seems like upstream now uses a string[] for this. For now, support string. See microsoft/vscode@2b50ab0

Revert "fixup: support this.args.log as string"

43e71fb

This reverts commit 78c02a1.

jsjoeio temporarily deployed to npm November 8, 2022 22:11 Inactive

fixup!: add log to toCodeArgs

504a56f

This was changed upstream from `string` to `string[]` so now we convert to an array in `toCodeArgs`. See 78c02a1

jsjoeio temporarily deployed to npm November 8, 2022 22:32 Inactive

Merge branch 'main' into jsjoeio/code-173

0760db7

jsjoeio temporarily deployed to npm November 9, 2022 19:15 Inactive

fixup: update telemetry description

957635a

jsjoeio marked this pull request as ready for review November 9, 2022 20:25

jsjoeio requested a review from a team as a code owner November 9, 2022 20:25

jsjoeio temporarily deployed to npm November 9, 2022 20:37 Inactive

jsjoeio requested a review from code-asher November 9, 2022 20:45

code-asher approved these changes Nov 9, 2022

View reviewed changes

Merge branch 'main' into jsjoeio/code-173

0b8ddc8

jsjoeio added the rebase when passing label Nov 9, 2022

jsjoeio temporarily deployed to npm November 9, 2022 21:11 Inactive

jsjoeio temporarily deployed to npm November 9, 2022 21:34 Inactive

jsjoeio temporarily deployed to npm November 9, 2022 21:59 Inactive

repo-ranger bot merged commit 3367e1a into main Nov 9, 2022

repo-ranger bot deleted the jsjoeio/code-173 branch November 9, 2022 22:10

jsjoeio mentioned this pull request Nov 10, 2022

[Bug]: Unable to run project on macOS 13 #5770

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: upgrade Code to 1.73.0 #5751

chore: upgrade Code to 1.73.0 #5751

jsjoeio commented Nov 3, 2022 •

edited

Loading

jsjoeio Nov 3, 2022

jsjoeio Nov 3, 2022

jsjoeio Nov 8, 2022

jsjoeio Nov 3, 2022

jsjoeio commented Nov 3, 2022

jsjoeio commented Nov 8, 2022

jsjoeio commented Nov 8, 2022

github-actions bot commented Nov 8, 2022 •

edited

Loading

codecov bot commented Nov 8, 2022 •

edited

Loading

jsjoeio commented Nov 9, 2022

code-asher left a comment

chore: upgrade Code to 1.73.0 #5751

chore: upgrade Code to 1.73.0 #5751

Conversation

jsjoeio commented Nov 3, 2022 • edited Loading

Description

Patches tested manually

TODOs

jsjoeio Nov 3, 2022

Choose a reason for hiding this comment

jsjoeio Nov 3, 2022

Choose a reason for hiding this comment

jsjoeio Nov 8, 2022

Choose a reason for hiding this comment

jsjoeio Nov 3, 2022

Choose a reason for hiding this comment

jsjoeio commented Nov 3, 2022

jsjoeio commented Nov 8, 2022

jsjoeio commented Nov 8, 2022

github-actions bot commented Nov 8, 2022 • edited Loading

codecov bot commented Nov 8, 2022 • edited Loading

Codecov Report

jsjoeio commented Nov 9, 2022

code-asher left a comment

Choose a reason for hiding this comment

jsjoeio commented Nov 3, 2022 •

edited

Loading

github-actions bot commented Nov 8, 2022 •

edited

Loading

codecov bot commented Nov 8, 2022 •

edited

Loading