ab122daa93
Merge branch 'main' into vscode-1.56
2021-05-07 07:20:48 +05:30
4f320ad3e0
Merge pull request #3297 from code-asher/test-static
2021-05-06 18:24:44 -05:00
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
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
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
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
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
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
4925e97080
Add static route tests
2021-05-06 14:27:11 -05:00
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
52cf2fcf29
Move tmpdir test helper to test helpers file
2021-05-06 14:25:50 -05:00
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
0e4672f6b9
Move health route tests to routes directory
2021-05-06 14:25:49 -05:00
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
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
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
178028f506
chore(deps): add resolutions for vulnerable pkgs
2021-05-06 22:35:17 +05:30
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
027106a5e1
feat(testing): add test for constants "version" and commit
2021-05-05 15:34:48 -07:00
af5a1c9861
Merge pull request #3286 from code-asher/permessage-deflate
2021-05-05 14:32:06 -05:00
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
7871cced96
docs(security): add section for tools
2021-05-05 11:24:31 -07:00
a631d19636
Merge branch 'main' into vscode-1.56
2021-05-05 23:28:25 +05:30
ce26ad7c30
refactor(lib/vscode): move commit to global constant
2021-05-05 23:24:21 +05:30
8cb55b5719
refactor(lib/vscode): don't provide home indicator
2021-05-05 23:21:11 +05:30
a882be5748
Refactor integration tests to use main entry point
2021-05-05 12:24:41 -05:00
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
c96fb65308
Split some entry methods into main
...
This is so they can be unit tested.
2021-05-05 12:24:35 -05:00
083400b50a
Add flag to enable permessage-deflate
2021-05-05 12:24:34 -05:00
cf61451d49
fix(lib/vscode): fix conflicts in githubServer.ts
2021-05-05 22:29:07 +05:30
51dc9114ff
chore(lib/vscode): yarn upgrade + build fix
2021-05-05 22:21:30 +05:30
924832614e
chore(lib/vscode): adjust yarn.lock files
2021-05-05 22:21:30 +05:30
73c2a9f0eb
fix(lib/vscode): fix conflicts in package.json
2021-05-05 22:21:30 +05:30
70bf7ed90b
fix(lib/vscode): fix terminal channel
2021-05-05 22:21:30 +05:30
f10b703e84
fix(lib/vscode): fix types in server.ts
2021-05-05 22:21:30 +05:30
84e12bd587
fix(lib/vscode): add home to workbench.ts
2021-05-05 22:21:29 +05:30
96fe3c2734
fix(lib/vscode): conflicts in productService.ts
2021-05-05 22:21:29 +05:30
532ae1451f
fix(lib/vscode): conflicts in menubarControl.ts
2021-05-05 22:21:29 +05:30
81357cf4b0
chore(lib/vscode): update electron types
2021-05-05 22:21:29 +05:30
fa461ff8f1
feat(ci/build): support arm64 for cloud-agent ( #3294 )
2021-05-05 21:53:30 +05:30
92bf2c9760
Add dev mode constant
2021-05-05 10:16:01 -05:00
1c0f0eb60c
chore(deps-dev): bump @types/node from 12.20.11 to 12.20.12 ( #3292 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 12.20.11 to 12.20.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-05 18:05:04 +05:30
40033cd259
chore(deps-dev): bump @types/split2 from 2.1.6 to 3.2.0 ( #3291 )
...
Bumps [@types/split2](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/split2 ) from 2.1.6 to 3.2.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/split2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-05 18:04:35 +05:30
2a4c14f315
Merge pull request #3288 from cdr/jsjoeio/document-versioning
...
docs(maintaining): add versioning
2021-05-04 23:03:29 +00:00
5f989dc9f0
docs(maintaining): add versioning
2021-05-04 15:47:10 -07:00
75e9e24e92
Merge pull request #3277 from code-asher/logout
2021-05-04 15:12:59 -05:00
b9ff73af9e
Merge pull request #3284 from cdr/jsjoeio/document-triage-workflow
...
docs(maintaining): add triage to workflow
2021-05-04 19:24:51 +00:00
1c9156c504
docs(maintaining): add triage to workflow
2021-05-04 12:08:03 -07:00
1070db7e27
Merge pull request #3261 from cdr/jsjoeio/add-trivy
...
feat(ci): add trivy job for security
2021-05-04 11:59:01 -07:00
6d5c60387c
feat(ci): add trivy scans to workflow
...
This adds both a trivy scan for the repo and a trivy scan for our Docker image.
2021-05-04 11:32:41 -07:00
Akash Satheesan