Archived
1
0
Commit Graph

3208 Commits

Author SHA1 Message Date
Teffen
1b60ef418c
Use upstream server (#4414)
* Flesh out fixes to align with upstream.

* Update route handlers to better reflect fallback behavior.

* Add platform to vscode-reh-web task

Our strategy has been to build once and then recompile native modules
for individual platforms.  It looks like VS Code builds from scratch for
each platform.

But we can target any platform, grab the pre-packaged folder, then
continue with own packaging.

In the future we may want to rework to match upstream.

* Fix issue where workspace args are not parsed.

* Fix issues surrounding opening files within code-server's terminal.

* Readd parent wrapper for hot reload.

* Allow more errors.

* Fix issues surrounding Coder link.

* Add dir creation and fix cli

It seems VS Code explodes when certain directories do not exist so
import the reh agent instead of the server component since it creates
the directories (require patching thus the VS Code update).

Also the CLI (for installing extensions) did not seem to be working so
point that to the same place since it also exports a function for
running that part of the CLI.

* Remove hardcoded VSCODE_DEV=1

This causes VS Code to use the development HTML file.  Move this to the
watch command instead.

I deleted the other stuff before it as well since in the latest main.js
they do not have this code so I figure we should be safe to omit it.

* Fix mismatching commit between client and server

* Mostly restore command-line parity

Restore most everything and remove the added server arguments.  This
will let us add and remove options after later so we can contain the
number of breaking changes.

To accomplish this a hard separation is added between the CLI arguments
and the server arguments.

The separation between user-provided arguments and arguments with
defaults is also made more clear.

The extra directory flags have been left out as they were buggy and
should be implemented upstream although I think there are better
solutions anyway.  locale and install-source are unsupported with the
web remote and are left removed.  It is unclear whether they were used
before anyway.

Some restored flags still need to have their behavior re-implemented.

* Fix static endpoint not emitting 404s

This fixes the last failing unit test.

Fix a missing dependency, add some generic reverse proxy support for the
protocol, and add back a missing nfpm fix.

* Import missing logError

* Fix 403 errors

* Add code-server version to about dialog

* Use user settings to disable welcome page

The workspace setting seems to be recognized but if so it is having no
effect.

* Update VS Code cache step with new build directories

Co-authored-by: Asher <ash@coder.com>
2021-11-09 23:28:31 -06:00
Mauricio Garavaglia
31d5823d10
Escape HTML from messages in error page (#4430)
Co-authored-by: Asher <ash@coder.com>
Co-authored-by: Joe Previte <jjprevite@gmail.com>
2021-11-09 14:39:54 -07:00
LG
605c3c6367
Add a gist of the difference between code-server and Coder (#4419)
* Add a gist of the difference

* Update the gist

* Update README.md

As told by @tmikaeld here: https://github.com/cdr/code-server/discussions/3102#discussioncomment-1565789

* Update docs/README.md

Co-authored-by: Joe Previte <jjprevite@gmail.com>

* `yarn fmt` results

Co-authored-by: Joe Previte <jjprevite@gmail.com>
Co-authored-by: Asher <ash@coder.com>
2021-11-09 10:30:27 -07:00
Matthew Beckett
94b2774f8c
Drop duplicate Helm values from values.yaml (#4450)
* Drop duplicate Helm values from values.yaml

* Use frozen lockfile for test dependencies in CI (#4442)

* Use frozen lockfile for test dependencies in CI

This might be causing more Playwright issues.

* Bump Playwright

Mostly just to trigger a reinstall of dependencies since it is cached
and still failing.

Once updated it errors saying install needs to run so add that too.

* Drop duplicate Helm values from values.yaml

Co-authored-by: Asher <ash@coder.com>
2021-11-05 12:04:52 -07:00
renovate[bot]
4399c7df64
fix(deps): update dependency rotating-file-stream to v3 (#4451)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-05 12:04:10 -07:00
Asher
03651e5e0b
Use frozen lockfile for test dependencies in CI (#4442)
* Use frozen lockfile for test dependencies in CI

This might be causing more Playwright issues.

* Bump Playwright

Mostly just to trigger a reinstall of dependencies since it is cached
and still failing.

Once updated it errors saying install needs to run so add that too.
2021-11-04 11:39:27 -05:00
Joe Previte
219cad1783
Revert "Add linkup command to improve link functionality" (#4439)
This reverts commit 2504f6fce4.
2021-11-03 14:42:14 -07:00
Asher
dcc9cf3dd2
Avoid npx for Playwright dependencies (#4437)
It was causing version mismatch errors.

It might make more sense to have this in the postinstall but for now I
have foregone that as it would be installed in every step including
those that do not run e2e tests.
2021-11-03 16:17:43 -05:00
Joe Previte
13404df267
chore(deps): fix issues identified by audit-ci (#4438)
* fix(deps): ansi-regex issue

* fix(deps): upgrade tar to safe version

* chore(deps): fix vm2 issue

* fix(ci): increase timeout for audit-ci to 15
2021-11-03 14:09:31 -07:00
Joe Previte
13e91dedc1
chore(deps): fix security vulnerabilities (#4428) 2021-11-03 10:32:08 -07:00
renovate[bot]
0cbf1ca58c
chore(deps): update dependency audit-ci to v5 (#4326)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-01 15:15:34 -07:00
Joe Previte
9c861570cd
docs(contrib): update linux requirements (#4328) 2021-11-01 15:15:22 -07:00
Joe Previte
743bab09cd
refactor(ci): only run release workflows on released event (#4288) 2021-11-01 10:06:10 -07:00
renovate[bot]
976891a2e2
chore(deps): update typescript-eslint monorepo to v5 (#4338)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-10-29 16:34:24 -07:00
Joe Previte
946e4e8843
feat(cli): add test for readSocketPath (#4284)
* fix: update isNodeJSErrnoException

* refactor(cli): export and purify readSocketPath

* feat: add tests for readSocketPath

* fix(ci): temporarily disable install deps from cache
2021-10-29 16:03:57 -07:00
Asher
49c9c191b9
Fix script test workflow triggers (#4412) 2021-10-29 14:48:21 -05:00
renovate[bot]
433a3d91dd
fix(deps): update dependency split2 to v4 (#4357)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-10-29 12:32:49 -07:00
renovate[bot]
0100d4c72a
chore(deps): update aquasecurity/trivy-action commit hash to 1ccef26 (#4401)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-10-29 02:12:26 +00:00
Jonathan Yu
aa9755b8fb
Remove unused Lock config (#4304) 2021-10-28 16:21:48 -07:00
Asher
4abc525801
Update cross-build image apt before installing (#4411) 2021-10-28 15:36:21 -07:00
Joe Previte
705e821741
fix(testing): revert change & fix playwright tests (#4310)
* fix(testing): revert change & fix playwright tests

* fix(constants): add type to import statement

* refactor(e2e): delete browser test

This test was originally added to ensure playwright was working.

At this point, we know it works so removing this test because it doesn't help
with anything specific to code-server and only adds unnecessary code to the
codebase plus increases the e2e test job duration.

* chore(e2e): use 1 worker for e2e test

I don't know if it's a resources issue, playwright, or code-server but it seems
like the e2e tests choke when multiple workers are used.

This change is okay because our CI runner only has 2 cores so it would only use
1 worker anyway, but by specifying it in our playwright config, we ensure more
stability in our e2e tests working correctly.

See these PRs:
- https://github.com/cdr/code-server/pull/3263
- https://github.com/cdr/code-server/pull/4310

* revert(vscode): add missing route with redirect

* chore(vscode): update to latest fork

* Touch up compilation step.

* Bump vendor.

* Fix VS Code minification step

* Move ClientConfiguration to common

Common code must not import Node code as it is imported by the browser.

* Ensure lib directory exists before curling

cURL errors now because VS Code was moved and the directory does not
exist.

* Update incorrect e2e test help output

Revert workers change as well; this can be overridden when desired.

* Add back extension compilation step

* Include missing resources in release

This includes a favicon, for example.  I opted to include the entire
directory to make sure we do not miss anything.  Some of the other
stuff looks potentially useful (like completions).

* Set quality property in product configuration

When httpWebWorkerExtensionHostIframe.html is fetched it uses the web
endpoint template (in which we do not include the commit) but if the
quality is not set it prepends the commit to the web endpoint instead.
The new static endpoint does not use/handle commits so this 404s.

Long-term we might want to make the new static endpoint use commits like
the old one but we will also need to update the various other static
URLs to include the commit.

For now I just fixed this by adding the quality since:
  1. Probably faster than trying to find and update all static uses.
  2. VS Code probably expects it anyway.
  3. Gives us better control over the endpoint.

* Update VS Code

This fixes several build issues.

* Bump vscode.

* Bump.

* Bump.

* Use CLI directly.

* Update tests to reflect new upstream behavior.

* Move unit tests to after the build

Our code has new dependencies on VS Code that are pulled in when the
unit tests run.  Because of this we need to build VS Code before running
the unit tests (as it only pulls built code).

* Upgrade proxy-agent dependencies

This resolves a security report with one of its dependencies (vm2).

* Symlink VS Code output directory before unit tests

This is necessary now that we import from the out directory.

* Fix issues surrounding persistent processes between tests.

* Update VS Code cache directories

These were renamed so the cached paths need to be updated.  I changed
the key as well to force a rebuild.

* Move test symlink to script

This way it works for local testing as well.

I had to use out-build instead of out-vscode-server-min because Jest
throws some obscure error about a handlebars haste map.

* Fix listening on a socket

* Update VS Code

It contains fixes for missing files in the build.

* Standardize disposals

* Dispose HTTP server

Shares code with the test HTTP server.  For now it is a function but
maybe we should make it a class that is extended by tests.

* Dispose app on exit

* Fix logging link errors

Unfortunately the logger currently chokes when provided with error
objects.

Also for some reason the bracketed text was not displaying...

* Update regex used by e2e to extract address

The address was recently changed to use URL which seems to add a
trailing slash when using toString, causing the regex match to fail.

* Log browser console in e2e tests

* Add base back to login page

This is used to set cookies when using a base path.

* Remove login page test

The file this was testing no longer exists.

* Use path.posix for static base

Since this is a web path and not platform-dependent.

* Add test for invalid password

Co-authored-by: Teffen Ellis <teffen@nirri.us>
Co-authored-by: Asher <ash@coder.com>
2021-10-28 15:27:17 -05:00
Mr. Blogger
0e97a94acf
Replace nodejs with nodejs-lts in Termux docs (#4336)
nodejs installs v16 which is not compatible.  nodejs-lts currently uses v14.
2021-10-25 11:14:37 -05:00
Asher
3520ad2286
Mention that Safari needs TLS 1.2 (#4346)
* Mention that Safari needs TLS 1.2

https://github.com/cdr/code-server/issues/3850

* Delete duplicated guide sections
2021-10-18 10:31:30 -05:00
McChen
ad17c7dc8e
docs: fix nfpm link in contributing (#4369)
Co-authored-by: chenjiahao <chenjiahao@jd.com>
2021-10-18 10:25:42 -05:00
Joe Previte
271bc06754
Merge pull request #4309 from cdr/jsjoeio-test-monday
feat(cli): add tests for password, hashed-password
2021-10-05 11:14:07 -07:00
Ben Potter
dfc505b977
Merge pull request #4307 from cdr/bpmct/comparison
update comparisons in FAQ
2021-10-05 12:24:58 -05:00
Ben Potter
ee1de79af6
fix weird format 2021-10-05 11:40:57 -05:00
Ben Potter
fa6f47965a
Update docs/FAQ.md
Co-authored-by: Ashley McClelland <ashley@coder.com>
2021-10-05 11:31:40 -05:00
Ben Potter
1af83a3c56
Update docs/FAQ.md
Co-authored-by: Ashley McClelland <ashley@coder.com>
2021-10-05 11:31:34 -05:00
Ben Potter
8745f1aa63
Update docs/FAQ.md
Co-authored-by: Ashley McClelland <ashley@coder.com>
2021-10-05 11:31:29 -05:00
Ben Potter
bb1799ba04
Update docs/FAQ.md
Co-authored-by: Ashley McClelland <ashley@coder.com>
2021-10-05 11:31:24 -05:00
Ben Potter
70fbfc7ada
Update docs/FAQ.md
Co-authored-by: Ashley McClelland <ashley@coder.com>
2021-10-05 11:31:17 -05:00
Tian Jian
59f667ec14
Fix: use pipe to spawn child process to re-enable file logging (#4293)
We pipe the child's stdout and stderr to the log file (and to the parent's streams) but since we used `inherit` for `stdio` this caused the child to use the parent's streams directly which made `child.stdout` and `child.stderr` non-existent and thus we had no file logging.

Using `pipe` creates stdin and stderr on the child.
2021-10-05 10:55:40 -05:00
Ben Potter
816152ddbd
fix typo 2021-10-04 17:41:36 -05:00
Joe Previte
45319ec648
woo! 2021-10-04 15:04:07 -07:00
Joe Previte
e588f8b0b0
feat(cli): add tests for password, hashed-password 2021-10-04 14:51:14 -07:00
Ben Potter
7c26a82a17
format 2021-10-04 14:57:58 -05:00
Ben Potter
75e44fdc84
update comparisons in FAQ 2021-10-04 14:48:31 -05:00
Joe Previte
8a4ed5a2e0
Merge pull request #4306 from cdr/jsjoeio-fix-broken-tests
fix: revert CI change + fix broken tests
2021-10-04 12:20:31 -07:00
Joe Previte
a8d873f9f8
refactor(ci): fix unit tests job 2021-10-04 12:07:45 -07:00
Joe Previte
7183b5a43e
chore(testing): fix casing in error messsage 2021-10-04 12:06:33 -07:00
Joe Previte
8136769b66
fix: close vscodeServer on server close if defined 2021-10-04 12:06:12 -07:00
Teffen Ellis
672038c6af Fix issue where marketplace is undefined.
- Fix error logging from child process.
2021-10-04 13:26:16 -04:00
Joe Previte
2d7aeb5bf9
Merge pull request #4290 from cdr/jsjoeio-vscode
chore(vscode): update to latest commit of fork
2021-10-01 14:57:02 -07:00
Joe Previte
f342c327f3
chore(vscode): update to latest commit of fork 2021-10-01 14:47:20 -07:00
Joe Previte
4619786019
Merge pull request #4274 from cdr/jsjoeio-testing-guidelines
docs: update section around testing
2021-10-01 11:15:15 -07:00
Joe Previte
1dfcd0448e
Merge pull request #4273 from cdr/jsjoeio-bump-helm-chart
chore(helm-chart): bump to 1.0.5
2021-10-01 11:10:21 -07:00
Joe Previte
48ce49eec8
Merge pull request #4281 from toddewilliams/patch-1
Update collaboration.md
2021-09-30 16:43:48 -07:00
Teffen Ellis
d8c344beda Refactor vscode endpoints to use fork directly. 2021-09-30 19:14:17 -04:00
Teffen Ellis
beebf53adc Add linkup command to improve link functionality 2021-09-30 19:14:17 -04:00