chore: move to patches #4997

code-asher · 2022-03-17T18:38:15Z

Still a bit to go but opening the PR now for hype.

Closes #3462
Closes #4687
Fixes #4826 (I changed the update check code a bit so this is now fixed)
Fixes #4994

code-asher · 2022-03-18T20:55:35Z

This is not a straight conversion from our existing fork modifications, I streamlined a bunch of things, removed some things that become unnecessary in 1.64, and moved what I could out of the patches.

codecov · 2022-03-18T22:28:07Z

Codecov Report

Merging #4997 (16834c1) into main (be72787) will decrease coverage by 0.28%.
The diff coverage is 34.48%.

@@            Coverage Diff             @@
##             main    #4997      +/-   ##
==========================================
- Coverage   71.58%   71.30%   -0.29%     
==========================================
  Files          29       30       +1     
  Lines        1675     1683       +8     
  Branches      373      373              
==========================================
+ Hits         1199     1200       +1     
- Misses        405      413       +8     
+ Partials       71       70       -1

Impacted Files	Coverage Δ
src/browser/serviceWorker.ts	`0.00% <0.00%> (ø)`
src/node/entry.ts	`0.00% <0.00%> (ø)`
src/node/main.ts	`50.00% <22.22%> (ø)`
src/node/routes/vscode.ts	`83.33% <62.50%> (-0.22%)`	⬇️
src/node/routes/index.ts	`80.80% <66.66%> (-0.45%)`	⬇️
src/node/cli.ts	`91.60% <100.00%> (ø)`

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 be72787...16834c1. Read the comment docs.

code-asher · 2022-03-21T21:35:01Z

I think I got everything. Let me know if any patches appear to be missing.

jsjoeio

I think overall, this looks awesome! Most of my comments are non-blocking, but a few things we need to change for this to be ready.

I'm also going to test this locally and follow the docs to make sure it sounds good

Thanks for taking this on! 🙌🏼

src/node/cli.ts

src/node/main.ts

ci/build/build-packages.sh

docs/CONTRIBUTING.md

patches/insecure-notification.diff

src/node/routes/index.ts

jsjoeio · 2022-03-22T18:55:55Z

Re: failing CI checks

[non-blocking] Docs preview: @BrunoQuaresma any ideas why this is failing on forks? Might have to re-introduce skip
Code scanning - not something new with this code so I will dimiss
codecov - 0.29% decrease. I don't want to block this so @code-asher what if you follow-up with some new tests in a separate PR? (just to cover difference)

jsjoeio · 2022-03-22T19:28:03Z

Testing

Tested locally in dev mode and works very smoothly!

Tested a build on macOS and that worked as well

jsjoeio

Nice work!!!

This will be easier to maintain than to have it as a patch.

Using a flag means we will not need to patch it out. I think this is new from 1.64?

This way we do not have to patch it.

Instead of the root one. This contains fewer dependencies.

This way we will not have to patch Code to make this work and I think it makes sense to let Code handle the request. If we do want to handle errors we can do it cleanly by patching their error handler to throw instead.

This way we will not have to patch it.

- Switch submodule to track upstream - Add quilt to the process - Add patches The node-* ignore was ignoring one of the diffs so I removed it. This was added when we were curling Node as node-v{version}-darwin-x64 for the macOS build but this no longer happens (we use the Node action to install a specific version now so we just use the system-wide Node).

Previously it was only ignoring linux-x64.

Patching is required first because we remove the .yarnrc which affects the yarn install and `patch` should be `push`.

* Move integration types into code-server This will be easier to maintain than to have it as a patch. * Disable connection token Using a flag means we will not need to patch it out. I think this is new from 1.64? * Add product.json to build process This way we do not have to patch it. * Ship with remote agent package.json Instead of the root one. This contains fewer dependencies. * Let Code handle errors This way we will not have to patch Code to make this work and I think it makes sense to let Code handle the request. If we do want to handle errors we can do it cleanly by patching their error handler to throw instead. * Move manifest override into code-server This way we will not have to patch it. * Move to patches - Switch submodule to track upstream - Add quilt to the process - Add patches The node-* ignore was ignoring one of the diffs so I removed it. This was added when we were curling Node as node-v{version}-darwin-x64 for the macOS build but this no longer happens (we use the Node action to install a specific version now so we just use the system-wide Node). * Use pre-packaged Code

code-asher changed the title ~~Move to patches~~ chore: move to patches Mar 17, 2022

code-asher force-pushed the patches branch 2 times, most recently from 0c272b0 to 44284b9 Compare March 18, 2022 00:47

jsjoeio mentioned this pull request Mar 18, 2022

[Bug]: PWA icons do not load on iOS/iPadOS #4994

Closed

3 tasks

code-asher force-pushed the patches branch 3 times, most recently from 9bf1bfd to d6a4f33 Compare March 18, 2022 20:54

code-asher marked this pull request as ready for review March 18, 2022 20:54

code-asher requested a review from a team March 18, 2022 20:54

code-asher force-pushed the patches branch 4 times, most recently from 44d94e0 to a35591a Compare March 18, 2022 22:17

code-asher force-pushed the patches branch 7 times, most recently from c939a7f to 45dd14b Compare March 21, 2022 18:43

code-asher marked this pull request as draft March 21, 2022 20:07

code-asher force-pushed the patches branch 4 times, most recently from a681fc1 to 5ba8dde Compare March 21, 2022 21:34

code-asher marked this pull request as ready for review March 21, 2022 21:34

jsjoeio suggested changes Mar 21, 2022

View reviewed changes

code-asher force-pushed the patches branch from d6231d7 to 6daae5c Compare March 22, 2022 15:07

jsjoeio mentioned this pull request Mar 22, 2022

Web: Support for translations/language packs microsoft/vscode#82595

Closed

jsjoeio assigned code-asher Mar 22, 2022

jsjoeio approved these changes Mar 22, 2022

View reviewed changes

code-asher added 18 commits March 22, 2022 19:42

Move integration types into code-server

e52ebe0

This will be easier to maintain than to have it as a patch.

Disable connection token

2d4f1b1

Using a flag means we will not need to patch it out. I think this is new from 1.64?

Add product.json to build process

52ca450

This way we do not have to patch it.

Ship with remote agent package.json

1758468

Instead of the root one. This contains fewer dependencies.

Let Code handle errors

430448b

This way we will not have to patch Code to make this work and I think it makes sense to let Code handle the request. If we do want to handle errors we can do it cleanly by patching their error handler to throw instead.

Move manifest override into code-server

8f1d5a6

This way we will not have to patch it.

Use pre-packaged Code

5bc0088

Ignore all packaged directories

284d4bc

Previously it was only ignoring linux-x64.

Rename SpawnCli type to SpawnCodeCli

1e933a7

Replace cdr in product links with coder

c5af3f0

Add comments to types pulled from Code

7c85c75

Add links to matching Code types

7673f70

Update Code's server arguments

41ec493

Update CLI test with new default

0e45f00

Add comment on Service-Worker-Allowed header

38a3e14

fixup! Update CLI test with new default

1f9ed36

Fix incorrect contributing steps

16834c1

Patching is required first because we remove the .yarnrc which affects the yarn install and `patch` should be `push`.

code-asher force-pushed the patches branch from 6daae5c to 16834c1 Compare March 22, 2022 19:43

code-asher merged commit a1af9e2 into coder:main Mar 22, 2022

code-asher deleted the patches branch March 22, 2022 20:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: move to patches #4997

chore: move to patches #4997

code-asher commented Mar 17, 2022 •

edited

Loading

code-asher commented Mar 18, 2022 •

edited

Loading

codecov bot commented Mar 18, 2022 •

edited

Loading

code-asher commented Mar 21, 2022

jsjoeio left a comment •

edited

Loading

jsjoeio commented Mar 22, 2022

jsjoeio commented Mar 22, 2022 •

edited

Loading

jsjoeio left a comment

chore: move to patches #4997

chore: move to patches #4997

Conversation

code-asher commented Mar 17, 2022 • edited Loading

code-asher commented Mar 18, 2022 • edited Loading

codecov bot commented Mar 18, 2022 • edited Loading

Codecov Report

code-asher commented Mar 21, 2022

jsjoeio left a comment • edited Loading

Choose a reason for hiding this comment

jsjoeio commented Mar 22, 2022

jsjoeio commented Mar 22, 2022 • edited Loading

Testing

jsjoeio left a comment

Choose a reason for hiding this comment

code-asher commented Mar 17, 2022 •

edited

Loading

code-asher commented Mar 18, 2022 •

edited

Loading

codecov bot commented Mar 18, 2022 •

edited

Loading

jsjoeio left a comment •

edited

Loading

jsjoeio commented Mar 22, 2022 •

edited

Loading