Robo
|
5216c04428
|
chore: update to electron 29 (#209818)
* chore: update electron@29.1.0
* chore: update typings to 20.x
* chore: bump electron@29.1.5
* ci: fix crash in compiling extensions-ci
* chore: disable .d.ts check for build/
$ ../node_modules/.bin/tsc -p tsconfig.build.json
node_modules/@types/chokidar/index.d.ts:21:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/@types/chokidar/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'.
Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref
21 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
~~~~~~~~~
node_modules/chokidar/types/index.d.ts:8:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/chokidar/types/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'.
Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref
8 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
~~~~~~~~~
Found 2 errors in 2 files.
Errors Files
1 node_modules/@types/chokidar/index.d.ts:21
1 node_modules/chokidar/types/index.d.ts:8
Refs a0f9e09f64
* chore: update core types
* temp: fix layer validation
* chore: update nodejs checksums
* ci: use latest v20 LTS for missing node-gyp
Refs eacec5f490
* ci: define LIBCPP_HARDENING_MODE
* ci: fix crash in vscode-web-min-ci
* chore: update rpm deps-list
* chore: bump tree-sitter-typescript@0.20.5
* chore: bump electron@29.3.0
* chore: bump electron@29.3.1
* chore: update rpm deps-list for x86_64
* ci: disable io_uring UV backend on linux
* ci: disable io_uring backend for oss as well
* chore: update typings to 20.x
* ci: add TODO for io_uring workaround
* chore: bump distro
* chore: update preinstall node version checks
* chore: update @types/gulp
Refs https://github.com/microsoft/vscode/issues/212442
* ci: disable io_uring in more test suites
|
2024-05-11 01:20:28 +09:00 |
|
Logan Ramos
|
9bea1fc96a
|
Bump telemetry package (#197168)
|
2023-11-01 20:51:03 +01:00 |
|
Logan Ramos
|
cc98e55794
|
Fix slow telemetry module (#193607)
|
2023-09-20 20:14:12 +01:00 |
|
Logan Ramos
|
ecb0c80fc1
|
Bump extension telemetry module (#191237)
* Bump extension telemetry module
* Fix webpack
|
2023-08-24 12:53:41 -07:00 |
|
Robo
|
ea490e5545
|
chore: update to Electron 25 (#188268)
* chore: update electron@25.3.0
* ci: update NodeTool version
* chore: update @types/node
* add more common types to layers checker
* chore: update debian dependencies
* chore: update rpm dependencies
* fix: use legacy dns result order of Node.js
* ci: remove deprecated always-auth npm config
Refs npm/cli@72a7eeb
* chore: update deb and rpm dependencies
* chore: update armhf rpm dependencies
* chore: update x64 debian dependencies
* chore: update x64 rpm dependencies
* chore: update electron@25.3.1
* chore: update electron@25.4.0
* chore: bump distro
* chore: bump distro
---------
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
|
2023-08-07 21:46:27 +09:00 |
|
Logan Ramos
|
8e6bcc9b9e
|
Bump module to new package (#173599)
|
2023-02-06 12:29:36 -08:00 |
|
Logan Ramos
|
8cea434dec
|
Remove unused proposals (#172035)
|
2023-01-23 19:09:07 +01:00 |
|
Logan Ramos
|
4acf2d9b46
|
Update the telemetry modules (#170512)
Update the module
|
2023-01-03 15:10:45 -05:00 |
|
Logan Ramos
|
b1076b41f3
|
Bump telemetry packages (#169283)
|
2022-12-15 17:29:10 +01:00 |
|
Henning Dieterichs
|
5ff048a9e4
|
Add telemetry for conflict markers
|
2022-11-28 12:00:08 +01:00 |
|
Matt Bierner
|
cdc521af16
|
Adopt l10n for merge-conflict (#165531)
For #164438
|
2022-11-04 11:26:04 -07:00 |
|
Tyler James Leonhardt
|
29e985eca0
|
rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#161819)
ref #161297
|
2022-09-26 11:10:54 -07:00 |
|
Johannes Rieken
|
c1b80f6402
|
Disable merge-conflict commands for 3wm-editor (#161304)
fixes https://github.com/microsoft/vscode/issues/159156
|
2022-09-20 13:50:21 +02:00 |
|
Tyler James Leonhardt
|
d8453c0440
|
Rev built-in versions of vscode-nls to 5.1.0 (#157530)
* rev version of vscode-nls to 5.1.0
* and yarn lock
|
2022-08-08 18:43:45 +02:00 |
|
Logan Ramos
|
a20329d291
|
Switch extensions to 1DS (#154299)
* Move extensions to 1DS
* Switch extensions to 1DS
|
2022-07-06 17:18:41 -07:00 |
|
Johannes Rieken
|
dfeb3e0050
|
joh/careful silverfish (#153089)
* don't show `openChange` command for merge editor
https://github.com/microsoft/vscode/issues/151125
* disable and not-place the conflicting merge-conflict navigation commands for the merge editor
https://github.com/microsoft/vscode/issues/153087
* disable (configurable) merge-conflict featues (code lens, decorations) when git is configured to use merge editor
https://github.com/microsoft/vscode/issues/153087
|
2022-06-24 09:33:06 +00:00 |
|
Robo
|
32d40cf44e
|
chore: update to electron 17 (#143223)
* chore: bump electron@17.0.0
* Revert "chore: revert to electron@13 (#143851)"
This reverts commit df645f1450 .
* chore: bump electron@17.1.0
* Revert "ci: fix build with latest node-gyp"
This reverts commit c3e948aa30 .
* chore: revert ci changes for node v16
* chore: update yarn.lock
* chore: bump electron@17.1.1
|
2022-03-11 00:51:37 +09:00 |
|
Robo
|
df645f1450
|
chore: revert to electron@13 (#143851)
* Revert "chore: update to electron 16 (#137241)"
This reverts commit 01df559c18 .
This reverts commit 46301339b7
* ci: fix remote compiler for sdl-scan
* chore: fix remote/.yarnrc
* chore: fix build/npm/postinstall.js
* chore: rm crash reporter from shared process
* chore: rm crash reporter from ext host
* chore: fix build/lib/layersChecker.ts
* :chore: preserve some more changes
* fix tests
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
|
2022-02-24 17:49:49 +01:00 |
|
Robo
|
01df559c18
|
chore: update to electron 16 (#137241)
* chore: bump electron@15.3.0
* chore: bump node@16.x
* chore: enable render process reuse
* Revert "watcher - use `type` property for crash reporter location"
This reverts commit bfa488dd8f .
* Revert "watcher - enable crash reports on linux (#136264)"
This reverts commit af261488f8 .
* chore: enable crashpad on linux
* chore: bump electron@15.3.1
* chore: update api changes
* chore: bump @vscode/sqlite3@5.0.3
* spec: skip non-context aware module unittests
* chore: fix perf hook integration with node environment
* fix: adopt fs api changes
* chore: fix integration tests
* chore: bump electron@15.3.2
* chore: bump electron@16.0.0
* temp(macOS): kill test instances in OSS
* Revert "temp(macOS): kill test instances in OSS"
This reverts commit b0d796c8d64227a5ec012c060bbbee7d9da27568.
* chore: update chromium version for clang downloader
* some 💄 changes
* align with changes
* adopt more fs.rm
* 💄
* chore: bump @vscode/sqlite3@5.0.4
* fix layers check to account for duplicated types from node.js
* update todo for type casts
* smoke - fix compile issue
* chore: update module cache
* watcher - fix unhandled rejection (fix #137416)
* ci: update node version
* enable stack dumping
* update electron types to 16.x
* chore: bump @vscode/sqlite3@5.0.5
Refs https://github.com/microsoft/vscode/issues/137496
* fix layer issue
* add `AbortSignal` to core types
* chore: update linux compile flags
Refs 797723ec83
* ci: fix linux build
* ci: update github ci cache
* ci: fix remote build in github ci
* ci: better fix for remote build
* chore: bump azure cache
* chore: fix merge conflict
* :chore: update to electron@16.0.2
* chore: bump @vscode/sqlite3@5.0.7
* ci: update to gcc-4.9 for remote
Refs https://github.com/microsoft/vscode/issues/137659
* ci: switch to buster for linux arm
Refs https://github.com/microsoft/vscode/issues/137927
* ci: fix build on linux arm64
* ci: fix arm client compiler toolchain
Refs #137927
* chore: bump electron@16.0.3
* ci: fix compile flags for the c toolchain
* chore: bump electron@16.0.4
* Add experimental dark mode flag (#139109)
* Add experimental dark mode flag
* Apply PR feedback
* chore: bump electron@16.0.6
* chore: bump electron@16.0.7
Fixes https://github.com/microsoft/vscode/issues/138792
Fixes https://github.com/microsoft/vscode/issues/139300
* chore: experimental highlight API
* smoke - fix compile issue
* FIXME: custom ELECTRON_RUN_AS_NODE with node worker
* Revert "chore: bump electron@16.0.7"
This reverts commit 5fd01cf37c .
* Revert "Revert "chore: bump electron@16.0.7""
This reverts commit a7f1b73951 .
* chore: fix github linux workflow
* chore: address review feedback
* chore: bump electron@16.0.8
* ci: revert to stretch distro for linux arm
Refs https://github.com/microsoft/vscode/issues/137927
* ci: force build
* chore: update yarn.lock
* address feedback
* Revert "FIXME: custom ELECTRON_RUN_AS_NODE with node worker"
This reverts commit 7b48fa3732 .
* ci: fix remote folder build
* chore: fix github linux ci
* 🆙 `versionSpec`
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Co-authored-by: Raymond Zhao <raymondzhao@microsoft.com>
|
2022-02-08 20:09:00 +01:00 |
|
Joyce Er
|
da29a245ff
|
Enable merge-conflict extension in virtual workspaces (fixes #142447)
|
2022-02-08 09:28:04 +01:00 |
|
Martin Aeschlimann
|
7ebe6a6054
|
adopt web extensions to webpack 5
|
2021-07-08 21:41:03 +02:00 |
|
Robo
|
bce4d71f64
|
chore: bump node@14.x in devDependencies (#122905)
|
2021-05-04 10:04:13 +02:00 |
|
Sandeep Somavarapu
|
68bed01970
|
adopt virtual workspaces - not supported
|
2021-04-22 16:54:06 +02:00 |
|
SteVen Batten
|
f9fc28d47d
|
update ext manifest schema validation and built-in exts
|
2021-04-21 11:54:42 -07:00 |
|
Miguel Solorio
|
ac48f78dd6
|
Add icons for built-in extensions (fixes #81760)
|
2021-04-20 12:09:24 -07:00 |
|
Christof Marti
|
75f2ce9735
|
Adopt workspaceTrust
|
2021-04-13 21:42:54 +02:00 |
|
Christof Marti
|
5c79571610
|
Add next/prev conflicts (#97613)
|
2021-03-31 10:46:11 +02:00 |
|
Wenlu Wang
|
96d0dc4154
|
Add next/prev conflicts (#97613)
|
2021-03-31 10:45:21 +02:00 |
|
João Moreno
|
ec805db5ed
|
add repository field to extensions package.json
|
2021-01-29 15:30:45 +01:00 |
|
Christof Marti
|
b33b28dd07
|
Activate onStartupFinished (#110031)
|
2021-01-12 08:17:35 +01:00 |
|
Alexandru Dima
|
f74ad9692f
|
Align @types/* dev dependencies (#112718)
|
2020-12-18 13:28:39 +01:00 |
|
Martin Aeschlimann
|
058e1095b2
|
fix merge-conflict browser main
|
2020-06-26 11:14:23 +02:00 |
|
Martin Aeschlimann
|
ae1599a0b7
|
fix merge-conflict for browser
|
2020-06-26 10:54:29 +02:00 |
|
Martin Aeschlimann
|
16be2c9885
|
used shared webpack-config for browser
|
2020-06-25 23:22:02 +02:00 |
|
Martin Aeschlimann
|
d78d88f7a8
|
make merge-conflic serverless
|
2020-06-12 11:03:52 +02:00 |
|
Benjamin Pasero
|
ca22de4b17
|
debt - bump node.d.ts dependency in extensions to 12.x (part of #82514)
|
2019-10-28 08:11:47 +01:00 |
|
Aurélien Pupier
|
7a5bca9faf
|
Add License field to package.jsons #68423 (#68771)
it should avoid to have "warning XXX: No license field" during yarn
build
Signed-off-by: Aurélien Pupier <apupier@redhat.com>
|
2019-06-06 11:44:50 +02:00 |
|
Benjamin Pasero
|
d78a75973c
|
update @types/node (#74881)
|
2019-06-05 10:20:01 +02:00 |
|
Benjamin Pasero
|
d7977c880f
|
debt - use @types/node: 10 for all extensions
|
2019-06-05 09:32:36 +02:00 |
|
Matt Bierner
|
c69c1719bb
|
Add enumDescriptions for merge-conflict.diffViewPosition
Fixes #74500
|
2019-05-28 14:54:29 -07:00 |
|
Peng Lyu
|
c3fe962b89
|
Open the diff view in current editor, to the side or below.
|
2019-05-24 15:26:50 -07:00 |
|
Peng Lyu
|
9cd81dcb5b
|
Always compare change with context.
|
2019-05-24 14:43:44 -07:00 |
|
Peng Lyu
|
b917a0341d
|
Support open diff in new editor group
|
2019-05-24 11:29:30 -07:00 |
|
Peng Lyu
|
fa69b4e7d6
|
Show context for diff view of merge conflict and introduce compareAll.
|
2019-05-23 14:19:09 -07:00 |
|
Christof Marti
|
1d40f3f25c
|
Off by default (#45853)
|
2018-10-02 16:00:43 +02:00 |
|
Christof Marti
|
977fc70d40
|
Merge branch 'master' into Issue-#45853-checked
|
2018-10-02 15:57:39 +02:00 |
|
mnikn
|
0a5343aa97
|
implement [#53133](https://github.com/Microsoft/vscode/issues/53133)
|
2018-10-01 16:42:06 +02:00 |
|
Johannes Rieken
|
c2c5819fc8
|
adopt vscode-nls 4.0.0
|
2018-09-06 14:44:33 +02:00 |
|
Dirk Baeumer
|
21991b4912
|
Move to latest vscode-nls for corrupted cache support
|
2018-07-03 16:12:52 +02:00 |
|
atomai
|
7c26e93b21
|
Automatically navigate to the next merge conflict upon resolving a merge conflict
|
2018-04-14 20:03:55 -04:00 |
|