bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,332 Commits 14 Branches 170 Tags 99 MiB
Commit Graph

212 Commits

Author SHA1 Message Date
Joe Previte ccf2fe2a2e
fix: conflicts in remote.ts 
Looks like they modified a few of the cases related to Reconnection.
 2021-02-25 12:23:14 -07:00
Joe Previte 502323a9c8
fix: conflicts with remoteAgentConnection 
As Asher pointed out, looks like it makes #2381 obsolete.

Hope this all works.
 2021-02-25 12:19:21 -07:00
Joe Previte f214235e2d
fix: resolve conflicts in build/lib/node.ts 
It looks like they added a few more variables and cleaned this file up.

I removed the yarn and yarnRc stuff. Hope that doesn't break anything.
 2021-02-25 12:08:12 -07:00
Joe Previte 40d0c88341
fix: extHostExtensionService 
Looks like they modified the function signature for _loadCommonJSModule.

I believe the first param is now the extensionId or null. Probably for logging
reason guessing.
 2021-02-25 12:02:35 -07:00
Joe Previte 2bd9b6e1bf
fix: update web.main.ts 
Looks like they added two lines in the open method.
1. Logging for workbench configuration
2. Window - creating a BrowserWindow
 2021-02-25 11:59:25 -07:00
Joe Previte ce1a8c89dd
fix: postinstall.js conflicts 
Again, hope this was correct.

It looks like they moved around a few lines here.

If there are issues with dependencies not installing, check here.
 2021-02-25 11:57:35 -07:00
Joe Previte 9e61540840
fix: resolve conflicts in package.json 
I hope this was done correctly.

It upgraded a few packages, we left out the electron packages and it added two
resolutions.
 2021-02-25 11:52:27 -07:00
Joe Previte b952616725
fix: resolve conflict browserSocketFactory 2021-02-25 11:47:02 -07:00
Joe Previte 3fd6187503
fix: update import in extensionsViewlet 2021-02-25 11:46:25 -07:00
Joe Previte f255cdb2cc
fix: update text for Extension Host 2021-02-25 11:44:37 -07:00
Joe Previte 262963c9ec
fix: resolve conflict in extensionHostProcessSetup.ts 
From what I can tell, they added these `performance.mark` calls. Not sure
exactly what they do, but my guess is they're supposed to help with measuring
extension performance?
 2021-02-25 11:42:42 -07:00
Joe Previte 7bf1fd979e
fix: resolve conflicts in yarn.lock 2021-02-25 11:41:34 -07:00
Joe Previte 2c5c48525e
fix: resolve conflicts in .eslintignore 2021-02-25 11:36:01 -07:00
Joe Previte c94697da98
fix: resolve conflicts in .gitignore 2021-02-25 11:35:23 -07:00
Joe Previte eae5d8c807
chore(vscode): update to 1.53.2 
These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
 2021-02-25 11:27:27 -07:00
Adrian Soucup 271c260a36
Fix terminal process leak when closing the window. (#2723) 2021-02-22 13:32:50 -06:00
Joe Previte 8302d2fe8e
fix(vscode): update links in welcome page 2021-02-18 11:21:27 -07:00
Joe Previte 43d0d8e919
fix: update link in extensions helper 2021-02-18 10:54:45 -07:00
Asher 898565e16a
Resolve browser telemetry conflict 2021-02-09 11:11:38 -06:00
Asher 948e01fb27
Bundle jpg from VS Code 
These seem to be used in some "getting started" page but I'm not sure
where it is.
 2021-02-09 11:11:17 -06:00
Asher 068e399bf2
Remove Node browser shim 
We used this to run vscodevim in the browser but it now has a version
that is able to run as a VS Code web extension. This does require an
update to our marketplace, however.
 2021-02-09 10:40:14 -06:00
Asher a65231808a
Fall back to remote extension server on web 2021-02-09 10:39:35 -06:00
Asher a6d4b24733
Resolve extensions viewlet conflicts 2021-02-09 10:39:08 -06:00
Asher f8d546bdc6
Remove hidden home CSS 
Now that you can customize the home it's probably fine to show it.
There's also an option for users to hide it.
 2021-02-09 10:38:14 -06:00
Asher cc59279f11
Remove GoHomeContributor 
It's probably registered in some other way now.
 2021-02-09 10:37:03 -06:00
Asher 89c38d3554
Update storage promise 
A new doStore was added.
 2021-02-09 10:36:39 -06:00
Asher 14c96d78ef
Remove added logLevel 
We've always had this.
 2021-02-09 10:33:11 -06:00
Asher 80d50057fc
Remove electron and resolve yarn.lock conflict 2021-02-09 10:32:27 -06:00
Asher 0a1a8fe4fe
Remove new .yarnrc 2021-02-09 10:19:24 -06:00
Asher 9221efc104
Restore Node check 
Since we're following the VS Code allowed version range now to prevent
bugs use the new range instead of commenting it out.
 2021-02-09 10:09:45 -06:00
Asher 859de79d97 Update to VS Code 1.52.1 2021-02-09 16:08:37 +00:00
Dean Sheather 1fcb0c3ddd
Merge pull request #2641 from cdr/send-ready-to-all-origins 
Send 'loaded' event to all parent origins
 2021-01-27 05:52:13 +10:00
Dean Sheather 42dcfc94ab
Send 'loaded' event to all parent origins 2021-01-27 05:06:04 +10:00
Joe Previte 883dd13850
refactor: move jest and add package.json to /test 2021-01-21 14:06:49 -07:00
Joe Previte 0a07d67c8d
fix: prevent mocha/jest types conlict 
Modify the tsconfig.json in lib/vscode/src/build.

This adds the flag skipLibCheck: true to tell TypeScript
to not type-check the declaration files at build time.

We need to add this because otherwise it checks the declaration
files and reports an error of duplicate type definitions
because we use Jest for our tests and they use Mocha and they
both use the global namespace "test" in their .d.ts files.
 2021-01-21 10:11:09 -07:00
Joe Previte 500ba92466
fix: style links with correct colors 2021-01-14 22:40:33 +00:00
Joe Previte d9508946b5
feat: add helper header above extensions search 
Add a short message above the search box on the Extensions panel. This
helps explain the extension divergence to the user.

If they click dismiss, it stores an item in localStorage to prevent the
message from showing up on subsequent loads.

Co-authored-by: Asher <ash@coder.com>
 2021-01-14 22:40:19 +00:00
Asher f763319bc3
Merge pull request #2160 from cdr/github-auth 
Fix GitHub auth
 2020-12-18 10:54:51 -08:00
Asher c7baf5d04a
Merge pull request #2482 from cdr/asar 
Symlink node_modules.asar to node_modules in lib/vscode
 2020-12-18 10:54:36 -08:00
Anmol Sethi cb446666fa
Merge pull request #2487 from cdr/proxy-docs-86d4 
proxy-agent: Use proxy-from-env and add docs
 2020-12-18 13:06:47 -05:00
Anmol Sethi 003225d2cd
vscode: Remove electron dependency but keep types 
Electron doesn't support FreeBSD.
 2020-12-18 11:52:08 -05:00
Anmol Sethi ae902b9dd1
proxy_agent: Use proxy-from-env for robustness 
Now we support pretty much every variable under the sun along with
$NO_PROXY all correctly and with minimal code on our end.
 2020-12-18 11:10:07 -05:00
Asher 3cc74ccd79
Point to our auth relay 2020-12-17 15:49:37 -06:00
Asher 121a520447
Symlink node_modules.asar to node_modules in lib/vscode 
Closes #2197.
 2020-12-17 15:48:19 -06:00
Joe Previte 51a2a2ad2d
feat: apply patch after setting up subtree 2020-12-15 15:53:52 -07:00
Joe Previte 41bee49d07 Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
Joe Previte 6c5c22ea8e
chore: remove submodule 2020-12-15 15:49:47 -07:00
Asher e28c9ab287
Update VS Code to 1.51.1 2020-11-19 15:51:23 -06:00
Asher e3699cf258
Update VS Code to 1.50.0 
- The .js build files are no longer committed so they're gone.
- ParsedArgs and EnvironmentService are now NativeParsedArgs and
  NativeEnvironmentService.
- Interface for environment service was moved.
- getPathFromAmdModule was deprecated.
 2020-10-14 17:11:22 -05:00
Asher 402f5ebd77
Update VS code to 1.49.3 (#2081) 2020-10-07 12:37:37 -05:00
Asher ce2eaf2f10
Update to VS Code 1.48.2 (#2000) 2020-08-26 10:18:47 -05:00
Asher e237589f2e
Update VS Code to 1.48.0 (#1982) 2020-08-25 13:06:41 -05:00
Asher de8e9804ad
Update to VS Code 1.47.2 2020-07-21 13:16:44 -05:00
Asher 641b36be6a
Update VS Code to 1.47.0 2020-07-09 17:04:11 -05:00
Asher a06522f254
Update VS Code to 1.46.1 2020-07-07 17:01:23 -05:00
Anmol Sethi ce9d14d55e
Pin to vscode 1.45.1 
1.46 isn't released yet and has bugs.

Closes #1667
 2020-05-18 17:34:22 -04:00
Asher 4875f6aa87
Update VS Code to fix infinite refresh 
Fixes #1581.
 2020-05-05 12:33:09 -05:00
Asher caa299b60d
Update VS Code to 1.44.2 2020-04-21 14:25:27 -05:00
Asher e480f6527e
Update VS Code to 1.43.2 2020-04-01 15:27:28 -05:00
Asher b52fbb4cb9
Catch error when openssl isn't installed 2020-03-16 15:14:54 -05:00
Asher ac4f2b8215
Update VS Code to 1.42.0 2020-02-13 11:55:15 -06:00
Asher b29346ecdf
Implement new structure 2020-02-04 14:31:44 -06:00