Commit Graph

2561 Commits

Author SHA1 Message Date
Joe Previte e7ce4f888f
Merge pull request #3301 from cdr/dependabot/npm_and_yarn/lib/vscode/build/lodash-4.17.21
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode/build
2021-05-07 11:02:20 -07:00
Joe Previte 0e9f7de64b
Merge pull request #3307 from cdr/dependabot/github_actions/aquasecurity/trivy-action-341f810bd602419f966a081da3f4debedc3e5c8e
chore(deps): bump aquasecurity/trivy-action from b38389f8efef9798810fe0c5b5096ac198cffd54 to 0.0.15
2021-05-07 10:47:07 -07:00
Asher 51d294e163
Remove extension dir scan catch
Now that we are creating the directories these shouldn't error. If they
are somehow missing (if the user deletes them after VS Code starts for
example) then I think we should surface that to the user.
2021-05-07 12:31:43 -05:00
Asher 9ff29d17fb
Make sure directories exist
Fixes #3040.
2021-05-07 12:31:42 -05:00
Asher c416e9b2c4
Use ptyHostService
Most of this was a straightforward replacement of our code with theirs
but I also removed `getDefaultShellAndArgs` since it seems the reference
implementation no longer does that either.

Fixes #2276.
2021-05-07 12:31:24 -05:00
dependabot[bot] f97f8538b1
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode/build
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 17:28:35 +00:00
Akash Satheesan b21a9af473
chore(lib/vscode): remove gulp-azure-storage from deps (#3310) 2021-05-07 22:54:15 +05:30
dependabot[bot] 6615106d86
chore(deps): bump aquasecurity/trivy-action
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from b38389f8efef9798810fe0c5b5096ac198cffd54 to 0.0.15. This release includes the previously tagged commit.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](b38389f8ef...341f810bd6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 11:08:33 +00:00
Akash Satheesan 2dcf098e7e
feat(vscode): update to version 1.56.0 (#3269) 2021-05-07 07:22:08 +05:30
Akash Satheesan ab122daa93
Merge branch 'main' into vscode-1.56 2021-05-07 07:20:48 +05:30
Asher 4f320ad3e0
Merge pull request #3297 from code-asher/test-static 2021-05-06 18:24:44 -05:00
Joe Previte 2f2fd066ad
Merge pull request #3302 from cdr/dependabot/npm_and_yarn/lib/vscode/lodash-4.17.21
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode
2021-05-06 15:11:57 -07:00
Joe Previte 8076651931
Merge pull request #3299 from cdr/dependabot/npm_and_yarn/lib/vscode/underscore-1.12.1
chore(deps-dev): bump underscore from 1.8.3 to 1.12.1 in /lib/vscode
2021-05-06 15:08:00 -07:00
dependabot[bot] ae708dbed4
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /lib/vscode
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 20:01:49 +00:00
Asher e8443e2602
Fix helpers not working in e2e tests
It errors that jest is not defined so put it behind a function instead
of immediately creating the mock (this is probably a better pattern
anyway).

The constant tests had to be reworked a little. Since the logger mock is
hoisted it runs before createLoggerMock is imported. I moved it into a
beforeAll which means the require call also needed to be moved
there (since we need to mock the logger before requiring the constants
or it'll pull the non-mocked logger).

This means getPackageJson needs to be a let and assigned afterward. To
avoid having to define a type for getPackageJson I just added a let var
set to the type of the imported constants file and modified the other
areas to use the same paradigm.

I also replaced some hardcoded strings with the mocked package.json
object.
2021-05-06 15:01:35 -05:00
dependabot[bot] 14dbd16a7a
chore(deps): bump lodash from 4.17.20 to 4.17.21 in /test (#3300)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-07 01:30:47 +05:30
Asher ad4a70c684
Use warn log level for integration tests
Just to limit all the noise from code-server's startup output.
2021-05-06 14:27:16 -05:00
Asher 4925e97080
Add static route tests 2021-05-06 14:27:11 -05:00
Asher 1789cd1bcb
Move temp test dirs under a `tests` sub-directory
This is to match the other tests that create temp directories. It also
lets you clean up test temp directories all at once separately from
other non-test temporary directories.
2021-05-06 14:25:51 -05:00
Asher 52cf2fcf29
Move tmpdir test helper to test helpers file 2021-05-06 14:25:50 -05:00
dependabot[bot] 1eee766bee
chore(deps-dev): bump underscore from 1.8.3 to 1.12.1 in /lib/vscode
Bumps [underscore](https://github.com/jashkenas/underscore) from 1.8.3 to 1.12.1.
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.8.3...1.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 19:25:49 +00:00
Asher 0e4672f6b9
Move health route tests to routes directory 2021-05-06 14:25:49 -05:00
Joe Previte 3243bb3552
Merge pull request #3290 from cdr/jsjoeio/update-constants-test
feat(testing): add test for src/node/constants.ts
2021-05-06 12:25:07 -07:00
Akash Satheesan d27b12bae9
refactor(ci): split audit from prebuild (#3298)
Move dependency audits from prebuild to their own jobs,
so that an error does not affect the rest of the build/test process.
2021-05-07 00:32:10 +05:30
Joe Previte cb5ab48d48
fix: coveragePathIgnorePatterns to /out
We were accidentally ignoring `node/routes` because we had "out"
instead of "/out" in `coveragePathIgnorePatterns` which caused
us to not collect coverage for those files. Now we do.
2021-05-06 11:53:17 -07:00
Akash Satheesan 178028f506
chore(deps): add resolutions for vulnerable pkgs 2021-05-06 22:35:17 +05:30
Akash Satheesan 372a8f14c5 Squashed 'lib/vscode/' changes from 631dbe250bc..cfa2e218100
cfa2e218100 Make sure we actually update the local resource roots (#122957)
206524cbf6f Merge pull request #122941 from microsoft/roblou/fix122701
0ce07162f07 Use the scoped context key service for notebook editor context keys Fix #122701
4fbe56e36b3 Merge pull request #122933 from microsoft/aeschli/122466
32a743d2af9 [JSON] Schema not found error on opening package.json. For #122279
0676e9a727e Fix port theme color typo (#122915)
85f8ebf1687 Fix context on LabelTunnelAction (#122856)
5913f53cab5 Block windows/iframes from preventing the unload (#122835) (#122869)
acd78c82ac6 Ensure that notebook cell URIs work (#122747)
4e185d89863 Merge pull request #122764 from microsoft/roblou/fix122407
7eb7814b56c Try to block webviews from cancelling unloads (#122758)
25092105030 Hardcode keybinding string to fix #122407
b084e6f4a73 Fix currently active indicator preventing editor switching (#122742)
bc2373aaa54 Merge pull request #122732 from microsoft/r156_tabs
d7a86f269a8 Disable tabs by default

git-subtree-dir: lib/vscode
git-subtree-split: cfa2e218100323074ac1948c885448fdf4de2a7f
2021-05-06 22:08:24 +05:30
Joe Previte 027106a5e1
feat(testing): add test for constants "version" and commit 2021-05-05 15:34:48 -07:00
Asher af5a1c9861
Merge pull request #3286 from code-asher/permessage-deflate 2021-05-05 14:32:06 -05:00
Joe Previte b798bfdb59
Merge pull request #3287 from cdr/jsjoeio/update-security-policy
docs(security): add section for tools
2021-05-05 12:16:14 -07:00
Joe Previte 7871cced96
docs(security): add section for tools 2021-05-05 11:24:31 -07:00
Akash Satheesan a631d19636
Merge branch 'main' into vscode-1.56 2021-05-05 23:28:25 +05:30
Akash Satheesan ce26ad7c30
refactor(lib/vscode): move commit to global constant 2021-05-05 23:24:21 +05:30
Akash Satheesan 8cb55b5719
refactor(lib/vscode): don't provide home indicator 2021-05-05 23:21:11 +05:30
Asher a882be5748
Refactor integration tests to use main entry point 2021-05-05 12:24:41 -05:00
Asher 20e70cfa05
Remove try from main
All it does is log and exit which is what the caller will be doing on an
error anyway (see entry).
2021-05-05 12:24:36 -05:00
Asher c96fb65308
Split some entry methods into main
This is so they can be unit tested.
2021-05-05 12:24:35 -05:00
Asher 083400b50a
Add flag to enable permessage-deflate 2021-05-05 12:24:34 -05:00
Akash Satheesan cf61451d49
fix(lib/vscode): fix conflicts in githubServer.ts 2021-05-05 22:29:07 +05:30
Akash Satheesan 51dc9114ff chore(lib/vscode): yarn upgrade + build fix 2021-05-05 22:21:30 +05:30
Akash Satheesan 924832614e chore(lib/vscode): adjust yarn.lock files 2021-05-05 22:21:30 +05:30
Akash Satheesan 73c2a9f0eb fix(lib/vscode): fix conflicts in package.json 2021-05-05 22:21:30 +05:30
Akash Satheesan 70bf7ed90b fix(lib/vscode): fix terminal channel 2021-05-05 22:21:30 +05:30
Akash Satheesan f10b703e84 fix(lib/vscode): fix types in server.ts 2021-05-05 22:21:30 +05:30
Akash Satheesan 84e12bd587 fix(lib/vscode): add home to workbench.ts 2021-05-05 22:21:29 +05:30
Akash Satheesan 96fe3c2734 fix(lib/vscode): conflicts in productService.ts 2021-05-05 22:21:29 +05:30
Akash Satheesan 532ae1451f fix(lib/vscode): conflicts in menubarControl.ts 2021-05-05 22:21:29 +05:30
Akash Satheesan 81357cf4b0 chore(lib/vscode): update electron types 2021-05-05 22:21:29 +05:30
Akash Satheesan fa461ff8f1
feat(ci/build): support arm64 for cloud-agent (#3294) 2021-05-05 21:53:30 +05:30
Asher 92bf2c9760
Add dev mode constant 2021-05-05 10:16:01 -05:00