From da5d37fdc84b32bccdf81bed1967fa13befcb4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 8 Apr 2024 16:37:12 +0200 Subject: [PATCH 1/8] doc: update upgrade guide --- docs/vscode_monaco_upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/vscode_monaco_upgrade.md b/docs/vscode_monaco_upgrade.md index 19f72616..4868bc10 100644 --- a/docs/vscode_monaco_upgrade.md +++ b/docs/vscode_monaco_upgrade.md @@ -22,7 +22,7 @@ - Wait for the new vscode version to be downloaded and built - Run `npm run update-vscode-dependencies` to update the vscode dependencies we use to the same versions as VSCode - Run `npm install` (might need to update/add the npm override for `xterm` in the `package.json` to fix the invalid peer deps) -- Fix errors, adapt code, build, include the `vscode.patch` into this commit +- Fix errors, adapt code, build, include the `vscode-patches` directory into this commit - Do not hesitate to run the eslint autofix, it gets rid of the majority of your errors - Implement missing services. This is easily observable seem when running the demo (see next point) - Update demo From 13cefb9287862c489cac8c439db6599680b4861c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 8 Apr 2024 16:37:36 +0200 Subject: [PATCH 2/8] fix: properly delete arg after using it --- rollup/rollup.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index 7347e878..ac009f4d 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -378,8 +378,9 @@ const external: rollup.ExternalOption = (source) => { export default (args: Record): rollup.RollupOptions[] => { const vscodeVersion = args['vscode-version'] - const vscodeCommit = args['vscode-commit'] delete args['vscode-version'] + const vscodeCommit = args['vscode-commit'] + delete args['vscode-commit'] const vscodeRef = args['vscode-ref'] delete args['vscode-ref'] if (vscodeVersion == null) { From 7d0574550639102c0bd887bd9beae457748d45d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 8 Apr 2024 16:42:41 +0200 Subject: [PATCH 3/8] lib!: update to VSCode 1.88 --- package-lock.json | 107 ++++++----- package.json | 30 +-- src/extension.api.ts | 8 +- src/missing-services.ts | 140 +++++++++++--- src/monaco.ts | 2 +- src/service-override/authentication.ts | 10 +- src/service-override/chat.ts | 4 +- src/service-override/editor.ts | 94 +--------- src/service-override/extensionGallery.ts | 8 +- src/service-override/languages.ts | 2 +- src/service-override/layout.ts | 14 +- src/service-override/remoteAgent.ts | 2 +- src/service-override/tools/editor.ts | 91 ++++++++- src/service-override/tools/views.ts | 7 +- src/service-override/views.ts | 10 +- src/service-override/workbench.ts | 4 +- ...fix-allow-importing-vscode-oniguruma.patch | 4 +- ...ix-fix-some-build-process-edge-cases.patch | 2 +- vscode-paches/0005-feat-output-es2020.patch | 2 +- ...o-register-a-locale-with-translation.patch | 38 +++- ...-feat-add-static-asset-url-mechanism.patch | 16 +- ...ply-style-only-on-standalone-editors.patch | 50 ++--- .../0016-fix-use-existing-method.patch | 2 +- vscode-paches/0017-refactor-split-code.patch | 4 +- ...ode-already-done-in-EditorFeaturesIn.patch | 2 +- ...imports-by-regular-esm-dynamic-impor.patch | 20 +- ...update-import-syntax-for-node-in-ESM.patch | 2 +- ...-classes-and-make-some-methods-acces.patch | 24 +-- ...improve-extension-contribution-types.patch | 2 +- ...y-run-some-code-if-inside-the-worker.patch | 6 +- ...ome-modules-to-be-able-to-import-the.patch | 42 +++-- .../0031-fix-replace-map-by-forEach.patch | 8 +- ...t-only-apply-style-on-specific-class.patch | 64 ++++++- ...ileAccess.asBrowserUri-at-the-root-.patch} | 30 +-- .../0033-fix-fix-fullscreen-layout.patch | 29 --- ...nup-remove-some-checks-and-warnings.patch} | 26 +-- ...h => 0035-refactor-split-class-in-2.patch} | 0 ...supported-as-soon-as-there-is-a-reg.patch} | 4 +- ...-use-asBrowserUri-to-get-iframe-src.patch} | 6 +- ...d-some-parameter-to-webview-iframes.patch} | 4 +- ...equire-by-FileAccess.toModuleConten.patch} | 0 ...tect-fullscreen-if-it-s-not-a-guess.patch} | 0 ...tch => 0041-fix-only-use-open-model.patch} | 0 ...a-local-folder-even-when-there-is-a.patch} | 0 ...e-to-access-the-navigator.keyboard-o.patch | 45 ----- ...to-switch-storage-service-workspace.patch} | 0 ...ove-code-that-we-will-run-ourselves.patch} | 2 +- ...e-import-function-able-to-replace-i.patch} | 0 ... => 0046-cleanup-remove-graceful-fs.patch} | 0 ...-detect-if-localization-were-alread.patch} | 0 ...l-view-if-there-is-no-backend-avail.patch} | 4 +- ...t-only-apply-style-on-specific-class.patch | 175 ++++++++++++++++++ 52 files changed, 724 insertions(+), 422 deletions(-) rename vscode-paches/{0034-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch => 0033-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch} (82%) delete mode 100644 vscode-paches/0033-fix-fix-fullscreen-layout.patch rename vscode-paches/{0035-cleanup-remove-some-checks-and-warnings.patch => 0034-cleanup-remove-some-checks-and-warnings.patch} (87%) rename vscode-paches/{0036-refactor-split-class-in-2.patch => 0035-refactor-split-class-in-2.patch} (100%) rename vscode-paches/{0037-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch => 0036-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch} (97%) rename vscode-paches/{0038-fix-use-asBrowserUri-to-get-iframe-src.patch => 0037-fix-use-asBrowserUri-to-get-iframe-src.patch} (87%) rename vscode-paches/{0039-feat-add-some-parameter-to-webview-iframes.patch => 0038-feat-add-some-parameter-to-webview-iframes.patch} (94%) rename vscode-paches/{0040-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch => 0039-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch} (100%) rename vscode-paches/{0041-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch => 0040-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch} (100%) rename vscode-paches/{0043-fix-only-use-open-model.patch => 0041-fix-only-use-open-model.patch} (100%) rename vscode-paches/{0044-fix-allow-adding-a-local-folder-even-when-there-is-a.patch => 0042-fix-allow-adding-a-local-folder-even-when-there-is-a.patch} (100%) delete mode 100644 vscode-paches/0042-fix-only-try-once-to-access-the-navigator.keyboard-o.patch rename vscode-paches/{0045-feat-allow-to-switch-storage-service-workspace.patch => 0043-feat-allow-to-switch-storage-service-workspace.patch} (100%) rename vscode-paches/{0046-cleanup-remove-code-that-we-will-run-ourselves.patch => 0044-cleanup-remove-code-that-we-will-run-ourselves.patch} (98%) rename vscode-paches/{0047-fix-typescript-use-import-function-able-to-replace-i.patch => 0045-fix-typescript-use-import-function-able-to-replace-i.patch} (100%) rename vscode-paches/{0048-cleanup-remove-graceful-fs.patch => 0046-cleanup-remove-graceful-fs.patch} (100%) rename vscode-paches/{0049-feat-add-a-way-to-detect-if-localization-were-alread.patch => 0047-feat-add-a-way-to-detect-if-localization-were-alread.patch} (100%) rename vscode-paches/{0050-feat-hide-terminal-view-if-there-is-no-backend-avail.patch => 0048-feat-hide-terminal-view-if-there-is-no-backend-avail.patch} (91%) create mode 100644 vscode-paches/0049-fixup-feat-only-apply-style-on-specific-class.patch diff --git a/package-lock.json b/package-lock.json index 9cf2451c..e52ff3e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,25 +18,25 @@ "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-canvas": "0.6.0-beta.31", - "@xterm/addon-image": "0.7.0-beta.29", - "@xterm/addon-search": "0.14.0-beta.31", - "@xterm/addon-serialize": "0.12.0-beta.31", - "@xterm/addon-unicode11": "0.7.0-beta.31", - "@xterm/addon-webgl": "0.17.0-beta.31", - "@xterm/headless": "5.4.0-beta.31", - "@xterm/xterm": "5.4.0-beta.31", + "@xterm/addon-canvas": "0.7.0-beta.12", + "@xterm/addon-image": "0.8.0-beta.12", + "@xterm/addon-search": "0.15.0-beta.12", + "@xterm/addon-serialize": "0.13.0-beta.12", + "@xterm/addon-unicode11": "0.8.0-beta.12", + "@xterm/addon-webgl": "0.18.0-beta.12", + "@xterm/headless": "5.5.0-beta.12", + "@xterm/xterm": "5.5.0-beta.12", "cookie": "^0.4.0", "css-url-parser": "^1.1.3", "kerberos": "^2.0.1", "keytar": "^7.9.0", "memfs": "^4.8.0", "mime-types": "^2.1.35", - "node-pty": "1.1.0-beta6", + "node-pty": "1.1.0-beta11", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.0.0", - "yauzl": "^2.9.2", + "yauzl": "^3.0.0", "yazl": "^2.4.3" }, "devDependencies": { @@ -59,7 +59,7 @@ "@types/mime-types": "^2.1.4", "@types/node": "18.19.8", "@types/semver": "^7.5.8", - "@types/vscode": "~1.87.0", + "@types/vscode": "~1.88.0", "@types/vscode-marked": "npm:@types/marked@^3.0.2", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.32", @@ -3539,9 +3539,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.87.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.87.0.tgz", - "integrity": "sha512-y3yYJV2esWr8LNjp3VNbSMWG7Y43jC8pCldG8YwiHGAQbsymkkMMt0aDT1xZIOFM2eFcNiUc+dJMx1+Z0UT8fg==", + "version": "1.88.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.88.0.tgz", + "integrity": "sha512-rWY+Bs6j/f1lvr8jqZTyp5arRMfovdxolcqGi+//+cPDOh8SBvzXH90e7BiSXct5HJ9HGW6jATchbRTpTJpEkw==", "dev": true }, "node_modules/@types/vscode-marked": { @@ -3846,6 +3846,15 @@ "yauzl": "^2.9.2" } }, + "node_modules/@vscode/ripgrep/node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, "node_modules/@vscode/spdlog": { "version": "0.15.0", "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.0.tgz", @@ -3957,62 +3966,62 @@ } }, "node_modules/@xterm/addon-canvas": { - "version": "0.6.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.31.tgz", - "integrity": "sha512-jm/7FWZOgnAGG7MXjr0W4SnuIzsag+oVpyf6wAD9UlCgq5HBuk/3kJ5mYGiGR7CpdTxqXmzyBk3OhQe8npZ1aQ==", + "version": "0.7.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.12.tgz", + "integrity": "sha512-euzQyWdklaSxzmb87kuwwiVP06vuYe1oUK+CiQW24UggSXThOEvZhvYV3O6iEgLe3p+7QfgnRWohXhCM84VOew==", "peerDependencies": { "@xterm/xterm": "^5.0.0" } }, "node_modules/@xterm/addon-image": { - "version": "0.7.0-beta.29", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.7.0-beta.29.tgz", - "integrity": "sha512-Z5JCuhl0AcwQA+DE/kQMeSSHZbfwJVLUUBodDeujVItQrcpc9vA8mxf/qIwS3XTA/tPbFihfc/CE9zL7OFdbaw==", + "version": "0.8.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.8.0-beta.12.tgz", + "integrity": "sha512-YsBhmzwxRmym2dUA2CSm52Wt3OLhydVHM+SZmRAJ0/hvfB7dDjtuXBUSIdQWB16WWbGdi4Iazcs/TTxtarX/yA==", "peerDependencies": { "@xterm/xterm": "^5.2.0" } }, "node_modules/@xterm/addon-search": { - "version": "0.14.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.14.0-beta.31.tgz", - "integrity": "sha512-SS4CdgciLT98Uc4Dq0IjJegHcGIjGaASTcMtVkNBx9dOat9xt6lCXmtgUUj5w0KlB8nUfKrcy5T6fHgzrOzvrw==", + "version": "0.15.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.15.0-beta.12.tgz", + "integrity": "sha512-63ZhxXj6jBYumVrWJ7ZssICSMz+jHsXbi67tDQNMwTRO/MJxTittZeTHQ7IQrRYzKQgixrX0rLH7AwrLBrn2uQ==", "peerDependencies": { "@xterm/xterm": "^5.0.0" } }, "node_modules/@xterm/addon-serialize": { - "version": "0.12.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.31.tgz", - "integrity": "sha512-MZ24pw33qOJrHdA6tlvwE4dSSpmIp/H9ZKtbiWZvuxVsY/hfYYPOluBQiCsOiYT7bZ8gQub2OOBX3jyMoZVxnQ==", + "version": "0.13.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.12.tgz", + "integrity": "sha512-/32Gpcj37Ftqf6b4+H62rcB70jLXi9IQspod/2mK3K+Yza9X+Yc8VkAz8VgpKa6tzbh3Xk0XEo/dB6kVFv1Jsg==", "peerDependencies": { "@xterm/xterm": "^5.0.0" } }, "node_modules/@xterm/addon-unicode11": { - "version": "0.7.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.31.tgz", - "integrity": "sha512-wrZLt2s6Yjmpe4nh0Sp6DKji0EoHod7V6ABfWBf8krjmEGSleE+GSb+ZwDOMsNzLJLmxoq1e6glHcVixG1z7WQ==", + "version": "0.8.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.12.tgz", + "integrity": "sha512-uNsWmRpl4LaBfykpP9CKMo+49gVxRxHoC5MFuMhqPPNhXShsdBii3YxglwoKtit1fwzVT0CIWEniZQMlGiTIuw==", "peerDependencies": { "@xterm/xterm": "^5.0.0" } }, "node_modules/@xterm/addon-webgl": { - "version": "0.17.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.31.tgz", - "integrity": "sha512-wqbBDDppwQ4R8o0YgnyFL8Pai2mVZqHb3E097vkFLB5Fw2hNx2dys3MgiXriSGXaUABKM3usVdZyouL6QgWdxQ==", + "version": "0.18.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.12.tgz", + "integrity": "sha512-wnIf5Xv0qAWQ0I1G5drKpEThA+D0f03iOTdtPR3uSLDfR8OsmpnSRgiR0Y0nAOnDmiCnDxu/wdBCKOAcXhWl2Q==", "peerDependencies": { "@xterm/xterm": "^5.0.0" } }, "node_modules/@xterm/headless": { - "version": "5.4.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.4.0-beta.31.tgz", - "integrity": "sha512-AIMP0ZZozxtvilVTKqquNPYDE5RuKINTsYjOcWzYvjpg7sS75/Tn/RBx20KfZN8Z2oCCwVgj+1mudrV0W4JmMw==" + "version": "5.5.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.5.0-beta.12.tgz", + "integrity": "sha512-s1AS30MYb0KJ7sEruyywAi79lAjSgjVOasb6EOgOalaQBYWf5BY2HKBU+GOyRPFkusgEIBg0f/ID8uS1fiku9A==" }, "node_modules/@xterm/xterm": { - "version": "5.4.0-beta.31", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0-beta.31.tgz", - "integrity": "sha512-EpCtaYqMhJSyZrGY2sJVZeRCIRrANKtv1GGTj+IQPvk6hTiJHGrFHLM0tZ0dj0l3z65tLoOdj6EzJnjzX3Pqjw==" + "version": "5.5.0-beta.12", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0-beta.12.tgz", + "integrity": "sha512-+I/vQh16ndYt8erj7zrxywPb+niyZC1W0H0w/ueDB3IPC7zPXxcETR0OGmglL7kq8Erb76ukBYXw9byXR2vtxg==" }, "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", @@ -8621,9 +8630,9 @@ } }, "node_modules/node-pty": { - "version": "1.1.0-beta6", - "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta6.tgz", - "integrity": "sha512-ZcuPz5wIbfF4rebVv8sl+nf2Cn5dVMqlEl9PtabCt4uIffGDnovOpmwh16Oh/MThrwSmeJL6gBwu6lIbBtW7DQ==", + "version": "1.1.0-beta11", + "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta11.tgz", + "integrity": "sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==", "hasInstallScript": true, "dependencies": { "node-addon-api": "^7.1.0" @@ -9958,11 +9967,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/ip": { - "version": "2.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/npm/node_modules/ip-address": { "version": "9.0.5", "dev": true, @@ -15240,12 +15244,15 @@ } }, "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.2.tgz", + "integrity": "sha512-621iCPgEG1wXViDZS/L3h9F8TgrdQV1eayJlJ8j5A2SZg8OdY/1DLf+VxNeD+q5QbMFEAbjjR8nITj7g4nKa0Q==", "dependencies": { "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" + "pend": "~1.2.0" + }, + "engines": { + "node": ">=12" } }, "node_modules/yazl": { diff --git a/package.json b/package.json index a95e2d38..bdb8dcb9 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, "config": { "vscode": { - "version": "1.87.2", - "ref": "1.87.2", - "commit": "863d2581ecda6849923a2118d93a088b0745d9d6" + "version": "1.88.0", + "ref": "1.88.0", + "commit": "5c3e652f63e798a5ac2f31ffd0d863669328dc4c" }, "monaco": { "ref": "v0.47.0", @@ -60,7 +60,7 @@ "@types/mime-types": "^2.1.4", "@types/node": "18.19.8", "@types/semver": "^7.5.8", - "@types/vscode": "~1.87.0", + "@types/vscode": "~1.88.0", "@types/vscode-marked": "npm:@types/marked@^3.0.2", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.32", @@ -111,32 +111,32 @@ "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-canvas": "0.6.0-beta.31", - "@xterm/addon-image": "0.7.0-beta.29", - "@xterm/addon-search": "0.14.0-beta.31", - "@xterm/addon-serialize": "0.12.0-beta.31", - "@xterm/addon-unicode11": "0.7.0-beta.31", - "@xterm/addon-webgl": "0.17.0-beta.31", - "@xterm/headless": "5.4.0-beta.31", - "@xterm/xterm": "5.4.0-beta.31", + "@xterm/addon-canvas": "0.7.0-beta.12", + "@xterm/addon-image": "0.8.0-beta.12", + "@xterm/addon-search": "0.15.0-beta.12", + "@xterm/addon-serialize": "0.13.0-beta.12", + "@xterm/addon-unicode11": "0.8.0-beta.12", + "@xterm/addon-webgl": "0.18.0-beta.12", + "@xterm/headless": "5.5.0-beta.12", + "@xterm/xterm": "5.5.0-beta.12", "cookie": "^0.4.0", "css-url-parser": "^1.1.3", "kerberos": "^2.0.1", "keytar": "^7.9.0", "memfs": "^4.8.0", "mime-types": "^2.1.35", - "node-pty": "1.1.0-beta6", + "node-pty": "1.1.0-beta11", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.0.0", - "yauzl": "^2.9.2", + "yauzl": "^3.0.0", "yazl": "^2.4.3" }, "overrides": { "typescript": "$typescript", "rollup": "$rollup", "recast": "$recast", - "@xterm/xterm": "5.4.0-beta.31", + "@xterm/xterm": "5.5.0-beta.12", "@typescript-eslint/eslint-plugin": "$@typescript-eslint/eslint-plugin" }, "volta": { diff --git a/src/extension.api.ts b/src/extension.api.ts index 303f0abf..c5e8a7c8 100644 --- a/src/extension.api.ts +++ b/src/extension.api.ts @@ -197,7 +197,8 @@ const api: typeof vscode = { ViewColumn: extHostTypes.ViewColumn, WorkspaceEdit: extHostTypes.WorkspaceEdit, // proposed api types - DocumentDropEdit: extHostTypes.DocumentDropEdit, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + DocumentDropEdit: extHostTypes.DocumentDropEdit, DocumentPasteEdit: extHostTypes.DocumentPasteEdit, InlayHint: extHostTypes.InlayHint, InlayHintLabelPart: extHostTypes.InlayHintLabelPart, @@ -239,7 +240,6 @@ const api: typeof vscode = { TextSearchCompleteMessageType: searchExtTypes.TextSearchCompleteMessageType, DataTransfer: extHostTypes.DataTransfer, DataTransferItem: extHostTypes.DataTransferItem, - CoveredCount: extHostTypes.CoveredCount, FileCoverage: extHostTypes.FileCoverage, StatementCoverage: extHostTypes.StatementCoverage, BranchCoverage: extHostTypes.BranchCoverage, @@ -264,10 +264,6 @@ const api: typeof vscode = { InteractiveSessionVoteDirection: extHostTypes.InteractiveSessionVoteDirection, ChatCopyKind: extHostTypes.ChatCopyKind, InteractiveEditorResponseFeedbackKind: extHostTypes.InteractiveEditorResponseFeedbackKind, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - StackFrameFocus: extHostTypes.StackFrameFocus, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ThreadFocus: extHostTypes.ThreadFocus, RelatedInformationType: extHostTypes.RelatedInformationType, SpeechToTextStatus: extHostTypes.SpeechToTextStatus, KeywordRecognitionStatus: extHostTypes.KeywordRecognitionStatus diff --git a/src/missing-services.ts b/src/missing-services.ts index 6cfd7000..26cfbf02 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -127,7 +127,7 @@ import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/br import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat' import { IChatAccessibilityService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat' import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService' -import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' +import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline' import { ITestService } from 'vs/workbench/contrib/testing/common/testService' import { ISecretStorageService } from 'vs/platform/secrets/common/secrets' @@ -140,7 +140,6 @@ import { IEncryptionService } from 'vs/platform/encryption/common/encryptionServ import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService' import { IDiagnosticsService, NullDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics' import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch' -import { IChatProviderService } from 'vs/workbench/contrib/chat/common/chatProvider' import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands' import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables' import { IAiRelatedInformationService } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation' @@ -193,8 +192,14 @@ import { IExtensionFeaturesManagementService } from 'vs/workbench/services/exten import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService' import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/common/workspaceIdentityService' import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels' -import { unsupported } from './tools' +import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels' +import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService' +import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService' +import { IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService' +import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' +import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService' import { getBuiltInExtensionTranslationsUris } from './l10n' +import { unsupported } from './tools' registerSingleton(ILoggerService, class NullLoggerService extends AbstractLoggerService { constructor () { @@ -327,6 +332,7 @@ registerSingleton(IFileService, class FileService implements IFileService { }, InstantiationType.Eager) class EmptyEditorGroup implements IEditorGroup, IEditorGroupView { + isTransient = () => false windowId = mainWindow.vscodeWindowId get groupsView () { return unsupported() @@ -1040,6 +1046,7 @@ registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, class MonacoSearchService implements ISearchService { _serviceBrand: undefined constructor (@IModelService private modelService: IModelService) {} + aiTextSearch = unsupported textSearchSplitSyncAsync = unsupported async textSearch (): Promise { @@ -1098,6 +1105,8 @@ registerSingleton(ITimerService, class TimerService implements ITimerService { registerSingleton(IExtensionsWorkbenchService, class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { _serviceBrand: undefined + getResourceExtensions = unsupported + updateRunningExtensions = unsupported togglePreRelease = unsupported isAutoUpdateEnabledFor = unsupported updateAutoUpdateEnablementFor = unsupported @@ -1196,6 +1205,42 @@ registerSingleton(IWebExtensionsScannerService, class WebExtensionsScannerServic scanExtensionManifest = async () => null }, InstantiationType.Eager) +registerSingleton(IExtensionsScannerService, class ExtensionsScannerService implements IExtensionsScannerService { + _serviceBrand: undefined + get systemExtensionsLocation () { + return unsupported() + } + + get userExtensionsLocation () { + return unsupported() + } + + onDidChangeCache = Event.None + getTargetPlatform = unsupported + scanAllExtensions = unsupported + scanSystemExtensions = unsupported + scanUserExtensions = unsupported + scanExtensionsUnderDevelopment = unsupported + scanExistingExtension = unsupported + scanOneOrMultipleExtensions = unsupported + scanMultipleExtensions = unsupported + scanMetadata = unsupported + updateMetadata = unsupported + initializeDefaultProfileExtensions = unsupported +}, InstantiationType.Eager) + +registerSingleton(IExtensionsProfileScannerService, class ExtensionsProfileScannerService implements IExtensionsProfileScannerService { + _serviceBrand: undefined + onAddExtensions = Event.None + onDidAddExtensions = Event.None + onRemoveExtensions = Event.None + onDidRemoveExtensions = Event.None + scanProfileExtensions = unsupported + addExtensionsToProfile = unsupported + updateMetadata = unsupported + removeExtensionFromProfile = unsupported +}, InstantiationType.Eager) + registerSingleton(IExtensionIgnoredRecommendationsService, class ExtensionIgnoredRecommendationsService implements IExtensionIgnoredRecommendationsService { _serviceBrand: undefined onDidChangeIgnoredRecommendations = Event.None @@ -1601,6 +1646,7 @@ registerSingleton(IExtensionGalleryService, class ExtensionGalleryService implem registerSingleton(ITerminalService, class TerminalService implements ITerminalService { _serviceBrand: undefined + onAnyInstanceData = Event.None moveIntoNewEditor = unsupported detachedInstances = [] onAnyInstanceDataInput = Event.None @@ -2080,11 +2126,15 @@ registerSingleton(IQuickChatService, class QuickChatService implements IQuickCha }, InstantiationType.Delayed) registerSingleton(IChatAgentService, class QuickChatService implements IChatAgentService { + _serviceBrand = undefined + registerAgentImplementation = unsupported + registerDynamicAgent = unsupported + getActivatedAgents = () => [] + getAgentsByName = () => [] getFollowups = unsupported getDefaultAgent = unsupported getSecondaryAgent = unsupported updateAgent = unsupported - _serviceBrand = undefined onDidChangeAgents = Event.None registerAgentData = unsupported registerAgentCallback = unsupported @@ -2175,6 +2225,7 @@ registerSingleton(IExternalUriOpenerService, class ExternalUriOpenerService impl }, InstantiationType.Delayed) registerSingleton(IAccessibleViewService, class AccessibleViewService implements IAccessibleViewService { + getCodeBlockContext = () => undefined showLastProvider = unsupported showAccessibleViewHelp = unsupported goToSymbol = unsupported @@ -2191,8 +2242,13 @@ registerSingleton(IAccessibleViewService, class AccessibleViewService implements }, InstantiationType.Delayed) registerSingleton(IWorkbenchExtensionManagementService, class WorkbenchExtensionManagementService implements IWorkbenchExtensionManagementService { - toggleAppliationScope = async (extension: ILocalExtension) => extension _serviceBrand: undefined + onDidEnableExtensions = Event.None + isWorkspaceExtensionsSupported = () => false + getExtensions = async () => [] + getInstalledWorkspaceExtensions = async () => [] + installResourceExtension = unsupported + toggleAppliationScope = async (extension: ILocalExtension) => extension onInstallExtension = Event.None onDidInstallExtensions = Event.None onUninstallExtension = Event.None @@ -2309,6 +2365,7 @@ registerSingleton(ICommentService, class CommentService implements ICommentServi return unsupported() } + resourceHasCommentingRanges = () => false onDidChangeActiveEditingCommentThread = Event.None setActiveEditingCommentThread = unsupported setActiveCommentAndThread = unsupported @@ -2485,35 +2542,47 @@ registerSingleton(IRemoteExplorerService, class RemoteExplorerService implements registerSingleton(IAuthenticationService, class AuthenticationService implements IAuthenticationService { _serviceBrand: undefined - onDidChangeExtensionSessionAccess = Event.None - readAllowedExtensions = () => [] + onDidRegisterAuthenticationProvider = Event.None + onDidUnregisterAuthenticationProvider = Event.None + onDidChangeSessions = Event.None + onDidChangeDeclaredProviders = Event.None + declaredProviders = [] + registerDeclaredAuthenticationProvider = unsupported + unregisterDeclaredAuthenticationProvider = unsupported isAuthenticationProviderRegistered = () => false - getProviderIds = () => [] registerAuthenticationProvider = unsupported unregisterAuthenticationProvider = unsupported + getProviderIds = () => [] + getProvider = unsupported + getSessions = unsupported + createSession = unsupported + removeSession = unsupported +}, InstantiationType.Delayed) + +registerSingleton(IAuthenticationAccessService, class AuthenticationAccessService implements IAuthenticationAccessService { + _serviceBrand: undefined + onDidChangeExtensionSessionAccess = Event.None isAccessAllowed = () => false - updateAllowedExtension = unsupported + readAllowedExtensions = () => [] + updateAllowedExtensions = unsupported + removeAllowedExtensions = unsupported +}, InstantiationType.Delayed) + +registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensionsService implements IAuthenticationExtensionsService { + _serviceBrand: undefined updateSessionPreference = unsupported getSessionPreference = () => undefined removeSessionPreference = unsupported - showGetSessionPrompt = unsupported selectSession = unsupported requestSessionAccess = unsupported - completeSessionAccessRequest = unsupported requestNewSession = unsupported - sessionsUpdate = unsupported - onDidRegisterAuthenticationProvider = Event.None - onDidUnregisterAuthenticationProvider = Event.None - onDidChangeSessions = Event.None - declaredProviders = [] - onDidChangeDeclaredProviders = Event.None - getSessions = async () => [] - getLabel = unsupported - supportsMultipleAccounts = () => false - createSession = unsupported - removeSession = unsupported - manageTrustedExtensionsForAccount = unsupported - removeAccountSessions = unsupported +}, InstantiationType.Delayed) + +registerSingleton(IAuthenticationUsageService, class AuthenticationUsageService implements IAuthenticationUsageService { + _serviceBrand: undefined + readAccountUsages = unsupported + removeAccountUsage = unsupported + addAccountUsage = unsupported }, InstantiationType.Delayed) registerSingleton(ITimelineService, class TimelineService implements ITimelineService { @@ -2710,13 +2779,13 @@ registerSingleton(INotebookSearchService, class NotebookSearchService implements _serviceBrand: undefined }, InstantiationType.Delayed) -registerSingleton(IChatProviderService, class ChatProviderService implements IChatProviderService { +registerSingleton(ILanguageModelsService, class LanguageModelsService implements ILanguageModelsService { _serviceBrand: undefined - onDidChangeProviders = Event.None - getProviders = () => [] - lookupChatResponseProvider = unsupported - registerChatResponseProvider = unsupported - fetchChatResponse = unsupported + onDidChangeLanguageModels = Event.None + getLanguageModelIds = () => [] + lookupLanguageModel = () => undefined + registerLanguageModelChat = unsupported + makeLanguageModelChatRequest = unsupported }, InstantiationType.Delayed) registerSingleton(IChatSlashCommandService, class ChatSlashCommandService implements IChatSlashCommandService { @@ -2731,6 +2800,8 @@ registerSingleton(IChatSlashCommandService, class ChatSlashCommandService implem }, InstantiationType.Delayed) registerSingleton(IChatVariablesService, class ChatVariablesService implements IChatVariablesService { + getVariable = () => undefined + resolveVariable = async () => [] getDynamicVariables = unsupported getDynamicReferences = unsupported registerVariable = unsupported @@ -2821,6 +2892,7 @@ registerSingleton(IAuxiliaryWindowService, class AuxiliaryWindowService implemen registerSingleton(ISpeechService, class SpeechService implements ISpeechService { _serviceBrand: undefined + onDidChangeHasSpeechProvider = Event.None onDidStartSpeechToTextSession = Event.None onDidEndSpeechToTextSession = Event.None hasActiveSpeechToTextSession = false @@ -3143,7 +3215,15 @@ registerSingleton(IWorkspaceIdentityService, class WorkspaceIdentityService impl registerSingleton(IDefaultLogLevelsService, class DefaultLogLevelsService implements IDefaultLogLevelsService { _serviceBrand: undefined + onDidChangeDefaultLogLevels = Event.None + getDefaultLogLevel = async () => LogLevel.Off getDefaultLogLevels = unsupported setDefaultLogLevel = unsupported migrateLogLevels = unsupported }, InstantiationType.Delayed) + +registerSingleton(ICustomEditorLabelService, class CustomEditorLabelService implements ICustomEditorLabelService { + _serviceBrand: undefined + onDidChange = Event.None + getName = () => undefined +}, InstantiationType.Delayed) diff --git a/src/monaco.ts b/src/monaco.ts index b2273a30..b76af9fe 100644 --- a/src/monaco.ts +++ b/src/monaco.ts @@ -6,7 +6,7 @@ import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/edit import { IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor' import { isObject } from 'vs/base/common/types' import { deepClone, distinct } from 'vs/base/common/objects' -import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget' +import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget' import type { create as createEditor, createDiffEditor } from 'vs/editor/standalone/browser/standaloneEditor' import { errorHandler } from 'vs/base/common/errors' import { FoldingModel, setCollapseStateForMatchingLines } from 'vs/editor/contrib/folding/browser/foldingModel' diff --git a/src/service-override/authentication.ts b/src/service-override/authentication.ts index 9fa66526..33d5a793 100644 --- a/src/service-override/authentication.ts +++ b/src/service-override/authentication.ts @@ -1,10 +1,16 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' +import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' import { AuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService' +import { AuthenticationAccessService, IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService' +import { AuthenticationUsageService, IAuthenticationUsageService } from 'vs/workbench/services/authentication/browser/authenticationUsageService' +import { AuthenticationExtensionsService } from 'vs/workbench/services/authentication/browser/authenticationExtensionsService' export default function getServiceOverride (): IEditorOverrideServices { return { - [IAuthenticationService.toString()]: new SyncDescriptor(AuthenticationService, [], true) + [IAuthenticationService.toString()]: new SyncDescriptor(AuthenticationService, [], true), + [IAuthenticationAccessService.toString()]: new SyncDescriptor(AuthenticationAccessService, [], true), + [IAuthenticationExtensionsService.toString()]: new SyncDescriptor(AuthenticationExtensionsService, [], true), + [IAuthenticationUsageService.toString()]: new SyncDescriptor(AuthenticationUsageService, [], true) } } diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index e05988d7..71ce0fcd 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -8,7 +8,6 @@ import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget' import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl' import { ChatWidgetHistoryService, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService' import { ChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chatAccessibilityService' -import { ChatProviderService, IChatProviderService } from 'vs/workbench/contrib/chat/common/chatProvider' import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands' import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables' import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables' @@ -20,6 +19,7 @@ import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/brows import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl' import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService' import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl' +import { ILanguageModelsService, LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels' import 'vs/workbench/contrib/chat/browser/chat.contribution' import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution' @@ -31,7 +31,7 @@ export default function getServiceOverride (): IEditorOverrideServices { [IQuickChatService.toString()]: new SyncDescriptor(QuickChatService, [], true), [IChatAccessibilityService.toString()]: new SyncDescriptor(ChatAccessibilityService, [], true), [IChatWidgetHistoryService.toString()]: new SyncDescriptor(ChatWidgetHistoryService, [], true), - [IChatProviderService.toString()]: new SyncDescriptor(ChatProviderService, [], true), + [ILanguageModelsService.toString()]: new SyncDescriptor(LanguageModelsService, [], true), [IChatSlashCommandService.toString()]: new SyncDescriptor(ChatSlashCommandService, [], true), [IChatAgentService.toString()]: new SyncDescriptor(ChatAgentService, [], true), [IChatVariablesService.toString()]: new SyncDescriptor(ChatVariablesService, [], true), diff --git a/src/service-override/editor.ts b/src/service-override/editor.ts index b21481cf..355a6123 100644 --- a/src/service-override/editor.ts +++ b/src/service-override/editor.ts @@ -1,4 +1,4 @@ -import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' +import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { Event } from 'vs/base/common/event' import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' @@ -8,102 +8,16 @@ import { IEditorOptions } from 'vs/platform/editor/common/editor' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { IReference } from 'vs/base/common/lifecycle' import { ITextEditorService, TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' -import { GroupOrientation, IEditorGroup, IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' +import { GroupOrientation, IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey' -import { DEFAULT_EDITOR_PART_OPTIONS, IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor' +import { DEFAULT_EDITOR_PART_OPTIONS } from 'vs/workbench/browser/parts/editor/editor' import { mainWindow } from 'vs/base/browser/window' -import { MonacoDelegateEditorGroupsService, MonacoEditorService, OpenEditor } from './tools/editor' +import { MonacoDelegateEditorGroupsService, MonacoEditorService, OpenEditor, fakeActiveGroup } from './tools/editor' import { unsupported } from '../tools' import 'vs/workbench/browser/parts/editor/editor.autosave.contribution' import 'vs/workbench/contrib/files/browser/files.fileEditorFactory.contribution' import 'vs/workbench/contrib/files/browser/fileCommands.save' -class EmptyEditorGroup implements IEditorGroup, IEditorGroupView { - windowId = mainWindow.vscodeWindowId - get groupsView () { - return unsupported() - } - - notifyLabelChanged (): void {} - createEditorActions = unsupported - onDidFocus = Event.None - onDidOpenEditorFail = Event.None - whenRestored = Promise.resolve() - get titleHeight () { - return unsupported() - } - - disposed = false - setActive = unsupported - notifyIndexChanged = unsupported - relayout = unsupported - dispose = unsupported - toJSON = unsupported - preferredWidth?: number | undefined - preferredHeight?: number | undefined - get element () { - return unsupported() - } - - minimumWidth = 0 - maximumWidth = Number.POSITIVE_INFINITY - minimumHeight = 0 - maximumHeight = Number.POSITIVE_INFINITY - onDidChange = Event.None - layout = unsupported - onDidModelChange = Event.None - onWillDispose = Event.None - onDidActiveEditorChange = Event.None - onWillCloseEditor = Event.None - onDidCloseEditor = Event.None - onWillMoveEditor = Event.None - onWillOpenEditor = Event.None - id = 0 - index = 0 - label = 'main' - ariaLabel = 'main' - activeEditorPane = undefined - activeEditor = null - previewEditor = null - count = 0 - isEmpty = false - isLocked = false - stickyCount = 0 - editors = [] - get scopedContextKeyService (): IContextKeyService { return StandaloneServices.get(IContextKeyService) } - getEditors = () => [] - findEditors = () => [] - getEditorByIndex = () => undefined - getIndexOfEditor = unsupported - openEditor = unsupported - openEditors = unsupported - isPinned = () => false - isSticky = () => false - isActive = () => false - contains = () => false - moveEditor = unsupported - moveEditors = unsupported - copyEditor = unsupported - copyEditors = unsupported - closeEditor = unsupported - closeEditors = unsupported - closeAllEditors = unsupported - replaceEditors = unsupported - pinEditor = () => {} - stickEditor = () => {} - unstickEditor = () => {} - lock = () => {} - focus (): void { - // ignore - } - - isFirst = unsupported - isLast = unsupported -} - -const fakeActiveGroup = new EmptyEditorGroup() - class EmptyEditorPart implements IEditorPart { hasMaximizedGroup = () => false windowId = mainWindow.vscodeWindowId diff --git a/src/service-override/extensionGallery.ts b/src/service-override/extensionGallery.ts index 2bdbccdf..d309799c 100644 --- a/src/service-override/extensionGallery.ts +++ b/src/service-override/extensionGallery.ts @@ -24,6 +24,10 @@ import { ExtensionEnablementService } from 'vs/workbench/services/extensionManag import { ExtensionUrlHandler, IExtensionUrlHandler } from 'vs/workbench/services/extensions/browser/extensionUrlHandler' import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' +import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService' +import { ExtensionsScannerService } from 'vs/workbench/services/extensions/browser/extensionsScannerService' +import { ExtensionsProfileScannerService } from 'vs/workbench/services/extensionManagement/browser/extensionsProfileScannerService' +import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService' import { ILabelService } from 'vs/platform/label/common/label' import { IExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeatures' import { ExtensionFeaturesManagementService } from 'vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService' @@ -101,6 +105,8 @@ export default function getServiceOverride (options: ExtensionGalleryOptions = { [IRemoteUserDataProfilesService.toString()]: new SyncDescriptor(RemoteUserDataProfilesService, [], true), [IWorkbenchExtensionEnablementService.toString()]: new SyncDescriptor(ExtensionEnablementService, [], true), [IExtensionUrlHandler.toString()]: new SyncDescriptor(ExtensionUrlHandler, [], true), - [IExtensionFeaturesManagementService.toString()]: new SyncDescriptor(ExtensionFeaturesManagementService, [], true) + [IExtensionFeaturesManagementService.toString()]: new SyncDescriptor(ExtensionFeaturesManagementService, [], true), + [IExtensionsScannerService.toString()]: new SyncDescriptor(ExtensionsScannerService, [], true), + [IExtensionsProfileScannerService.toString()]: new SyncDescriptor(ExtensionsProfileScannerService, [], true) } } diff --git a/src/service-override/languages.ts b/src/service-override/languages.ts index 577f34f6..6550a49e 100644 --- a/src/service-override/languages.ts +++ b/src/service-override/languages.ts @@ -1,7 +1,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { WorkbenchLanguageService } from 'vs/workbench/services/language/common/languageService' -import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint' +import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint' import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions' import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' import { ILanguageService } from 'vs/editor/common/languages/language' diff --git a/src/service-override/layout.ts b/src/service-override/layout.ts index d9b7099c..0f318062 100644 --- a/src/service-override/layout.ts +++ b/src/service-override/layout.ts @@ -21,6 +21,7 @@ import { StandaloneCodeEditor } from 'vs/editor/standalone/browser/standaloneCod import { IHostService } from 'vs/workbench/services/host/browser/host' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' import { getMenuBarVisibility, getTitleBarStyle } from 'vs/platform/window/common/window' +import { IDisposable } from '@xterm/headless' import { onRenderWorkbench } from '../lifecycle' import { getWorkbenchContainer } from '../workbench' @@ -59,6 +60,10 @@ export class LayoutService extends Disposable implements ILayoutService, IWorkbe document.body.classList.add('web') } + whenContainerStylesLoaded (): undefined { + return undefined + } + onDidChangeMainEditorCenteredLayout = Event.None whenActiveContainerStylesLoaded = Promise.resolve() @@ -203,7 +208,7 @@ export class LayoutService extends Disposable implements ILayoutService, IWorkbe if (oldValue !== undefined) { return !oldValue } - return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.SIDE + return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.DEFAULT } focusPart (part: Parts): void { @@ -426,8 +431,11 @@ export class LayoutService extends Disposable implements ILayoutService, IWorkbe this._onDidChangeSideBarPosition.fire(positionToString(position)) } - registerPart (part: Part): void { - this.parts.set(part.getId(), part) + registerPart (part: Part): IDisposable { + const id = part.getId() + this.parts.set(id, part) + + return toDisposable(() => this.parts.delete(id)) } isRestored (): boolean { diff --git a/src/service-override/remoteAgent.ts b/src/service-override/remoteAgent.ts index 2f2fddff..c9eb63f9 100644 --- a/src/service-override/remoteAgent.ts +++ b/src/service-override/remoteAgent.ts @@ -49,7 +49,7 @@ class InjectedRemoteAuthorityResolverService extends RemoteAuthorityResolverServ const connectionToken = environmentService.options.connectionToken const remoteResourceLoader = configuration.remoteResourceProvider != null ? new BrowserRemoteResourceLoader(fileService, configuration.remoteResourceProvider) : undefined const resourceUriProvider = configuration.resourceUriProvider ?? remoteResourceLoader?.getResourceUriProvider() - super(!environmentService.expectsResolverExtension, connectionToken, resourceUriProvider, productService, logService) + super(!environmentService.expectsResolverExtension, connectionToken, resourceUriProvider, configuration.serverBasePath, productService, logService) } } diff --git a/src/service-override/tools/editor.ts b/src/service-override/tools/editor.ts index d2df406c..1eee392b 100644 --- a/src/service-override/tools/editor.ts +++ b/src/service-override/tools/editor.ts @@ -34,6 +34,92 @@ import { unsupported } from '../../tools' export type OpenEditor = (modelRef: IReference, options: IEditorOptions | undefined, sideBySide?: boolean) => Promise +class EmptyEditorGroup implements IEditorGroup, IEditorGroupView { + isTransient = () => false + windowId = mainWindow.vscodeWindowId + get groupsView () { + return unsupported() + } + + notifyLabelChanged (): void {} + createEditorActions = unsupported + onDidFocus = Event.None + onDidOpenEditorFail = Event.None + whenRestored = Promise.resolve() + get titleHeight () { + return unsupported() + } + + disposed = false + setActive = unsupported + notifyIndexChanged = unsupported + relayout = unsupported + dispose = unsupported + toJSON = unsupported + preferredWidth?: number | undefined + preferredHeight?: number | undefined + get element () { + return unsupported() + } + + minimumWidth = 0 + maximumWidth = Number.POSITIVE_INFINITY + minimumHeight = 0 + maximumHeight = Number.POSITIVE_INFINITY + onDidChange = Event.None + layout = unsupported + onDidModelChange = Event.None + onWillDispose = Event.None + onDidActiveEditorChange = Event.None + onWillCloseEditor = Event.None + onDidCloseEditor = Event.None + onWillMoveEditor = Event.None + onWillOpenEditor = Event.None + id = 0 + index = 0 + label = 'main' + ariaLabel = 'main' + activeEditorPane = undefined + activeEditor = null + previewEditor = null + count = 0 + isEmpty = false + isLocked = false + stickyCount = 0 + editors = [] + get scopedContextKeyService (): IContextKeyService { return StandaloneServices.get(IContextKeyService) } + getEditors = () => [] + findEditors = () => [] + getEditorByIndex = () => undefined + getIndexOfEditor = unsupported + openEditor = unsupported + openEditors = unsupported + isPinned = () => false + isSticky = () => false + isActive = () => false + contains = () => false + moveEditor = unsupported + moveEditors = unsupported + copyEditor = unsupported + copyEditors = unsupported + closeEditor = unsupported + closeEditors = unsupported + closeAllEditors = unsupported + replaceEditors = unsupported + pinEditor = () => {} + stickEditor = () => {} + unstickEditor = () => {} + lock = () => {} + focus (): void { + // ignore + } + + isFirst = unsupported + isLast = unsupported +} + +export const fakeActiveGroup = new EmptyEditorGroup() + class SimpleEditorPane implements IEditorPane { constructor (private editor?: ICodeEditor) {} @@ -43,7 +129,7 @@ class SimpleEditorPane implements IEditorPane { onDidBlur = Event.None input = undefined options = undefined - group = undefined + group = fakeActiveGroup scopedContextKeyService = undefined get minimumWidth () { return DEFAULT_EDITOR_MIN_DIMENSIONS.width } get maximumWidth () { return DEFAULT_EDITOR_MAX_DIMENSIONS.width } @@ -305,6 +391,8 @@ class StandaloneEditorGroup extends Disposable implements IEditorGroup, IEditorG } } + isTransient = () => false + windowId = mainWindow.vscodeWindowId get groupsView () { @@ -528,7 +616,6 @@ export class MonacoDelegateEditorGroupsService e } get mainPart (): IEditorGroupsService['mainPart'] { return this.delegate.mainPart } - get activePart (): IEditorGroupsService['activePart'] { return this.delegate.activePart } onDidChangeGroupMaximized = this.delegate.onDidChangeGroupMaximized getPart(group: number | IEditorGroup): IEditorPart getPart(container: unknown): IEditorPart | undefined diff --git a/src/service-override/tools/views.ts b/src/service-override/tools/views.ts index 5aaedf2f..079d749b 100644 --- a/src/service-override/tools/views.ts +++ b/src/service-override/tools/views.ts @@ -34,8 +34,9 @@ import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/ import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' import { Event } from 'vs/base/common/event' import { IView, SplitView } from 'vs/base/browser/ui/splitview/splitview' +import { fakeActiveGroup } from './editor' import type { LayoutService } from '../layout' -import { withReadyServices } from '../../services' +import { IEditorGroup, withReadyServices } from '../../services' type Label = string | { short: string @@ -47,7 +48,7 @@ abstract class InjectedEditorPane extends EditorPane { constructor ( id: string ) { - super(id, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService)) + super(id, fakeActiveGroup, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService)) } } @@ -202,7 +203,7 @@ abstract class SimpleEditorInput extends EditorInput { function registerEditorPane ( typeId: string, name: string, - ctor: new (...services: Services) => EditorPane, + ctor: new (group: IEditorGroup, ...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[] ): IDisposable { return Registry.as(EditorExtensions.EditorPane).registerEditorPane( diff --git a/src/service-override/views.ts b/src/service-override/views.ts index 29a5f06f..42b64632 100644 --- a/src/service-override/views.ts +++ b/src/service-override/views.ts @@ -60,10 +60,11 @@ import { EditorParts } from 'vs/workbench/browser/parts/editor/editorParts' import { BrowserAuxiliaryWindowService, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService' import { IViewsService } from 'vs/workbench/services/views/common/viewsService' import { ViewsService } from 'vs/workbench/services/views/browser/viewsService' -import { HoverService } from 'vs/editor/browser/services/hoverService' import { IHoverService } from 'vs/platform/hover/browser/hover' import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService' import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService' +import { HoverService } from 'vs/editor/browser/services/hoverService/hoverService' +import { CustomEditorLabelService, ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' import { MonacoDelegateEditorGroupsService, MonacoEditorService, OpenEditor } from './tools/editor' import getBulkEditServiceOverride from './bulkEdit' import { LayoutService } from './layout' @@ -232,6 +233,10 @@ class MonacoEditorParts extends MonacoDelegateEditorGroupsService i restoreGroup: EditorPart['restoreGroup'] = (...args) => { return this.delegate.restoreGroup(...args) } + + get activePart (): EditorPart { + return this.delegate.activePart + } } let webviewIframeAlternateDomains: string | undefined @@ -738,7 +743,8 @@ function getServiceOverride (openEditorFallback?: OpenEditor, _webviewIframeAlte [IWebviewWorkbenchService.toString()]: new SyncDescriptor(WebviewEditorService, [], true), [IProgressService.toString()]: new SyncDescriptor(ProgressService, [], true), [IAuxiliaryWindowService.toString()]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true), - [IEditorPaneService.toString()]: new SyncDescriptor(EditorPaneService, [], true) + [IEditorPaneService.toString()]: new SyncDescriptor(EditorPaneService, [], true), + [ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true) } } diff --git a/src/service-override/workbench.ts b/src/service-override/workbench.ts index a471f5fd..59a337de 100644 --- a/src/service-override/workbench.ts +++ b/src/service-override/workbench.ts @@ -35,7 +35,6 @@ import { ProgressService } from 'vs/workbench/services/progress/browser/progress import { PaneCompositePartService } from 'vs/workbench/browser/parts/paneCompositePartService' import { BrowserAuxiliaryWindowService, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService' import { ViewsService } from 'vs/workbench/services/views/browser/viewsService' -import { HoverService } from 'vs/editor/browser/services/hoverService' import { IHoverService } from 'vs/platform/hover/browser/hover' import { EditorService } from 'vs/workbench/services/editor/browser/editorService' import { EditorParts } from 'vs/workbench/browser/parts/editor/editorParts' @@ -46,6 +45,8 @@ import { mainWindow } from 'vs/base/browser/window' import { setFullscreen } from 'vs/base/browser/browser' import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService' import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPaneService' +import { CustomEditorLabelService, ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' +import { HoverService } from './views' import getKeybindingsOverride from './keybindings' import getQuickAccessOverride from './quickaccess' import getBulkEditServiceOverride from './bulkEdit' @@ -166,6 +167,7 @@ function getServiceOverride (options?: IWorkbenchOptions, _webviewIframeAlternat [IProgressService.toString()]: new SyncDescriptor(ProgressService, [], true), [IAuxiliaryWindowService.toString()]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true), [IEditorPaneService.toString()]: new SyncDescriptor(EditorPaneService, [], true), + [ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true), ...getTitleBarServiceOverride(), ...getStatusBarServiceOverride(), ...getBannerServiceOverride() diff --git a/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch b/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch index b55dee15..e4a3cf1d 100644 --- a/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch +++ b/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: allow importing vscode-oniguruma 1 file changed, 1 insertion(+) diff --git a/.eslintrc.json b/.eslintrc.json -index 0922babfe92..59769eeda54 100644 +index b174b6f348a..851564cf0e5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json -@@ -671,6 +671,7 @@ +@@ -669,6 +669,7 @@ "v8-inspect-profiler", "vscode-regexpp", "vscode-textmate", diff --git a/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch b/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch index ed8a8793..d24c7714 100644 --- a/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch +++ b/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fix: fix some build process edge cases 2 files changed, 14 insertions(+) diff --git a/build/lib/standalone.js b/build/lib/standalone.js -index 4ddf88ed223..d24023726cd 100644 +index dbc47db0833..796415b5721 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js @@ -150,6 +150,9 @@ function createESMSourcesAndResources2(options) { diff --git a/vscode-paches/0005-feat-output-es2020.patch b/vscode-paches/0005-feat-output-es2020.patch index 4a2b5ae2..108876d8 100644 --- a/vscode-paches/0005-feat-output-es2020.patch +++ b/vscode-paches/0005-feat-output-es2020.patch @@ -11,7 +11,7 @@ Subject: [PATCH] feat: output es2020 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/lib/standalone.js b/build/lib/standalone.js -index d24023726cd..2ffc91efc9c 100644 +index 796415b5721..723a1127492 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js @@ -134,7 +134,7 @@ function createESMSourcesAndResources2(options) { diff --git a/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch b/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch index 64674019..ecf5a1c5 100644 --- a/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch +++ b/vscode-paches/0006-feat-add-a-way-to-register-a-locale-with-translation.patch @@ -4,15 +4,33 @@ Date: Mon, 11 Mar 2024 16:45:29 +0100 Subject: [PATCH] feat: add a way to register a locale with translations --- - build/lib/standalone.js | 7 +++++++ + build/lib/standalone.js | 12 ++++++++++-- build/lib/standalone.ts | 8 ++++++++ src/vs/nls.ts | 31 ++++++++++++++++++++++++++++++- - 3 files changed, 45 insertions(+), 1 deletion(-) + 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/build/lib/standalone.js b/build/lib/standalone.js -index 2ffc91efc9c..ddb16108fda 100644 +index 723a1127492..206d4dfb9a4 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js +@@ -4,8 +4,7 @@ + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + Object.defineProperty(exports, "__esModule", { value: true }); +-exports.extractEditor = extractEditor; +-exports.createESMSourcesAndResources2 = createESMSourcesAndResources2; ++exports.createESMSourcesAndResources2 = exports.extractEditor = void 0; + const fs = require("fs"); + const path = require("path"); + const tss = require("./treeshaking"); +@@ -112,6 +111,7 @@ function extractEditor(options) { + 'vs/nls.mock.ts', + ].forEach(copyFile); + } ++exports.extractEditor = extractEditor; + function createESMSourcesAndResources2(options) { + const ts = require('typescript'); + const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder); @@ -190,6 +190,13 @@ function createESMSourcesAndResources2(options) { fileContents = fileContents.replace(/import ([a-zA-Z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) { return `import * as ${m1} from ${m2};`; @@ -23,12 +41,20 @@ index 2ffc91efc9c..ddb16108fda 100644 + }); + } + fileContents = fileContents.replace(/import { (localize2?) }/g, 'import { $1WithPath }'); -+ fileContents = fileContents.replace(/import { localize, localize2 }/g, 'import { localizeWithPath, localize2WithPath }'); ++ fileContents = fileContents.replace(/import { (localize2?), (localize2?) }/g, 'import { $1WithPath, $2WithPath }'); write(getDestAbsoluteFilePath(file), fileContents); continue; } +@@ -258,6 +265,7 @@ function createESMSourcesAndResources2(options) { + } + } + } ++exports.createESMSourcesAndResources2 = createESMSourcesAndResources2; + function transportCSS(module, enqueue, write) { + if (!/\.css/.test(module)) { + return false; diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts -index 90517a9236f..224f376d4bf 100644 +index 90517a9236f..193ed02f7f6 100644 --- a/build/lib/standalone.ts +++ b/build/lib/standalone.ts @@ -223,6 +223,14 @@ export function createESMSourcesAndResources2(options: IOptions2): void { @@ -41,7 +67,7 @@ index 90517a9236f..224f376d4bf 100644 + }); + } + fileContents = fileContents.replace(/import { (localize2?) }/g, 'import { $1WithPath }'); -+ fileContents = fileContents.replace(/import { localize, localize2 }/g, 'import { localizeWithPath, localize2WithPath }'); ++ fileContents = fileContents.replace(/import { (localize2?), (localize2?) }/g, 'import { $1WithPath, $2WithPath }'); + write(getDestAbsoluteFilePath(file), fileContents); continue; diff --git a/vscode-paches/0011-feat-add-static-asset-url-mechanism.patch b/vscode-paches/0011-feat-add-static-asset-url-mechanism.patch index ebaf44e2..ff1606b2 100644 --- a/vscode-paches/0011-feat-add-static-asset-url-mechanism.patch +++ b/vscode-paches/0011-feat-add-static-asset-url-mechanism.patch @@ -12,7 +12,7 @@ Subject: [PATCH] feat: add static asset url mechanism 5 files changed, 218 insertions(+), 59 deletions(-) diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts -index 974d0c21743..aae916fa686 100644 +index cfc5b173887..f7e8874332c 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -4,6 +4,8 @@ @@ -24,7 +24,7 @@ index 974d0c21743..aae916fa686 100644 import * as platform from 'vs/base/common/platform'; import { equalsIgnoreCase, startsWithIgnoreCase } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; -@@ -223,6 +225,30 @@ export const VSCODE_AUTHORITY = 'vscode-app'; +@@ -231,6 +233,30 @@ export const VSCODE_AUTHORITY = 'vscode-app'; class FileAccessImpl { private static readonly FALLBACK_AUTHORITY = VSCODE_AUTHORITY; @@ -55,7 +55,7 @@ index 974d0c21743..aae916fa686 100644 /** * Returns a URI to use in contexts where the browser is responsible -@@ -231,7 +257,7 @@ class FileAccessImpl { +@@ -239,7 +265,7 @@ class FileAccessImpl { * **Note:** use `dom.ts#asCSSUrl` whenever the URL is to be used in CSS context. */ asBrowserUri(resourcePath: AppResourcePath | ''): URI { @@ -64,7 +64,7 @@ index 974d0c21743..aae916fa686 100644 return this.uriToBrowserUri(uri); } -@@ -270,7 +296,7 @@ class FileAccessImpl { +@@ -278,7 +304,7 @@ class FileAccessImpl { }); } @@ -73,7 +73,7 @@ index 974d0c21743..aae916fa686 100644 } /** -@@ -278,7 +304,7 @@ class FileAccessImpl { +@@ -286,7 +312,7 @@ class FileAccessImpl { * is responsible for loading. */ asFileUri(resourcePath: AppResourcePath | ''): URI { @@ -82,7 +82,7 @@ index 974d0c21743..aae916fa686 100644 return this.uriToFileUri(uri); } -@@ -310,6 +336,19 @@ class FileAccessImpl { +@@ -318,6 +344,19 @@ class FileAccessImpl { return URI.parse(moduleIdToUrl.toUrl(uriOrModule)); } @@ -121,10 +121,10 @@ index 6732d38f5e6..72abfc8af21 100644 class ExtensionHostProxy implements IExtensionHostProxy { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts -index 5c18ab8657a..d7f00aaca84 100644 +index c4f5c720677..4a83e7e54ae 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts -@@ -1436,6 +1436,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { +@@ -1443,6 +1443,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { $onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void; $setPerformanceMarks(marks: performance.PerformanceMark[]): Promise; $asBrowserUri(uri: UriComponents): Promise; diff --git a/vscode-paches/0015-fix-apply-style-only-on-standalone-editors.patch b/vscode-paches/0015-fix-apply-style-only-on-standalone-editors.patch index 64958cff..977fbe2a 100644 --- a/vscode-paches/0015-fix-apply-style-only-on-standalone-editors.patch +++ b/vscode-paches/0015-fix-apply-style-only-on-standalone-editors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix: apply style only on standalone editors --- .../browser/config/editorConfiguration.ts | 12 ++++++-- - .../editor/browser/widget/codeEditorWidget.ts | 12 ++++++-- + .../widget/codeEditor/codeEditorWidget.ts | 12 ++++++-- .../widget/diffEditor/diffEditorWidget.ts | 8 ++++++ .../standalone/browser/standalone-tokens.css | 28 +++++++++---------- .../browser/standaloneCodeEditor.ts | 4 +-- @@ -77,24 +77,11 @@ index 06e8339cbc7..799c2f81cd0 100644 public static validateOptions(options: IEditorOptions): ValidatedEditorOptions { const result = new ValidatedEditorOptions(); -diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts -index 5466f913d24..d8dfad03a43 100644 ---- a/src/vs/editor/browser/widget/codeEditorWidget.ts -+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts -@@ -70,6 +70,12 @@ export interface ICodeEditorWidgetOptions { - */ - isSimpleWidget?: boolean; - -+ /** -+ * Is this a standalone editor -+ * Defaults to false. -+ */ -+ isStandaloneEditor?: boolean; -+ - /** - * Contributions to instantiate. - * When provided, only the contributions included will be instantiated. -@@ -300,7 +306,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE +diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts +index 108aa52fa8a..dd294d50a2e 100644 +--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts ++++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts +@@ -254,7 +254,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE this._decorationTypeSubtypes = {}; this._telemetryData = codeEditorWidgetOptions.telemetryData; @@ -103,7 +90,7 @@ index 5466f913d24..d8dfad03a43 100644 this._register(this._configuration.onDidChange((e) => { this._onDidChangeConfiguration.fire(e); -@@ -408,8 +414,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE +@@ -362,8 +362,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE this._modelData?.view.writeScreenReaderContent(reason); } @@ -114,11 +101,24 @@ index 5466f913d24..d8dfad03a43 100644 } public getId(): string { +@@ -1896,6 +1896,12 @@ export interface ICodeEditorWidgetOptions { + */ + isSimpleWidget?: boolean; + ++ /** ++ * Is this a standalone editor ++ * Defaults to false. ++ */ ++ isStandaloneEditor?: boolean; ++ + /** + * Contributions to instantiate. + * When provided, only the contributions included will be instantiated. diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts -index 6b57de66397..67837f9885e 100644 +index 7e5ac2ea408..5bcb6f60fab 100644 --- a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts -@@ -49,6 +49,12 @@ import { RevertButtonsFeature } from 'vs/editor/browser/widget/diffEditor/featur +@@ -50,6 +50,12 @@ import { DiffEditorGutter } from 'vs/editor/browser/widget/diffEditor/features/g export interface IDiffCodeEditorWidgetOptions { originalEditor?: ICodeEditorWidgetOptions; modifiedEditor?: ICodeEditorWidgetOptions; @@ -131,7 +131,7 @@ index 6b57de66397..67837f9885e 100644 } export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor { -@@ -105,6 +111,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor { +@@ -111,6 +117,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor { this._contextKeyService.createKey('isInDiffEditor', true); @@ -194,7 +194,7 @@ index 1fc85078f9e..c74aca00541 100644 outline-style: solid; outline-offset: -1px; diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts -index 479bb75745c..f5b5da97a2c 100644 +index c80bdf63686..37f7bd893ba 100644 --- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts @@ -282,7 +282,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon @@ -229,7 +229,7 @@ index b5d42908ded..3815f8fb823 100644 protected override _readEnvConfiguration(): IEnvConfiguration { diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts -index b29e05c8053..f941b3a248f 100644 +index c0a4b9d1cf3..f260372b1fc 100644 --- a/src/vs/editor/test/browser/testCodeEditor.ts +++ b/src/vs/editor/test/browser/testCodeEditor.ts @@ -68,7 +68,7 @@ export interface ITestCodeEditor extends IActiveCodeEditor { diff --git a/vscode-paches/0016-fix-use-existing-method.patch b/vscode-paches/0016-fix-use-existing-method.patch index 11ca55e7..304c7fe0 100644 --- a/vscode-paches/0016-fix-use-existing-method.patch +++ b/vscode-paches/0016-fix-use-existing-method.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: use existing method 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index 351f85537d8..cf0f43c7d48 100644 +index c3d2f3c41c3..9e012841726 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -554,7 +554,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { diff --git a/vscode-paches/0017-refactor-split-code.patch b/vscode-paches/0017-refactor-split-code.patch index 695bc20d..eb1eee17 100644 --- a/vscode-paches/0017-refactor-split-code.patch +++ b/vscode-paches/0017-refactor-split-code.patch @@ -9,7 +9,7 @@ Subject: [PATCH] refactor: split code 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index cf0f43c7d48..a2565626513 100644 +index 9e012841726..df611c4ad7f 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -525,15 +525,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { @@ -35,7 +35,7 @@ index cf0f43c7d48..a2565626513 100644 } return this._cachedResolver; diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts -index 708268ba3c3..c2cee773044 100644 +index 76b3fa79a5c..3c98bf9aec0 100644 --- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts @@ -428,10 +428,14 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { diff --git a/vscode-paches/0018-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch b/vscode-paches/0018-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch index 7351ae67..4390a4de 100644 --- a/vscode-paches/0018-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch +++ b/vscode-paches/0018-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch @@ -9,7 +9,7 @@ Subject: [PATCH] cleanup: remove code already done in 1 file changed, 12 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index a2565626513..d6995d24729 100644 +index df611c4ad7f..85fc1c5f58d 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -90,8 +90,6 @@ import { DefaultConfiguration } from 'vs/platform/configuration/common/configura diff --git a/vscode-paches/0019-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch b/vscode-paches/0019-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch index 1b04edd6..e8d338bd 100644 --- a/vscode-paches/0019-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch +++ b/vscode-paches/0019-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch @@ -18,10 +18,10 @@ Subject: [PATCH] fix: replace amd imports by regular esm dynamic imports 11 files changed, 31 insertions(+), 50 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json -index 59769eeda54..5ed8297cf46 100644 +index 851564cf0e5..ca34f633edd 100644 --- a/.eslintrc.json +++ b/.eslintrc.json -@@ -297,14 +297,6 @@ +@@ -295,14 +295,6 @@ "jsdoc/require-returns": "warn" } }, @@ -36,7 +36,7 @@ index 59769eeda54..5ed8297cf46 100644 { "files": [ "src/**/{browser,electron-sandbox}/**/*.ts" -@@ -860,6 +852,7 @@ +@@ -858,6 +850,7 @@ }, // TODO@layers "tas-client-umd", // node module allowed even in /common/ "vscode-textmate", // node module allowed even in /common/ @@ -89,7 +89,7 @@ index c54187f89c9..a4729fabe2e 100644 const collectorChannelPlugin: PostChannel = new postPlugin.PostChannel(); // Configure the app insights core to send to collector++ and disable logging of debug info diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts -index 84bde0d8006..941c88582cb 100644 +index 99f6f8b4357..2682e80eaae 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -83,7 +83,6 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history'; @@ -110,7 +110,7 @@ index 84bde0d8006..941c88582cb 100644 Terminal.strings.promptLabel = nls.localize('terminal.integrated.a11yPromptLabel', 'Terminal input'); Terminal.strings.tooMuchOutput = keybinding ? nls.localize('terminal.integrated.useAccessibleBuffer', 'Use the accessible buffer {0} to manually review output', keybinding.getLabel()) : nls.localize('terminal.integrated.useAccessibleBufferNoKb', 'Use the Terminal: Focus Accessible Buffer command to manually review output'); diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts -index 0f2ef8f01f4..a0d82d41170 100644 +index c304610faa7..1a2362cf7b8 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts @@ -35,7 +35,6 @@ import { DecorationAddon } from 'vs/workbench/contrib/terminal/browser/xterm/dec @@ -121,7 +121,7 @@ index 0f2ef8f01f4..a0d82d41170 100644 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; -@@ -754,7 +753,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach +@@ -756,7 +755,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach protected async _getCanvasAddonConstructor(): Promise { if (!CanvasAddon) { @@ -130,7 +130,7 @@ index 0f2ef8f01f4..a0d82d41170 100644 } return CanvasAddon; } -@@ -780,35 +779,35 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach +@@ -782,35 +781,35 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach protected async _getImageAddonConstructor(): Promise { if (!ImageAddon) { @@ -172,7 +172,7 @@ index 0f2ef8f01f4..a0d82d41170 100644 return SerializeAddon; } diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts -index 8868f63beef..6aaa5c0c2df 100644 +index f3c1633701d..61ddc698f93 100644 --- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts +++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts @@ -5,7 +5,6 @@ @@ -182,8 +182,8 @@ index 8868f63beef..6aaa5c0c2df 100644 -import { importAMDNodeModule } from 'vs/amdX'; import { $, addDisposableListener, addStandardDisposableListener, getWindow } from 'vs/base/browser/dom'; import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; - import { debounce, memoize, throttle } from 'vs/base/common/decorators'; -@@ -467,13 +466,13 @@ export class TerminalStickyScrollOverlay extends Disposable { + import { memoize, throttle } from 'vs/base/common/decorators'; +@@ -480,13 +479,13 @@ export class TerminalStickyScrollOverlay extends Disposable { @memoize private async _getCanvasAddonConstructor(): Promise { diff --git a/vscode-paches/0020-fix-update-import-syntax-for-node-in-ESM.patch b/vscode-paches/0020-fix-update-import-syntax-for-node-in-ESM.patch index a2f8c317..26ac8c73 100644 --- a/vscode-paches/0020-fix-update-import-syntax-for-node-in-ESM.patch +++ b/vscode-paches/0020-fix-update-import-syntax-for-node-in-ESM.patch @@ -13,7 +13,7 @@ Subject: [PATCH] fix: update import syntax for node in ESM 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts -index 0d3a9795ffb..2cc1981808a 100644 +index 327c18c18ad..49b3d6d47c5 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -3,7 +3,7 @@ diff --git a/vscode-paches/0021-feat-export-some-classes-and-make-some-methods-acces.patch b/vscode-paches/0021-feat-export-some-classes-and-make-some-methods-acces.patch index 015d47f6..98f2f9a8 100644 --- a/vscode-paches/0021-feat-export-some-classes-and-make-some-methods-acces.patch +++ b/vscode-paches/0021-feat-export-some-classes-and-make-some-methods-acces.patch @@ -54,7 +54,7 @@ index 99dd3279fe8..b692381eaa2 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index a2b6007fb79..4ee25602224 100644 +index 69fd77ff4ff..3ff2d974cb6 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -52,7 +52,7 @@ import { CustomTitleBarVisibility } from '../../platform/window/common/window'; @@ -96,7 +96,7 @@ index a2b6007fb79..4ee25602224 100644 readonly filesToDiff?: IPathToOpen[]; readonly filesToMerge?: IPathToOpen[]; diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index 8a311d4bb0e..56e9b6f58cf 100644 +index c7302a6be67..cbc07dc7fb0 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -76,7 +76,7 @@ export class Workbench extends Layout { @@ -167,15 +167,15 @@ index 08449bd2cd7..f82ac191725 100644 private static readonly LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY = 'debug.lastExtensionDevelopmentWorkspace'; diff --git a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts -index 9feccec6965..64b9e5d3ed0 100644 +index 522b64a8cd6..b43c170bf2e 100644 --- a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts +++ b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts -@@ -33,7 +33,7 @@ export interface IDefaultLogLevelsService { +@@ -42,7 +42,7 @@ export interface IDefaultLogLevelsService { migrateLogLevels(): void; } --class DefaultLogLevelsService implements IDefaultLogLevelsService { -+export class DefaultLogLevelsService implements IDefaultLogLevelsService { +-class DefaultLogLevelsService extends Disposable implements IDefaultLogLevelsService { ++export class DefaultLogLevelsService extends Disposable implements IDefaultLogLevelsService { _serviceBrand: undefined; @@ -237,10 +237,10 @@ index a181772e8c4..098be8e230d 100644 getInitData: async (): Promise => { if (isInitialStart) { diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts -index d019d14c4fb..78d4a00fa7f 100644 +index 65672a170be..0426642269a 100644 --- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts +++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts -@@ -98,7 +98,7 @@ type ExtensionUrlHandlerClassification = { +@@ -108,7 +108,7 @@ type ExtensionUrlReloadHandlerClassification = { * * It also makes sure the user confirms opening URLs directed towards extensions. */ @@ -263,7 +263,7 @@ index b6d4f0f3831..a5f5e42eddd 100644 if (this._environmentService.debugExtensionHost && this._environmentService.debugRenderer) { suffixSearchParams.set('debugged', '1'); diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts -index 2d93e41d0f0..0abfe0b61a3 100644 +index 4b2a585afc3..70b20e8fd08 100644 --- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts +++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts @@ -94,9 +94,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx @@ -279,7 +279,7 @@ index 2d93e41d0f0..0abfe0b61a3 100644 @IInstantiationService protected readonly _instantiationService: IInstantiationService, @INotificationService protected readonly _notificationService: INotificationService, @IWorkbenchEnvironmentService protected readonly _environmentService: IWorkbenchEnvironmentService, -@@ -211,7 +211,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx +@@ -220,7 +220,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx //#region deltaExtensions @@ -288,7 +288,7 @@ index 2d93e41d0f0..0abfe0b61a3 100644 this._deltaExtensionsQueue.push(item); if (this._inHandleDeltaExtensions) { // Let the current item finish, the new one will be picked up -@@ -1193,7 +1193,7 @@ export interface IExtensionHostFactory { +@@ -1206,7 +1206,7 @@ export interface IExtensionHostFactory { createExtensionHost(runningLocations: ExtensionRunningLocationTracker, runningLocation: ExtensionRunningLocation, isInitialStart: boolean): IExtensionHost | null; } @@ -298,7 +298,7 @@ index 2d93e41d0f0..0abfe0b61a3 100644 public readonly toAdd: IExtension[], public readonly toRemove: string[] | IExtension[] diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts -index c2cee773044..956db0ac3bd 100644 +index 3c98bf9aec0..3ab26183771 100644 --- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts @@ -423,7 +423,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { diff --git a/vscode-paches/0022-fix-improve-extension-contribution-types.patch b/vscode-paches/0022-fix-improve-extension-contribution-types.patch index a8cd57ed..b075da79 100644 --- a/vscode-paches/0022-fix-improve-extension-contribution-types.patch +++ b/vscode-paches/0022-fix-improve-extension-contribution-types.patch @@ -11,7 +11,7 @@ Subject: [PATCH] fix: improve extension contribution types 4 files changed, 1127 insertions(+), 78 deletions(-) diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts -index 413c1db06f1..c1667ac6c33 100644 +index 331aba1b55f..7b6a935ec9c 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts @@ -3,6 +3,7 @@ diff --git a/vscode-paches/0024-fix-only-run-some-code-if-inside-the-worker.patch b/vscode-paches/0024-fix-only-run-some-code-if-inside-the-worker.patch index 7af2ee19..f34d9781 100644 --- a/vscode-paches/0024-fix-only-run-some-code-if-inside-the-worker.patch +++ b/vscode-paches/0024-fix-only-run-some-code-if-inside-the-worker.patch @@ -10,10 +10,10 @@ Subject: [PATCH] fix: only run some code if inside the worker 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts -index 91f910aa4c8..4660b516306 100644 +index 2679364d945..acb1625ad3f 100644 --- a/src/vs/workbench/api/common/extHostExtensionService.ts +++ b/src/vs/workbench/api/common/extHostExtensionService.ts -@@ -44,7 +44,7 @@ import { Schemas } from 'vs/base/common/network'; +@@ -45,7 +45,7 @@ import { Schemas } from 'vs/base/common/network'; import { IResolveAuthorityResult } from 'vs/workbench/services/extensions/common/extensionHostProxy'; import { IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService'; import { StopWatch } from 'vs/base/common/stopwatch'; @@ -22,7 +22,7 @@ index 91f910aa4c8..4660b516306 100644 import { IExtHostManagedSockets } from 'vs/workbench/api/common/extHostManagedSockets'; import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier'; -@@ -256,9 +256,11 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme +@@ -259,9 +259,11 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme this._extHostTerminalService.dispose(); this._activator.dispose(); diff --git a/vscode-paches/0030-refactor-split-some-modules-to-be-able-to-import-the.patch b/vscode-paches/0030-refactor-split-some-modules-to-be-able-to-import-the.patch index 789a6092..c18073cc 100644 --- a/vscode-paches/0030-refactor-split-some-modules-to-be-able-to-import-the.patch +++ b/vscode-paches/0030-refactor-split-some-modules-to-be-able-to-import-the.patch @@ -9,12 +9,12 @@ Subject: [PATCH] refactor: split some modules to be able to import them .../parts/editor/editor.contribution.ts | 3 +- .../files/browser/fileCommands.save.ts | 198 ++++++ .../contrib/files/browser/fileCommands.ts | 245 +------ - .../files.configuration.contribution.ts | 307 +++++++++ - .../files/browser/files.contribution.ts | 633 +----------------- + .../files.configuration.contribution.ts | 313 +++++++++ + .../files/browser/files.contribution.ts | 639 +----------------- .../browser/files.editorPane.contribution.ts | 94 +++ .../browser/files.explorer.contribution.ts | 270 ++++++++ .../files.fileEditorFactory.contribution.ts | 23 + - 9 files changed, 940 insertions(+), 842 deletions(-) + 9 files changed, 946 insertions(+), 848 deletions(-) create mode 100644 src/vs/workbench/browser/parts/editor/editor.autosave.contribution.ts create mode 100644 src/vs/workbench/contrib/files/browser/fileCommands.save.ts create mode 100644 src/vs/workbench/contrib/files/browser/files.configuration.contribution.ts @@ -38,10 +38,10 @@ index 00000000000..c7416d68719 + +registerWorkbenchContribution2(EditorAutoSave.ID, EditorAutoSave, WorkbenchPhase.BlockRestore); diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts -index ca21ad13864..cd246dcb75b 100644 +index 1611076ea51..5dbfc0eb861 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts -@@ -60,7 +60,6 @@ import { isMacintosh } from 'vs/base/common/platform'; +@@ -61,7 +61,6 @@ import { isMacintosh } from 'vs/base/common/platform'; import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions'; import { FloatingEditorClickMenu } from 'vs/workbench/browser/codeeditor'; import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; @@ -49,7 +49,7 @@ index ca21ad13864..cd246dcb75b 100644 import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess'; import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess'; import { FileAccess } from 'vs/base/common/network'; -@@ -71,6 +70,7 @@ import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/e +@@ -72,6 +71,7 @@ import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/e import { EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from 'vs/workbench/browser/actions/layoutActions'; import { ICommandAction } from 'vs/platform/action/common/action'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; @@ -57,7 +57,7 @@ index ca21ad13864..cd246dcb75b 100644 //#region Editor Registrations -@@ -127,7 +127,6 @@ Registry.as(EditorExtensions.EditorFactory).registerEdit +@@ -128,7 +128,6 @@ Registry.as(EditorExtensions.EditorFactory).registerEdit //#region Workbench Contributions @@ -67,7 +67,7 @@ index ca21ad13864..cd246dcb75b 100644 registerWorkbenchContribution2(DynamicEditorConfigurations.ID, DynamicEditorConfigurations, WorkbenchPhase.BlockRestore); diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.save.ts b/src/vs/workbench/contrib/files/browser/fileCommands.save.ts new file mode 100644 -index 00000000000..e7540d3d049 +index 00000000000..d9a94570df9 --- /dev/null +++ b/src/vs/workbench/contrib/files/browser/fileCommands.save.ts @@ -0,0 +1,198 @@ @@ -85,7 +85,7 @@ index 00000000000..e7540d3d049 +import { isEqual } from 'vs/base/common/resources'; +import { URI } from 'vs/base/common/uri'; +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; -+import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; ++import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget'; +import * as nls from 'vs/nls'; +import { CommandsRegistry } from 'vs/platform/commands/common/commands'; +import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; @@ -270,7 +270,7 @@ index 00000000000..e7540d3d049 + } +}); diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts -index 6fa04545a0e..7fe3e6ecee1 100644 +index da1e9c4dcd5..7fe3e6ecee1 100644 --- a/src/vs/workbench/contrib/files/browser/fileCommands.ts +++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts @@ -3,56 +3,48 @@ @@ -327,7 +327,7 @@ index 6fa04545a0e..7fe3e6ecee1 100644 -import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { coalesce } from 'vs/base/common/arrays'; -import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; --import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; +-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget'; -import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; +import { IListService } from 'vs/platform/list/browser/listService'; +import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -542,10 +542,10 @@ index 6fa04545a0e..7fe3e6ecee1 100644 handler: async accessor => { diff --git a/src/vs/workbench/contrib/files/browser/files.configuration.contribution.ts b/src/vs/workbench/contrib/files/browser/files.configuration.contribution.ts new file mode 100644 -index 00000000000..39509160248 +index 00000000000..500edea7d1b --- /dev/null +++ b/src/vs/workbench/contrib/files/browser/files.configuration.contribution.ts -@@ -0,0 +1,307 @@ +@@ -0,0 +1,313 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. @@ -671,6 +671,12 @@ index 00000000000..39509160248 + 'description': nls.localize('trimTrailingWhitespace', "When enabled, will trim trailing whitespace when saving a file."), + 'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE + }, ++ 'files.trimTrailingWhitespaceInRegexAndStrings': { ++ 'type': 'boolean', ++ 'default': true, ++ 'description': nls.localize('trimTrailingWhitespaceInRegexAndStrings', "When enabled, trailing whitespace will be removed from multiline strings and regexes will be removed on save or when executing 'editor.action.trimTrailingWhitespace'. This can cause whitespace to not be trimmed from lines when there isn't up-to-date token information."), ++ 'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE ++ }, + 'files.insertFinalNewline': { + 'type': 'boolean', + 'default': false, @@ -854,10 +860,10 @@ index 00000000000..39509160248 + } +}); diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts -index 80162ffd007..98d8dec26be 100644 +index cc35374830e..98d8dec26be 100644 --- a/src/vs/workbench/contrib/files/browser/files.contribution.ts +++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts -@@ -3,632 +3,7 @@ +@@ -3,638 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ @@ -1088,6 +1094,12 @@ index 80162ffd007..98d8dec26be 100644 - 'description': nls.localize('trimTrailingWhitespace', "When enabled, will trim trailing whitespace when saving a file."), - 'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE - }, +- 'files.trimTrailingWhitespaceInRegexAndStrings': { +- 'type': 'boolean', +- 'default': true, +- 'description': nls.localize('trimTrailingWhitespaceInRegexAndStrings', "When enabled, trailing whitespace will be removed from multiline strings and regexes will be removed on save or when executing 'editor.action.trimTrailingWhitespace'. This can cause whitespace to not be trimmed from lines when there isn't up-to-date token information."), +- 'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE +- }, - 'files.insertFinalNewline': { - 'type': 'boolean', - 'default': false, diff --git a/vscode-paches/0031-fix-replace-map-by-forEach.patch b/vscode-paches/0031-fix-replace-map-by-forEach.patch index 7369d85d..e2bf0769 100644 --- a/vscode-paches/0031-fix-replace-map-by-forEach.patch +++ b/vscode-paches/0031-fix-replace-map-by-forEach.patch @@ -9,10 +9,10 @@ Subject: [PATCH] fix: replace map by forEach 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts -index 76d6c0c1ee4..3060baec73a 100644 +index a9fc39c84ed..957684aa7f7 100644 --- a/src/vs/workbench/browser/parts/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositeBar.ts -@@ -476,7 +476,7 @@ export class CompositeBar extends Widget implements ICompositeBar { +@@ -477,7 +477,7 @@ export class CompositeBar extends Widget implements ICompositeBar { // Compute sizes only if visible. Otherwise the size measurment would be computed wrongly. const currentItemsLength = compositeSwitcherBar.viewItems.length; compositeSwitcherBar.push(items.map(composite => composite.activityAction)); @@ -22,10 +22,10 @@ index 76d6c0c1ee4..3060baec73a 100644 : compositeSwitcherBar.getWidth(currentItemsLength + index) )); diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts -index f575fa95242..e0fc917b228 100644 +index 67b7f28268f..342cc8a56c7 100644 --- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts +++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts -@@ -679,7 +679,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer { +@@ -684,7 +684,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer { } this.panes.filter(view => view.isVisible() !== visible) diff --git a/vscode-paches/0032-feat-only-apply-style-on-specific-class.patch b/vscode-paches/0032-feat-only-apply-style-on-specific-class.patch index bf4baddb..e53ca02d 100644 --- a/vscode-paches/0032-feat-only-apply-style-on-specific-class.patch +++ b/vscode-paches/0032-feat-only-apply-style-on-specific-class.patch @@ -4,11 +4,12 @@ Date: Mon, 11 Mar 2024 17:51:04 +0100 Subject: [PATCH] feat: only apply style on specific class --- - src/vs/workbench/browser/media/style.css | 134 ++++++++++------------- - 1 file changed, 58 insertions(+), 76 deletions(-) + src/vs/workbench/browser/media/style.css | 136 ++++++++++------------- + src/vs/workbench/browser/style.ts | 10 +- + 2 files changed, 64 insertions(+), 82 deletions(-) diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css -index db4862c7427..63c0d15ad5e 100644 +index 9299856d6ff..06cb3c3e140 100644 --- a/src/vs/workbench/browser/media/style.css +++ b/src/vs/workbench/browser/media/style.css @@ -9,56 +9,38 @@ @@ -89,7 +90,7 @@ index db4862c7427..63c0d15ad5e 100644 touch-action: none; /* Disable browser handling of all panning and zooming gestures. Removes 300ms touch delay. */ } -@@ -79,65 +61,65 @@ body.web { +@@ -79,42 +61,42 @@ body.web { border: 0; } @@ -137,6 +138,15 @@ index db4862c7427..63c0d15ad5e 100644 font-size: 100%; } +-.monaco-workbench table { ++.monaco-workbench-part table { + /* + * Somehow this is required when tables show in floating windows + * to override the user-agent style which sets a specific color +@@ -124,30 +106,30 @@ body.web { + font-size: inherit; + } + -.monaco-workbench input::placeholder { color: var(--vscode-input-placeholderForeground); } -.monaco-workbench input::-webkit-input-placeholder { color: var(--vscode-input-placeholderForeground); } -.monaco-workbench input::-moz-placeholder { color: var(--vscode-input-placeholderForeground); } @@ -174,7 +184,7 @@ index db4862c7427..63c0d15ad5e 100644 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -@@ -172,7 +154,7 @@ body.web { +@@ -182,7 +164,7 @@ body.web { /* Custom Dropdown (select) Arrows */ @@ -183,7 +193,7 @@ index db4862c7427..63c0d15ad5e 100644 font-family: inherit; appearance: none; -webkit-appearance: none; -@@ -202,16 +184,16 @@ body.web { +@@ -212,16 +194,16 @@ body.web { /* Keyboard Focus Indication Styles */ @@ -210,7 +220,7 @@ index db4862c7427..63c0d15ad5e 100644 outline-width: 1px; outline-style: solid; outline-offset: -1px; -@@ -224,19 +206,19 @@ body.web { +@@ -234,19 +216,19 @@ body.web { background: transparent; /* Search input focus fix when in high contrast */ } @@ -237,6 +247,46 @@ index db4862c7427..63c0d15ad5e 100644 border-color: transparent; /* outline is a square, but border has a radius, so we avoid this glitch when focused (https://github.com/microsoft/vscode/issues/26045) */ } +diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts +index 8fab9bc5b71..30f20a45b2a 100644 +--- a/src/vs/workbench/browser/style.ts ++++ b/src/vs/workbench/browser/style.ts +@@ -16,12 +16,12 @@ registerThemingParticipant((theme, collector) => { + + // Background (helps for subpixel-antialiasing on Windows) + const workbenchBackground = WORKBENCH_BACKGROUND(theme); +- collector.addRule(`.monaco-workbench { background-color: ${workbenchBackground}; }`); ++ collector.addRule(`.monaco-workbench-part { background-color: ${workbenchBackground}; }`); + + // Selection (do NOT remove - https://github.com/microsoft/vscode/issues/169662) + const windowSelectionBackground = theme.getColor(selectionBackground); + if (windowSelectionBackground) { +- collector.addRule(`.monaco-workbench ::selection { background-color: ${windowSelectionBackground}; }`); ++ collector.addRule(`.monaco-workbench-part ::selection { background-color: ${windowSelectionBackground}; }`); + } + + // Update based on selected theme +@@ -45,10 +45,10 @@ registerThemingParticipant((theme, collector) => { + // allow to select text in monaco editor instances. + if (isSafari) { + collector.addRule(` +- body.web { ++ .monaco-workbench-part.web { + touch-action: none; + } +- .monaco-workbench .monaco-editor .view-lines { ++ .monaco-workbench-part .monaco-editor .view-lines { + user-select: text; + -webkit-user-select: text; + } +@@ -57,6 +57,6 @@ registerThemingParticipant((theme, collector) => { + + // Update body background color to ensure the home indicator area looks similar to the workbench + if (isIOS && isStandalone()) { +- collector.addRule(`body { background-color: ${workbenchBackground}; }`); ++ collector.addRule(`.monaco-workbench-part { background-color: ${workbenchBackground}; }`); + } + }); -- 2.34.1 diff --git a/vscode-paches/0034-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch b/vscode-paches/0033-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch similarity index 82% rename from vscode-paches/0034-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch rename to vscode-paches/0033-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch index 6a622bfa..b3c75d65 100644 --- a/vscode-paches/0034-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch +++ b/vscode-paches/0033-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch @@ -13,10 +13,10 @@ to be able to register the file before 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts -index 991a3df035c..cb0b0288249 100644 +index 7c7fbac3a95..47df45a0773 100644 --- a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts +++ b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts -@@ -39,7 +39,7 @@ import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/r +@@ -42,7 +42,7 @@ import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsSe import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures'; @@ -25,7 +25,7 @@ index 991a3df035c..cb0b0288249 100644 import { LocalWebWorkerRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation'; import { IExtensionHostProfile, IExtensionService, IExtensionsStatus } from 'vs/workbench/services/extensions/common/extensions'; -@@ -271,8 +271,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane { +@@ -275,8 +275,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane { data.root.classList.toggle('odd', index % 2 === 1); @@ -37,19 +37,19 @@ index 991a3df035c..cb0b0288249 100644 if (!data.icon.complete) { data.icon.style.visibility = 'hidden'; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index fa11076ab65..dbca12bf6aa 100644 +index 89ea0e56a44..2979deec456 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -17,7 +17,7 @@ import { - InstallExtensionEvent, DidUninstallExtensionEvent, InstallOperation, InstallOptions, WEB_EXTENSION_TAG, InstallExtensionResult, - IExtensionsControlManifest, InstallVSIXOptions, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, isTargetPlatformCompatible, InstallExtensionInfo, EXTENSION_IDENTIFIER_REGEX +@@ -18,7 +18,7 @@ import { + IExtensionsControlManifest, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, isTargetPlatformCompatible, InstallExtensionInfo, EXTENSION_IDENTIFIER_REGEX, + InstallOptions, IProductVersion } from 'vs/platform/extensionManagement/common/extensionManagement'; --import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, getDefaultIconPath } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; +-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; ++import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, getDefaultIconPath, IResourceExtension } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -@@ -205,7 +205,7 @@ export class Extension implements IExtension { +@@ -240,7 +240,7 @@ export class Extension implements IExtension { } } } @@ -59,7 +59,7 @@ index fa11076ab65..dbca12bf6aa 100644 get repository(): string | undefined { diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts -index 8a068851f28..eb4ed86bd31 100644 +index abafe190b8d..ae62d18f2d0 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -33,7 +33,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @@ -81,18 +81,18 @@ index 8a068851f28..eb4ed86bd31 100644 when: ContextKeyExpr.deserialize(override ?? walkthrough.when) ?? ContextKeyExpr.true(), } as const; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts -index 362e485948a..50f5a5f175d 100644 +index 59bea5e74fc..5a8c9083989 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts -@@ -39,7 +39,7 @@ export interface IExtensionManagementServerService { +@@ -40,7 +40,7 @@ export interface IExtensionManagementServerService { getExtensionInstallLocation(extension: IExtension): ExtensionInstallLocation | null; } -export const DefaultIconPath = FileAccess.asBrowserUri('vs/workbench/services/extensionManagement/common/media/defaultIcon.png').toString(true); +export const getDefaultIconPath = () => FileAccess.asBrowserUri('vs/workbench/services/extensionManagement/common/media/defaultIcon.png').toString(true); - export type InstallExtensionOnServerEvent = InstallExtensionEvent & { server: IExtensionManagementServer }; - export type UninstallExtensionOnServerEvent = UninstallExtensionEvent & { server: IExtensionManagementServer }; + export interface IResourceExtension { + readonly identifier: IExtensionIdentifier; -- 2.34.1 diff --git a/vscode-paches/0033-fix-fix-fullscreen-layout.patch b/vscode-paches/0033-fix-fix-fullscreen-layout.patch deleted file mode 100644 index 8e2b5ee1..00000000 --- a/vscode-paches/0033-fix-fix-fullscreen-layout.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Mon, 11 Mar 2024 17:51:27 +0100 -Subject: [PATCH] fix: fix fullscreen layout - ---- - src/vs/workbench/browser/layout.ts | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index 4ee25602224..b563b949fb7 100644 ---- a/src/vs/workbench/browser/layout.ts -+++ b/src/vs/workbench/browser/layout.ts -@@ -1541,8 +1541,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi - - layout(): void { - if (!this.disposed) { -- this._mainContainerDimension = getClientArea(this.parent); -- this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`); -+ this._mainContainerDimension = getClientArea(this.state.runtime.mainWindowFullscreen ? -+ mainWindow.document.body : // in fullscreen mode, make sure to use element because -+ this.parent // in that case the workbench will span the entire site -+ ); this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`); - - position(this.mainContainer, 0, 0, 0, 0, 'relative'); - size(this.mainContainer, this._mainContainerDimension.width, this._mainContainerDimension.height); --- -2.34.1 - diff --git a/vscode-paches/0035-cleanup-remove-some-checks-and-warnings.patch b/vscode-paches/0034-cleanup-remove-some-checks-and-warnings.patch similarity index 87% rename from vscode-paches/0035-cleanup-remove-some-checks-and-warnings.patch rename to vscode-paches/0034-cleanup-remove-some-checks-and-warnings.patch index 39ee7f85..783d5eb9 100644 --- a/vscode-paches/0035-cleanup-remove-some-checks-and-warnings.patch +++ b/vscode-paches/0034-cleanup-remove-some-checks-and-warnings.patch @@ -25,10 +25,10 @@ index a6e9943b866..c470a1c9ed5 100644 }); } diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 6514979da3d..d31d55c9e01 100644 +index 3d5d21f080f..44c0c97a128 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -@@ -185,11 +185,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD +@@ -488,11 +488,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD return; } @@ -40,7 +40,7 @@ index 6514979da3d..d31d55c9e01 100644 if (e.data.channel === 'webview-ready') { if (this._messagePort) { return; -@@ -536,11 +531,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD +@@ -547,11 +542,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD return endpoint; } @@ -53,23 +53,23 @@ index 6514979da3d..d31d55c9e01 100644 if (this.element && this._messagePort) { this._messagePort.postMessage({ channel, args: data }, transferable); diff --git a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts -index ce6f32b0914..4fe4fb39bd7 100644 +index 321ce8ea27e..bad236b82ea 100644 --- a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts +++ b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts -@@ -302,13 +302,6 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili +@@ -321,13 +321,6 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili } - protected patchMethods(auxiliaryWindow: CodeWindow): void { -- -- // Disallow `createElement` because it would create -- // HTML Elements in the "wrong" context and break -- // code that does "instanceof HTMLElement" etc. + protected createContainer(auxiliaryWindow: CodeWindow, disposables: DisposableStore, options?: IAuxiliaryWindowOpenOptions): { stylesLoaded: Barrier; container: HTMLElement } { - auxiliaryWindow.document.createElement = function () { +- // Disallow `createElement` because it would create +- // HTML Elements in the "wrong" context and break +- // code that does "instanceof HTMLElement" etc. - throw new Error('Not allowed to create elements in child window JavaScript context. Always use the main window so that "xyz instanceof HTMLElement" continues to work.'); - }; - } - - private applyMeta(auxiliaryWindow: CodeWindow): void { +- + this.applyMeta(auxiliaryWindow); + const { stylesLoaded } = this.applyCSS(auxiliaryWindow, disposables); + const container = this.applyHTML(auxiliaryWindow, disposables); diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts index a5f5e42eddd..7d462411a9c 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts diff --git a/vscode-paches/0036-refactor-split-class-in-2.patch b/vscode-paches/0035-refactor-split-class-in-2.patch similarity index 100% rename from vscode-paches/0036-refactor-split-class-in-2.patch rename to vscode-paches/0035-refactor-split-class-in-2.patch diff --git a/vscode-paches/0037-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch b/vscode-paches/0036-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch similarity index 97% rename from vscode-paches/0037-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch rename to vscode-paches/0036-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch index 138a03ac..514d16cd 100644 --- a/vscode-paches/0037-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch +++ b/vscode-paches/0036-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fix: mark process supported as soon as there is a registered 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts -index f78008e14db..5cf622e0620 100644 +index 2b1dc0a6b13..42e0d5788e9 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts @@ -19,7 +19,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c @@ -29,7 +29,7 @@ index f78008e14db..5cf622e0620 100644 import { ITerminalCapabilityImplMap, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; import { createInstanceCapabilityEventMultiplexer } from 'vs/workbench/contrib/terminal/browser/terminalEvents'; import { mainWindow } from 'vs/base/browser/window'; -@@ -216,7 +217,7 @@ export class TerminalService extends Disposable implements ITerminalService { +@@ -218,7 +219,7 @@ export class TerminalService extends Disposable implements ITerminalService { this._handleInstanceContextKeys(); this._terminalShellTypeContextKey = TerminalContextKeys.shellType.bindTo(this._contextKeyService); this._processSupportContextKey = TerminalContextKeys.processSupported.bindTo(this._contextKeyService); diff --git a/vscode-paches/0038-fix-use-asBrowserUri-to-get-iframe-src.patch b/vscode-paches/0037-fix-use-asBrowserUri-to-get-iframe-src.patch similarity index 87% rename from vscode-paches/0038-fix-use-asBrowserUri-to-get-iframe-src.patch rename to vscode-paches/0037-fix-use-asBrowserUri-to-get-iframe-src.patch index 94a00f29..f98aeb03 100644 --- a/vscode-paches/0038-fix-use-asBrowserUri-to-get-iframe-src.patch +++ b/vscode-paches/0037-fix-use-asBrowserUri-to-get-iframe-src.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: use asBrowserUri to get iframe src 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index d31d55c9e01..51405ded346 100644 +index 44c0c97a128..bd0c97c183a 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -@@ -477,7 +477,8 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD +@@ -444,7 +444,8 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD // Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1754872 const fileName = isFirefox ? 'index-no-csp.html' : 'index.html'; @@ -20,7 +20,7 @@ index d31d55c9e01..51405ded346 100644 + this.element!.setAttribute('src', `${relativeIframeSrc.toString(true)}?${queryString}`); } - public mountTo(element: HTMLElement) { + public mountTo(element: HTMLElement, targetWindow: CodeWindow) { -- 2.34.1 diff --git a/vscode-paches/0039-feat-add-some-parameter-to-webview-iframes.patch b/vscode-paches/0038-feat-add-some-parameter-to-webview-iframes.patch similarity index 94% rename from vscode-paches/0039-feat-add-some-parameter-to-webview-iframes.patch rename to vscode-paches/0038-feat-add-some-parameter-to-webview-iframes.patch index 24f6ef87..1bc3121b 100644 --- a/vscode-paches/0039-feat-add-some-parameter-to-webview-iframes.patch +++ b/vscode-paches/0038-feat-add-some-parameter-to-webview-iframes.patch @@ -8,7 +8,7 @@ Subject: [PATCH] feat: add some parameter to webview iframes 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 51405ded346..e05a401c479 100644 +index bd0c97c183a..9a4070e0d1c 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -11,7 +11,7 @@ import { streamToBuffer, VSBufferReadableStream } from 'vs/base/common/buffer'; @@ -20,7 +20,7 @@ index 51405ded346..e05a401c479 100644 import { URI } from 'vs/base/common/uri'; import { generateUuid } from 'vs/base/common/uuid'; import { localize } from 'vs/nls'; -@@ -470,6 +470,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD +@@ -437,6 +437,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD params.purpose = options.purpose; } diff --git a/vscode-paches/0040-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch b/vscode-paches/0039-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch similarity index 100% rename from vscode-paches/0040-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch rename to vscode-paches/0039-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch diff --git a/vscode-paches/0041-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch b/vscode-paches/0040-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch similarity index 100% rename from vscode-paches/0041-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch rename to vscode-paches/0040-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch diff --git a/vscode-paches/0043-fix-only-use-open-model.patch b/vscode-paches/0041-fix-only-use-open-model.patch similarity index 100% rename from vscode-paches/0043-fix-only-use-open-model.patch rename to vscode-paches/0041-fix-only-use-open-model.patch diff --git a/vscode-paches/0044-fix-allow-adding-a-local-folder-even-when-there-is-a.patch b/vscode-paches/0042-fix-allow-adding-a-local-folder-even-when-there-is-a.patch similarity index 100% rename from vscode-paches/0044-fix-allow-adding-a-local-folder-even-when-there-is-a.patch rename to vscode-paches/0042-fix-allow-adding-a-local-folder-even-when-there-is-a.patch diff --git a/vscode-paches/0042-fix-only-try-once-to-access-the-navigator.keyboard-o.patch b/vscode-paches/0042-fix-only-try-once-to-access-the-navigator.keyboard-o.patch deleted file mode 100644 index eeaf83f0..00000000 --- a/vscode-paches/0042-fix-only-try-once-to-access-the-navigator.keyboard-o.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Mon, 11 Mar 2024 18:23:55 +0100 -Subject: [PATCH] fix: only try once to access the navigator.keyboard object - ---- - .../services/keybinding/browser/keyboardLayoutService.ts | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -index bb50e96ff77..ab8d76f8903 100644 ---- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -@@ -42,6 +42,7 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable { - protected _keymapInfos: KeymapInfo[]; - protected _mru: KeymapInfo[]; - private _activeKeymapInfo: KeymapInfo | null; -+ private keyboardLayoutMapAllowed: boolean = (navigator as any).keyboard !== undefined; - - get activeKeymap(): KeymapInfo | null { - return this._activeKeymapInfo; -@@ -394,7 +395,7 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable { - } - - private async _getBrowserKeyMapping(keyboardEvent?: IKeyboardEvent): Promise { -- if ((navigator as any).keyboard) { -+ if (this.keyboardLayoutMapAllowed) { - try { - return await (navigator as any).keyboard.getLayoutMap().then((e: any) => { - const ret: IKeyboardMapping = {}; -@@ -419,8 +420,10 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable { - }); - } catch { - // getLayoutMap can throw if invoked from a nested browsing context -+ this.keyboardLayoutMapAllowed = false; - } -- } else if (keyboardEvent && !keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey && !keyboardEvent.metaKey) { -+ } -+ if (keyboardEvent && !keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey && !keyboardEvent.metaKey) { - const ret: IKeyboardMapping = {}; - const standardKeyboardEvent = keyboardEvent as StandardKeyboardEvent; - ret[standardKeyboardEvent.browserEvent.code] = { --- -2.34.1 - diff --git a/vscode-paches/0045-feat-allow-to-switch-storage-service-workspace.patch b/vscode-paches/0043-feat-allow-to-switch-storage-service-workspace.patch similarity index 100% rename from vscode-paches/0045-feat-allow-to-switch-storage-service-workspace.patch rename to vscode-paches/0043-feat-allow-to-switch-storage-service-workspace.patch diff --git a/vscode-paches/0046-cleanup-remove-code-that-we-will-run-ourselves.patch b/vscode-paches/0044-cleanup-remove-code-that-we-will-run-ourselves.patch similarity index 98% rename from vscode-paches/0046-cleanup-remove-code-that-we-will-run-ourselves.patch rename to vscode-paches/0044-cleanup-remove-code-that-we-will-run-ourselves.patch index 49a8ac35..b7f2fb81 100644 --- a/vscode-paches/0046-cleanup-remove-code-that-we-will-run-ourselves.patch +++ b/vscode-paches/0044-cleanup-remove-code-that-we-will-run-ourselves.patch @@ -8,7 +8,7 @@ Subject: [PATCH] cleanup: remove code that we will run ourselves 1 file changed, 11 deletions(-) diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index 56e9b6f58cf..bea66a053e5 100644 +index cbc07dc7fb0..455bb043b5d 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -11,10 +11,7 @@ import { RunOnceScheduler, timeout } from 'vs/base/common/async'; diff --git a/vscode-paches/0047-fix-typescript-use-import-function-able-to-replace-i.patch b/vscode-paches/0045-fix-typescript-use-import-function-able-to-replace-i.patch similarity index 100% rename from vscode-paches/0047-fix-typescript-use-import-function-able-to-replace-i.patch rename to vscode-paches/0045-fix-typescript-use-import-function-able-to-replace-i.patch diff --git a/vscode-paches/0048-cleanup-remove-graceful-fs.patch b/vscode-paches/0046-cleanup-remove-graceful-fs.patch similarity index 100% rename from vscode-paches/0048-cleanup-remove-graceful-fs.patch rename to vscode-paches/0046-cleanup-remove-graceful-fs.patch diff --git a/vscode-paches/0049-feat-add-a-way-to-detect-if-localization-were-alread.patch b/vscode-paches/0047-feat-add-a-way-to-detect-if-localization-were-alread.patch similarity index 100% rename from vscode-paches/0049-feat-add-a-way-to-detect-if-localization-were-alread.patch rename to vscode-paches/0047-feat-add-a-way-to-detect-if-localization-were-alread.patch diff --git a/vscode-paches/0050-feat-hide-terminal-view-if-there-is-no-backend-avail.patch b/vscode-paches/0048-feat-hide-terminal-view-if-there-is-no-backend-avail.patch similarity index 91% rename from vscode-paches/0050-feat-hide-terminal-view-if-there-is-no-backend-avail.patch rename to vscode-paches/0048-feat-hide-terminal-view-if-there-is-no-backend-avail.patch index 3ff48fcf..0357d9e0 100644 --- a/vscode-paches/0050-feat-hide-terminal-view-if-there-is-no-backend-avail.patch +++ b/vscode-paches/0048-feat-hide-terminal-view-if-there-is-no-backend-avail.patch @@ -8,10 +8,10 @@ Subject: [PATCH] feat: hide terminal view if there is no backend available 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts -index fba9c78e785..336d89cfcca 100644 +index 19b81cf9659..fce5c1d4eb4 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts -@@ -138,6 +138,7 @@ Registry.as(ViewContainerExtensions.ViewsRegistry).registerViews +@@ -137,6 +137,7 @@ Registry.as(ViewContainerExtensions.ViewsRegistry).registerViews canToggleVisibility: false, canMoveView: true, ctorDescriptor: new SyncDescriptor(TerminalViewPane), diff --git a/vscode-paches/0049-fixup-feat-only-apply-style-on-specific-class.patch b/vscode-paches/0049-fixup-feat-only-apply-style-on-specific-class.patch new file mode 100644 index 00000000..b800dd26 --- /dev/null +++ b/vscode-paches/0049-fixup-feat-only-apply-style-on-specific-class.patch @@ -0,0 +1,175 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Mon, 8 Apr 2024 15:39:58 +0200 +Subject: [PATCH] fixup! feat: only apply style on specific class + +--- + src/vs/workbench/browser/media/style.css | 84 ++++++++++++------------ + 1 file changed, 43 insertions(+), 41 deletions(-) + +diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css +index 06cb3c3e140..7e3f89d012d 100644 +--- a/src/vs/workbench/browser/media/style.css ++++ b/src/vs/workbench/browser/media/style.css +@@ -9,28 +9,28 @@ + + /* Font Families (with CJK support) */ + +-.mac .monaco-workbench-part{ font-family: -apple-system, BlinkMacSystemFont, sans-serif; } +-.mac:lang(zh-Hans) .monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Hiragino Sans GB", sans-serif; } +-.mac:lang(zh-Hant) .monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "PingFang TC", sans-serif; } +-.mac:lang(ja) .monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Hiragino Kaku Gothic Pro", sans-serif; } +-.mac:lang(ko) .monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Nanum Gothic", "Apple SD Gothic Neo", "AppleGothic", sans-serif; } +- +-.windows .monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", sans-serif; } +-.windows:lang(zh-Hans) .monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Microsoft YaHei", sans-serif; } +-.windows:lang(zh-Hant) .monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Microsoft Jhenghei", sans-serif; } +-.windows:lang(ja) .monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Yu Gothic UI", "Meiryo UI", sans-serif; } +-.windows:lang(ko) .monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Malgun Gothic", "Dotom", sans-serif; } ++.mac .monaco-workbench-part, .mac.monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, sans-serif; } ++.mac:lang(zh-Hans) .monaco-workbench-part, .mac:lang(zh-Hans).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Hiragino Sans GB", sans-serif; } ++.mac:lang(zh-Hant) .monaco-workbench-part, .mac:lang(zh-Hant).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "PingFang TC", sans-serif; } ++.mac:lang(ja) .monaco-workbench-part, .mac:lang(ja).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Hiragino Kaku Gothic Pro", sans-serif; } ++.mac:lang(ko) .monaco-workbench-part, .mac:lang(ko).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Nanum Gothic", "Apple SD Gothic Neo", "AppleGothic", sans-serif; } ++ ++.windows .monaco-workbench-part, .windows.monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", sans-serif; } ++.windows:lang(zh-Hans) .monaco-workbench-part, .windows:lang(zh-Hans).monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Microsoft YaHei", sans-serif; } ++.windows:lang(zh-Hant) .monaco-workbench-part, .windows:lang(zh-Hant).monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Microsoft Jhenghei", sans-serif; } ++.windows:lang(ja) .monaco-workbench-part, .windows:lang(ja).monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Yu Gothic UI", "Meiryo UI", sans-serif; } ++.windows:lang(ko) .monaco-workbench-part, .windows:lang(ko).monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Malgun Gothic", "Dotom", sans-serif; } + + /* Linux: add `system-ui` as first font and not `Ubuntu` to allow other distribution pick their standard OS font */ +-.linux .monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif; } +-.linux:lang(zh-Hans) .monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif; } +-.linux:lang(zh-Hant) .monaco-workbench-partt { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans TC", "Source Han Sans TW", "Source Han Sans", sans-serif; } +-.linux:lang(ja) .monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", sans-serif; } +-.linux:lang(ko) .monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; } ++.linux .monaco-workbench-part, .linux.monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif; } ++.linux:lang(zh-Hans) .monaco-workbench-part, .linux:lang(zh-Hans).monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif; } ++.linux:lang(zh-Hant) .monaco-workbench-part, .linux:lang(zh-Hant).monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans TC", "Source Han Sans TW", "Source Han Sans", sans-serif; } ++.linux:lang(ja) .monaco-workbench-part, .linux:lang(ja).monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", sans-serif; } ++.linux:lang(ko) .monaco-workbench-part, .linux:lang(ko).monaco-workbench-part { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; } + +-.mac .monaco-workbench-part { --monaco-monospace-font: "SF Mono", Monaco, Menlo, Courier, monospace; } +-.windows .monaco-workbench-part { --monaco-monospace-font: Consolas, "Courier New", monospace; } +-.linux .monaco-workbench-part { --monaco-monospace-font: "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace; } ++.mac .monaco-workbench-part, .mac.monaco-workbench-part { --monaco-monospace-font: "SF Mono", Monaco, Menlo, Courier, monospace; } ++.windows .monaco-workbench-part, .windows.monaco-workbench-part { --monaco-monospace-font: Consolas, "Courier New", monospace; } ++.linux .monaco-workbench-part, .linux.monaco-workbench-part { --monaco-monospace-font: "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace; } + + /* Global Styles */ + +@@ -57,7 +57,7 @@ + border-radius: 10px; /* macOS Big Sur increased rounded corners size */ + } + +-.monaco-workbench img { ++.monaco-workbench-part img { + border: 0; + } + +@@ -70,7 +70,9 @@ + } + + .monaco-workbench.hc-black .monaco-workbench-part p > a, +-.monaco-workbench.hc-light .monaco-workbench-part p > a { ++.monaco-workbench.hc-light .monaco-workbench-part p > a, ++.monaco-workbench.hc-black.monaco-workbench-part p > a, ++.monaco-workbench.hc-light.monaco-workbench-part p > a { + text-decoration: underline !important; + } + +@@ -135,19 +137,19 @@ + } + } + +-.monaco-workbench .context-view { ++.monaco-workbench-part .context-view { + -webkit-app-region: no-drag; + } + +-.monaco-workbench .codicon { ++.monaco-workbench-part .codicon { + color: var(--vscode-icon-foreground); + } + +-.monaco-workbench .codicon[class*='codicon-'] { ++.monaco-workbench-part .codicon[class*='codicon-'] { + font-size: 16px; /* sets font-size for codicons in workbench (https://github.com/microsoft/vscode/issues/98495) */ + } + +-.monaco-workbench .predefined-file-icon[class*='codicon-']::before { ++.monaco-workbench-part .predefined-file-icon[class*='codicon-']::before { + font-family: 'codicon'; + width: 16px; + padding-left: 3px; /* width (16px) - font-size (13px) = padding-left (3px) */ +@@ -173,11 +175,11 @@ + border: 1px solid; + } + +-.monaco-workbench .select-container { ++.monaco-workbench-part .select-container { + position: relative; + } + +-.monaco-workbench .select-container:after { ++.monaco-workbench-part .select-container:after { + content: "\eab4"; + font-family: codicon; + font-size: 16px; +@@ -256,38 +258,38 @@ + color: var(--vscode-list-focusHighlightForeground); + } + +-.monaco-workbench .synthetic-focus :focus { ++.monaco-workbench-part .synthetic-focus :focus { + outline: 0 !important; /* elements within widgets that draw synthetic-focus should never show focus */ + } + +-.monaco-workbench .monaco-inputbox.info.synthetic-focus, +-.monaco-workbench .monaco-inputbox.warning.synthetic-focus, +-.monaco-workbench .monaco-inputbox.error.synthetic-focus, +-.monaco-workbench .monaco-inputbox.info input[type="text"]:focus, +-.monaco-workbench .monaco-inputbox.warning input[type="text"]:focus, +-.monaco-workbench .monaco-inputbox.error input[type="text"]:focus { ++.monaco-workbench-part .monaco-inputbox.info.synthetic-focus, ++.monaco-workbench-part .monaco-inputbox.warning.synthetic-focus, ++.monaco-workbench-part .monaco-inputbox.error.synthetic-focus, ++.monaco-workbench-part .monaco-inputbox.info input[type="text"]:focus, ++.monaco-workbench-part .monaco-inputbox.warning input[type="text"]:focus, ++.monaco-workbench-part .monaco-inputbox.error input[type="text"]:focus { + outline: 0 !important; /* outline is not going well with decoration */ + } + +-.monaco-workbench .monaco-list:focus { ++.monaco-workbench-part .monaco-list:focus { + outline: 0 !important; /* tree indicates focus not via outline but through the focused item */ + } + +-.monaco-workbench a.monaco-link:hover { ++.monaco-workbench-part a.monaco-link:hover { + text-decoration: underline; /* render underline on hover for accessibility requirements */ + } + +-.monaco-workbench .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover, +-.monaco-workbench .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover { ++.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover, ++.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover { + background-color: var(--vscode-toolbar-hoverBackground); + } + +-.monaco-workbench .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled), +-.monaco-workbench .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled) { ++.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled), ++.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled) { + background-color: var(--vscode-toolbar-activeBackground); + } + +-.monaco-workbench .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled) { ++.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled) { + outline: 1px dashed var(--vscode-toolbar-hoverOutline); + outline-offset: -1px; + } +-- +2.34.1 + From ad725a1c539dd6b9bee32732d377fdc96d0491d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 8 Apr 2024 16:43:33 +0200 Subject: [PATCH 4/8] fix: import style as it's not done anymore by the parts of VSCode we import --- src/service-override/views.ts | 1 + src/service-override/workbench.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/service-override/views.ts b/src/service-override/views.ts index 42b64632..f952dbbb 100644 --- a/src/service-override/views.ts +++ b/src/service-override/views.ts @@ -93,6 +93,7 @@ import 'vs/workbench/browser/parts/editor/editor.autosave.contribution' import 'vs/workbench/contrib/files/browser/files.editorPane.contribution' import 'vs/workbench/contrib/files/browser/fileCommands.save' import 'vs/workbench/browser/actions/navigationActions' +import 'vs/workbench/browser/style' import './tools/editorAssets' export * from './tools/views' diff --git a/src/service-override/workbench.ts b/src/service-override/workbench.ts index 59a337de..1f9bd7b6 100644 --- a/src/service-override/workbench.ts +++ b/src/service-override/workbench.ts @@ -77,6 +77,7 @@ import 'vs/workbench/browser/parts/editor/editor.autosave.contribution' import 'vs/workbench/contrib/files/browser/files.editorPane.contribution' import 'vs/workbench/contrib/files/browser/fileCommands.save' import 'vs/workbench/browser/actions/navigationActions' +import 'vs/workbench/browser/style' import './tools/editorAssets' export * from './tools/views' From f9ef1ee5173c7e5019b55485f94c35d7e2dcf616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Mon, 8 Apr 2024 16:44:30 +0200 Subject: [PATCH 5/8] cleanup: stop trying to detect module side effects, assume true --- rollup/rollup.config.ts | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index ac009f4d..dae4140e 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -98,7 +98,6 @@ const VSCODE_SRC_DIST_DIR = path.resolve(DIST_DIR_MAIN, 'vscode', 'src') const VSCODE_DIR = path.resolve(BASE_DIR, 'vscode') const VSCODE_SRC_DIR = path.resolve(VSCODE_DIR, 'src') const OVERRIDE_PATH = path.resolve(BASE_DIR, 'src/override') -const KEYBOARD_LAYOUT_DIR = path.resolve(VSCODE_SRC_DIR, 'vs/workbench/services/keybinding/browser/keyboardLayouts') function getMemberExpressionPath (node: recast.types.namedTypes.MemberExpression | recast.types.namedTypes.Identifier): string | null { if (node.type === 'MemberExpression') { @@ -156,11 +155,6 @@ function isCallPure (file: string, functionName: string, node: recast.types.name return true } - if (functionName === 'registerThemingParticipant' && file.includes('vs/workbench/browser/style')) { - // Remove VSCode global style - return true - } - return PURE_OR_TO_REMOVE_FUNCTIONS.has(functionName) } @@ -391,40 +385,7 @@ export default (args: Record): rollup.RollupOptions[] => { treeshake: { annotations: true, preset: 'smallest', - moduleSideEffects (id) { - const path = new URL(id, 'file:/').pathname - return path.startsWith(SRC_DIR) || - path.includes('vs/editor') || - path.includes('codiconStyles') || - path.includes('vs/platform/undoRedo/common/undoRedoService') || - path.endsWith('.css') || - path.startsWith(KEYBOARD_LAYOUT_DIR) || - path.endsWith('.contribution.js') || - path.endsWith('.all.js') || - path.endsWith('xtensionPoint.js') || - path.includes('vs/workbench/api/browser/') || - path.includes('fileCommands') || - path.endsWith('/listCommands.js') || - path.endsWith('/quickAccessActions.js') || - path.endsWith('/gotoLineQuickAccess.js') || - path.endsWith('/workbenchReferenceSearch.js') || - path.includes('/searchActions') || - path.endsWith('documentSymbolsOutline.js') || - path.includes('vs/workbench/contrib/codeEditor/browser/') || - path.includes('extHost.common.services') || - path.includes('extHost.worker.services') || - path.includes('inlayHintsAccessibilty') || - path.includes('vs/workbench/contrib/format/browser/') || - path.includes('vs/workbench/contrib/chat/browser/contrib/') || - path.includes('vs/workbench/contrib/notebook/browser/') || - path.includes('vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors') || - path.includes('keyboardLayoutPicker') || - path.includes('expandAbbreviation') || - path.includes('commentsEditorContribution') || - path.includes('keybindingsEditorContribution') || - path.includes('preferencesSearch') || - path.includes('vs/workbench/browser/actions') - } + moduleSideEffects: true }, external, output: [{ From b229818636a19c31dee1aae9cf794d794a1defdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Tue, 9 Apr 2024 10:19:49 +0200 Subject: [PATCH 6/8] fix: add missing new service --- src/missing-services.ts | 8 +++++++- src/service-override/chat.ts | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/missing-services.ts b/src/missing-services.ts index 26cfbf02..ca4d0689 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -125,7 +125,7 @@ import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbe import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService' import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService' import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat' -import { IChatAccessibilityService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat' +import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat' import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService' import { IAuthenticationExtensionsService, IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication' import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline' @@ -2931,6 +2931,12 @@ registerSingleton(IChatWidgetHistoryService, class ChatWidgetHistoryService impl saveHistory = unsupported }, InstantiationType.Delayed) +registerSingleton(IChatCodeBlockContextProviderService, class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService { + _serviceBrand: undefined + providers = [] + registerProvider = unsupported +}, InstantiationType.Delayed) + registerSingleton(IInlineChatSessionService, class InlineChatSessionService implements IInlineChatSessionService { _serviceBrand: undefined onDidMoveSession = Event.None diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index 71ce0fcd..89b4e29a 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -2,7 +2,7 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standalone import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { IChatService } from 'vs/workbench/contrib/chat/common/chatService' import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService' -import { IChatWidgetService, IChatAccessibilityService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat' +import { IChatWidgetService, IChatAccessibilityService, IQuickChatService, IChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/chat' import { ChatContributionService } from 'vs/workbench/contrib/chat/browser/chatContributionServiceImpl' import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget' import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl' @@ -20,6 +20,7 @@ import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/br import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService' import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl' import { ILanguageModelsService, LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels' +import { ChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/codeBlockContextProviderService' import 'vs/workbench/contrib/chat/browser/chat.contribution' import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution' @@ -37,6 +38,7 @@ export default function getServiceOverride (): IEditorOverrideServices { [IChatVariablesService.toString()]: new SyncDescriptor(ChatVariablesService, [], true), [IInlineChatService.toString()]: new SyncDescriptor(InlineChatServiceImpl, [], true), [IInlineChatSessionService.toString()]: new SyncDescriptor(InlineChatSessionServiceImpl, [], true), - [IInlineChatSavingService.toString()]: new SyncDescriptor(InlineChatSavingServiceImpl, [], true) + [IInlineChatSavingService.toString()]: new SyncDescriptor(InlineChatSavingServiceImpl, [], true), + [IChatCodeBlockContextProviderService.toString()]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true) } } From 63778b7675767997166cb2e6f97923ab906f8aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Tue, 9 Apr 2024 10:20:03 +0200 Subject: [PATCH 7/8] fix(demo): update VSCode api usage --- demo/src/features/testing.ts | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/demo/src/features/testing.ts b/demo/src/features/testing.ts index a9fd44d9..07bed1c8 100644 --- a/demo/src/features/testing.ts +++ b/demo/src/features/testing.ts @@ -266,20 +266,11 @@ void getApi().then(async api => { run.appendOutput(`Completed ${test.id}\r\n`) } - run.coverageProvider = { - provideFileCoverage () { - const coverage: vscode.FileCoverage[] = [] - for (const [uri, statements] of coveredLines) { - coverage.push( - api.FileCoverage.fromDetails( - api.Uri.parse(uri), - statements.filter((s): s is vscode.StatementCoverage => s != null) - ) - ) - } - - return coverage - } + for (const [uri, statements] of coveredLines) { + run.addCoverage(api.FileCoverage.fromDetails( + api.Uri.parse(uri), + statements.filter((s): s is vscode.StatementCoverage => s != null) + )) } run.end() From 16c7201ccaa6ddba39fe7a4982384a3393e1c0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Tue, 9 Apr 2024 10:45:45 +0200 Subject: [PATCH 8/8] lib: update all dependencies --- demo/package-lock.json | 58 +-- demo/package.json | 6 +- package-lock.json | 911 +++++++++++++++++------------------------ package.json | 28 +- 4 files changed, 427 insertions(+), 576 deletions(-) diff --git a/demo/package-lock.json b/demo/package-lock.json index 0e7dc6f2..b9ba18cb 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -171,14 +171,14 @@ "devDependencies": { "@codingame/esbuild-import-meta-url-plugin": "^1.0.2", "@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/rollup-vsix-plugin", - "@types/dockerode": "^3.3.26", + "@types/dockerode": "^3.3.28", "@types/express": "^4.17.21", "@types/node": "^20.11.4", "@types/wicg-file-system-access": "^2023.10.5", "@types/ws": "^8.5.10", "ts-node": "^10.9.2", - "typescript": "~5.4.3", - "vite": "~5.2.6" + "typescript": "~5.4.4", + "vite": "~5.2.8" } }, "../dist/default-extension-bat": { @@ -829,7 +829,7 @@ "memfs": "^4.8.0", "mime-types": "^2.1.35", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release", - "yauzl": "^2.9.2" + "yauzl": "^3.0.0" } }, "../dist/service-override-accessibility": { @@ -1256,13 +1256,13 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@xterm/addon-canvas": "0.6.0-beta.31", - "@xterm/addon-image": "0.7.0-beta.29", - "@xterm/addon-search": "0.14.0-beta.31", - "@xterm/addon-serialize": "0.12.0-beta.31", - "@xterm/addon-unicode11": "0.7.0-beta.31", - "@xterm/addon-webgl": "0.17.0-beta.31", - "@xterm/xterm": "5.4.0-beta.31", + "@xterm/addon-canvas": "0.7.0-beta.12", + "@xterm/addon-image": "0.8.0-beta.12", + "@xterm/addon-search": "0.15.0-beta.12", + "@xterm/addon-serialize": "0.13.0-beta.12", + "@xterm/addon-unicode11": "0.8.0-beta.12", + "@xterm/addon-webgl": "0.18.0-beta.12", + "@xterm/xterm": "5.5.0-beta.12", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1271,12 +1271,12 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@xterm/addon-canvas": "0.6.0-beta.31", - "@xterm/addon-image": "0.7.0-beta.29", - "@xterm/addon-search": "0.14.0-beta.31", - "@xterm/addon-serialize": "0.12.0-beta.31", - "@xterm/addon-unicode11": "0.7.0-beta.31", - "@xterm/addon-webgl": "0.17.0-beta.31", + "@xterm/addon-canvas": "0.7.0-beta.12", + "@xterm/addon-image": "0.8.0-beta.12", + "@xterm/addon-search": "0.15.0-beta.12", + "@xterm/addon-serialize": "0.13.0-beta.12", + "@xterm/addon-unicode11": "0.8.0-beta.12", + "@xterm/addon-webgl": "0.18.0-beta.12", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1390,6 +1390,7 @@ "@codingame/monaco-vscode-view-banner-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-status-bar-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-title-bar-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-views-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -2781,13 +2782,14 @@ } }, "node_modules/@types/dockerode": { - "version": "3.3.26", - "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.26.tgz", - "integrity": "sha512-/K+I9bGhRO2SvyIHisGeOsy/ypxnWLz8+Rde9S2tNNEKa3r91e0XMYIEq2D+kb7srm7xrmpAR0CDKfXoZOr4OA==", + "version": "3.3.28", + "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.28.tgz", + "integrity": "sha512-RjY96chW88t2QvSebCsec+mQYo3/nyOr+/tVcE+0ynlOg2m/i9wPE52DhptzF75QDlhv2uDYVPqKfHKeGTn6Fg==", "dev": true, "dependencies": { "@types/docker-modem": "*", - "@types/node": "*" + "@types/node": "*", + "@types/ssh2": "*" } }, "node_modules/@types/estree": { @@ -4137,9 +4139,9 @@ } }, "node_modules/typescript": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz", - "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz", + "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -4191,13 +4193,13 @@ } }, "node_modules/vite": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.6.tgz", - "integrity": "sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", + "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", "dev": true, "dependencies": { "esbuild": "^0.20.1", - "postcss": "^8.4.36", + "postcss": "^8.4.38", "rollup": "^4.13.0" }, "bin": { diff --git a/demo/package.json b/demo/package.json index b9fe6f8a..11311403 100644 --- a/demo/package.json +++ b/demo/package.json @@ -17,14 +17,14 @@ "devDependencies": { "@codingame/esbuild-import-meta-url-plugin": "^1.0.2", "@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/rollup-vsix-plugin", - "@types/dockerode": "^3.3.26", + "@types/dockerode": "^3.3.28", "@types/express": "^4.17.21", "@types/node": "^20.11.4", "@types/wicg-file-system-access": "^2023.10.5", "@types/ws": "^8.5.10", "ts-node": "^10.9.2", - "typescript": "~5.4.3", - "vite": "~5.2.6" + "typescript": "~5.4.4", + "vite": "~5.2.8" }, "dependencies": { "@codingame/monaco-vscode-accessibility-service-override": "file:../dist/service-override-accessibility", diff --git a/package-lock.json b/package-lock.json index e52ff3e0..8f2059ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "css-url-parser": "^1.1.3", "kerberos": "^2.0.1", "keytar": "^7.9.0", - "memfs": "^4.8.0", + "memfs": "^4.8.1", "mime-types": "^2.1.35", "node-pty": "1.1.0-beta11", "vscode-oniguruma": "1.7.0", @@ -40,12 +40,12 @@ "yazl": "^2.4.3" }, "devDependencies": { - "@babel/core": "^7.24.3", + "@babel/core": "^7.24.4", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.24.1", - "@babel/preset-env": "^7.24.3", + "@babel/preset-env": "^7.24.4", "@babel/preset-typescript": "^7.24.1", - "@codingame/commitlint-config-codingame": "^1.0.10", + "@codingame/commitlint-config-codingame": "^1.1.1", "@codingame/eslint-config": "^1.1.10", "@codingame/semantic-release-config-github": "^1.0.0", "@codingame/tsconfig": "^1.1.1", @@ -64,41 +64,41 @@ "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.32", "@types/yauzl": "^2.10.3", - "@typescript-eslint/eslint-plugin": "^7.3.1", - "@typescript-eslint/parser": "^7.3.1", + "@typescript-eslint/eslint-plugin": "^7.6.0", + "@typescript-eslint/parser": "^7.6.0", "@vscode/iconv-lite-umd": "^0.7.0", "@web/rollup-plugin-import-meta-assets": "^2.2.1", "change-package-name": "^1.0.5", "eslint": "^8.57.0", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-n": "^16.6.2", + "eslint-plugin-n": "^17.0.0", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-unused-imports": "^3.1.0", "fast-glob": "^3.3.2", "graceful-fs": "^4.2.11", "is-builtin-module": "^3.2.1", "js-cleanup": "^1.2.0", - "jschardet": "^3.1.0", + "jschardet": "^3.1.2", "package-json": "^10.0.0", "param-case": "^3.0.4", "pascal-case": "^3.1.2", "patch-package": "^8.0.0", "recast": "^0.23.6", - "rollup": "^4.13.0", + "rollup": "^4.14.1", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.1.0", "rollup-plugin-styles": "^4.0.0", - "semantic-release": "23.0.5", + "semantic-release": "23.0.7", "semver": "^7.6.0", "ts-morph": "^22.0.0", "ts-node": "^10.9.2", - "type-fest": "^4.13.1", - "typescript": "5.4.2", + "type-fest": "^4.15.0", + "typescript": "5.4.4", "vscode-marked": "npm:marked@=3.0.2", "vscode-semver": "npm:semver@=5.5.0", "yargs": "^17.7.2", - "zx": "^7.2.3" + "zx": "^8.0.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -137,27 +137,27 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz", - "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz", + "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz", - "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz", + "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.1", + "@babel/generator": "^7.24.4", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.24.1", - "@babel/parser": "^7.24.1", + "@babel/helpers": "^7.24.4", + "@babel/parser": "^7.24.4", "@babel/template": "^7.24.0", "@babel/traverse": "^7.24.1", "@babel/types": "^7.24.0", @@ -185,9 +185,9 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz", - "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", + "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", "dev": true, "dependencies": { "@babel/types": "^7.24.0", @@ -249,9 +249,9 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz", - "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz", + "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -532,9 +532,9 @@ } }, "node_modules/@babel/helpers": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz", - "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz", + "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==", "dev": true, "dependencies": { "@babel/template": "^7.24.0", @@ -561,9 +561,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz", - "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", + "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -572,6 +572,22 @@ "node": ">=6.0.0" } }, + "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz", + "integrity": "sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.24.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.24.1", "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz", @@ -1012,9 +1028,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.1.tgz", - "integrity": "sha512-h71T2QQvDgM2SmT29UYU6ozjMlAt7s7CSs5Hvy8f8cf/GM/Z4a2zMfN+fjVGaieeCrXR3EdQl6C4gQG+OgmbKw==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz", + "integrity": "sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.24.0" @@ -1043,12 +1059,12 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.1.tgz", - "integrity": "sha512-FUHlKCn6J3ERiu8Dv+4eoz7w8+kFLSyeVG4vDAikwADGjUCoHw/JHokyGtr8OR4UjpwPVivyF+h8Q5iv/JmrtA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz", + "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.1", + "@babel/helper-create-class-features-plugin": "^7.24.4", "@babel/helper-plugin-utils": "^7.24.0", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, @@ -1736,15 +1752,16 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.24.3", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.3.tgz", - "integrity": "sha512-fSk430k5c2ff8536JcPvPWK4tZDwehWLGlBp0wrsBUjZVdeQV6lePbwKWZaZfK2vnh/1kQX1PzAJWsnBmVgGJA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.4.tgz", + "integrity": "sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.24.1", + "@babel/compat-data": "^7.24.4", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.4", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1", "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1", @@ -1771,9 +1788,9 @@ "@babel/plugin-transform-async-generator-functions": "^7.24.3", "@babel/plugin-transform-async-to-generator": "^7.24.1", "@babel/plugin-transform-block-scoped-functions": "^7.24.1", - "@babel/plugin-transform-block-scoping": "^7.24.1", + "@babel/plugin-transform-block-scoping": "^7.24.4", "@babel/plugin-transform-class-properties": "^7.24.1", - "@babel/plugin-transform-class-static-block": "^7.24.1", + "@babel/plugin-transform-class-static-block": "^7.24.4", "@babel/plugin-transform-classes": "^7.24.1", "@babel/plugin-transform-computed-properties": "^7.24.1", "@babel/plugin-transform-destructuring": "^7.24.1", @@ -1939,13 +1956,13 @@ } }, "node_modules/@codingame/commitlint-config-codingame": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@codingame/commitlint-config-codingame/-/commitlint-config-codingame-1.0.10.tgz", - "integrity": "sha512-W85+VBVSZkqg5HhUAVSuZWx7qK5HjwYEW7DrLZWpVx9PDlgGOGCVMGK1eOFgqbHA5YMf8pqBt3/+TRWsnuIf8Q==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@codingame/commitlint-config-codingame/-/commitlint-config-codingame-1.1.1.tgz", + "integrity": "sha512-Js/kCvDEyTEhqE5HTxxpAW0QW2uuXjRb8CONwXsdCXfZOp3jA5fVL4AFdXNKctATBXmmoHAqq4pXEZ2BxdJgyQ==", "dev": true, "dependencies": { - "@codingame/semantic-release-rules": "^1.1.4", - "@commitlint/config-conventional": "^18.6.0" + "@codingame/semantic-release-rules": "^1.1.6", + "@commitlint/config-conventional": "^19.1.0" } }, "node_modules/@codingame/eslint-config": { @@ -2021,11 +2038,12 @@ } }, "node_modules/@commitlint/config-conventional": { - "version": "18.6.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-18.6.0.tgz", - "integrity": "sha512-CDCOf2eJz9D/TL44IBks0stM9TmdLCNE2B48owIU3YCadwzts/bobXPScagIgPQF6hhKYMEdj5zpUDlmbwuqwQ==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.1.0.tgz", + "integrity": "sha512-KIKD2xrp6Uuk+dcZVj3++MlzIr/Su6zLE8crEDQCZNvWHNQSeeGbzOlNtsR32TUy6H3JbP7nWgduAHCaiGQ6EA==", "dev": true, "dependencies": { + "@commitlint/types": "^19.0.3", "conventional-changelog-conventionalcommits": "^7.0.2" }, "engines": { @@ -3057,9 +3075,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", - "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.1.tgz", + "integrity": "sha512-fH8/o8nSUek8ceQnT7K4EQbSiV7jgkHq81m9lWZFIXjJ7lJzpWXbQFpT/Zh6OZYnpFykvzC3fbEvEAFZu03dPA==", "cpu": [ "arm" ], @@ -3070,9 +3088,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", - "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.1.tgz", + "integrity": "sha512-Y/9OHLjzkunF+KGEoJr3heiD5X9OLa8sbT1lm0NYeKyaM3oMhhQFvPB0bNZYJwlq93j8Z6wSxh9+cyKQaxS7PQ==", "cpu": [ "arm64" ], @@ -3083,9 +3101,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", - "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.1.tgz", + "integrity": "sha512-+kecg3FY84WadgcuSVm6llrABOdQAEbNdnpi5X3UwWiFVhZIZvKgGrF7kmLguvxHNQy+UuRV66cLVl3S+Rkt+Q==", "cpu": [ "arm64" ], @@ -3096,9 +3114,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", - "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.1.tgz", + "integrity": "sha512-2pYRzEjVqq2TB/UNv47BV/8vQiXkFGVmPFwJb+1E0IFFZbIX8/jo1olxqqMbo6xCXf8kabANhp5bzCij2tFLUA==", "cpu": [ "x64" ], @@ -3109,9 +3127,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", - "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.1.tgz", + "integrity": "sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==", "cpu": [ "arm" ], @@ -3122,9 +3140,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", - "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.1.tgz", + "integrity": "sha512-p9rGKYkHdFMzhckOTFubfxgyIO1vw//7IIjBBRVzyZebWlzRLeNhqxuSaZ7kCEKVkm/kuC9fVRW9HkC/zNRG2w==", "cpu": [ "arm64" ], @@ -3135,9 +3153,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", - "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.1.tgz", + "integrity": "sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==", "cpu": [ "arm64" ], @@ -3147,10 +3165,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.1.tgz", + "integrity": "sha512-im7HE4VBL+aDswvcmfx88Mp1soqL9OBsdDBU8NqDEYtkri0qV0THhQsvZtZeNNlLeCUQ16PZyv7cqutjDF35qw==", + "cpu": [ + "ppc64le" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", - "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.1.tgz", + "integrity": "sha512-RWdiHuAxWmzPJgaHJdpvUUlDz8sdQz4P2uv367T2JocdDa98iRw2UjIJ4QxSyt077mXZT2X6pKfT2iYtVEvOFw==", "cpu": [ "riscv64" ], @@ -3160,10 +3191,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.1.tgz", + "integrity": "sha512-VMgaGQ5zRX6ZqV/fas65/sUGc9cPmsntq2FiGmayW9KMNfWVG/j0BAqImvU4KTeOOgYSf1F+k6at1UfNONuNjA==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", - "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.1.tgz", + "integrity": "sha512-9Q7DGjZN+hTdJomaQ3Iub4m6VPu1r94bmK2z3UeWP3dGUecRC54tmVu9vKHTm1bOt3ASoYtEz6JSRLFzrysKlA==", "cpu": [ "x64" ], @@ -3174,9 +3218,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", - "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.1.tgz", + "integrity": "sha512-JNEG/Ti55413SsreTguSx0LOVKX902OfXIKVg+TCXO6Gjans/k9O6ww9q3oLGjNDaTLxM+IHFMeXy/0RXL5R/g==", "cpu": [ "x64" ], @@ -3187,9 +3231,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", - "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.1.tgz", + "integrity": "sha512-ryS22I9y0mumlLNwDFYZRDFLwWh3aKaC72CWjFcFvxK0U6v/mOkM5Up1bTbCRAhv3kEIwW2ajROegCIQViUCeA==", "cpu": [ "arm64" ], @@ -3200,9 +3244,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", - "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.1.tgz", + "integrity": "sha512-TdloItiGk+T0mTxKx7Hp279xy30LspMso+GzQvV2maYePMAWdmrzqSNZhUpPj3CGw12aGj57I026PgLCTu8CGg==", "cpu": [ "ia32" ], @@ -3213,9 +3257,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", - "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.1.tgz", + "integrity": "sha512-wQGI+LY/Py20zdUPq+XCem7JcPOyzIJBm3dli+56DJsQOHbnXZFEwgmnC6el1TPAfC8lBT3m+z69RmLykNUbew==", "cpu": [ "x64" ], @@ -3477,6 +3521,7 @@ "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz", "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==", "dev": true, + "optional": true, "dependencies": { "@types/node": "*" } @@ -3493,12 +3538,6 @@ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", "dev": true }, - "node_modules/@types/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", - "dev": true - }, "node_modules/@types/node": { "version": "18.19.8", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.8.tgz", @@ -3520,12 +3559,6 @@ "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", "dev": true }, - "node_modules/@types/ps-tree": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@types/ps-tree/-/ps-tree-1.1.6.tgz", - "integrity": "sha512-PtrlVaOaI44/3pl3cvnlK+GxOM3re2526TJvPvh7W+keHIXdV4TE0ylpPBAcvFQCbGitaTXwL9u+RF7qtVeazQ==", - "dev": true - }, "node_modules/@types/resolve": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", @@ -3558,12 +3591,6 @@ "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==", "dev": true }, - "node_modules/@types/which": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.3.tgz", - "integrity": "sha512-2C1+XoY0huExTbs8MQv1DuS5FS86+SEjdM9F/+GS61gg5Hqbtj8ZiDSx8MfWcyei907fIPbfPGCOrNUTnVHY1g==", - "dev": true - }, "node_modules/@types/yargs": { "version": "17.0.32", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", @@ -3589,22 +3616,22 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.3.1.tgz", - "integrity": "sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.6.0.tgz", + "integrity": "sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.3.1", - "@typescript-eslint/type-utils": "7.3.1", - "@typescript-eslint/utils": "7.3.1", - "@typescript-eslint/visitor-keys": "7.3.1", + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "7.6.0", + "@typescript-eslint/type-utils": "7.6.0", + "@typescript-eslint/utils": "7.6.0", + "@typescript-eslint/visitor-keys": "7.6.0", "debug": "^4.3.4", "graphemer": "^1.4.0", - "ignore": "^5.2.4", + "ignore": "^5.3.1", "natural-compare": "^1.4.0", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3624,15 +3651,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.3.1.tgz", - "integrity": "sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.6.0.tgz", + "integrity": "sha512-usPMPHcwX3ZoPWnBnhhorc14NJw9J4HpSXQX4urF2TPKG0au0XhJoZyX62fmvdHONUkmyUe74Hzm1//XA+BoYg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.3.1", - "@typescript-eslint/types": "7.3.1", - "@typescript-eslint/typescript-estree": "7.3.1", - "@typescript-eslint/visitor-keys": "7.3.1", + "@typescript-eslint/scope-manager": "7.6.0", + "@typescript-eslint/types": "7.6.0", + "@typescript-eslint/typescript-estree": "7.6.0", + "@typescript-eslint/visitor-keys": "7.6.0", "debug": "^4.3.4" }, "engines": { @@ -3652,13 +3679,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.3.1.tgz", - "integrity": "sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.6.0.tgz", + "integrity": "sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.3.1", - "@typescript-eslint/visitor-keys": "7.3.1" + "@typescript-eslint/types": "7.6.0", + "@typescript-eslint/visitor-keys": "7.6.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3669,15 +3696,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.3.1.tgz", - "integrity": "sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.6.0.tgz", + "integrity": "sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.3.1", - "@typescript-eslint/utils": "7.3.1", + "@typescript-eslint/typescript-estree": "7.6.0", + "@typescript-eslint/utils": "7.6.0", "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" + "ts-api-utils": "^1.3.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3696,9 +3723,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.3.1.tgz", - "integrity": "sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.6.0.tgz", + "integrity": "sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3709,19 +3736,19 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.3.1.tgz", - "integrity": "sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.6.0.tgz", + "integrity": "sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.3.1", - "@typescript-eslint/visitor-keys": "7.3.1", + "@typescript-eslint/types": "7.6.0", + "@typescript-eslint/visitor-keys": "7.6.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3766,18 +3793,18 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.3.1.tgz", - "integrity": "sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.6.0.tgz", + "integrity": "sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.3.1", - "@typescript-eslint/types": "7.3.1", - "@typescript-eslint/typescript-estree": "7.3.1", - "semver": "^7.5.4" + "@types/json-schema": "^7.0.15", + "@types/semver": "^7.5.8", + "@typescript-eslint/scope-manager": "7.6.0", + "@typescript-eslint/types": "7.6.0", + "@typescript-eslint/typescript-estree": "7.6.0", + "semver": "^7.6.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3791,13 +3818,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.3.1.tgz", - "integrity": "sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.6.0.tgz", + "integrity": "sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.3.1", - "eslint-visitor-keys": "^3.4.1" + "@typescript-eslint/types": "7.6.0", + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -4573,15 +4600,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "dependencies": { - "semver": "^7.0.0" - } - }, "node_modules/call-bind": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.6.tgz", @@ -5023,6 +5041,18 @@ "node": ">=16" } }, + "node_modules/convert-hrtime": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/convert-hrtime/-/convert-hrtime-5.0.0.tgz", + "integrity": "sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -5325,15 +5355,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/data-uri-to-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", - "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -5563,12 +5584,6 @@ "node": ">=8" } }, - "node_modules/duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true - }, "node_modules/duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", @@ -5604,6 +5619,19 @@ "once": "^1.4.0" } }, + "node_modules/enhanced-resolve": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", + "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", @@ -6016,77 +6044,38 @@ } }, "node_modules/eslint-plugin-n": { - "version": "16.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz", - "integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.0.0.tgz", + "integrity": "sha512-0Ihff+kWUIiXYTNTotGj/yRI1X5uCh/lef5Hr7ih/mFeYMQ3bPfN0KxlrfhU+Xn4x697l/TPO6zxqE33M1yD0w==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "builtins": "^5.0.1", + "enhanced-resolve": "^5.15.0", "eslint-plugin-es-x": "^7.5.0", "get-tsconfig": "^4.7.0", - "globals": "^13.24.0", + "globals": "^14.0.0", "ignore": "^5.2.4", "is-builtin-module": "^3.2.1", - "is-core-module": "^2.12.1", - "minimatch": "^3.1.2", - "resolve": "^1.22.2", + "minimatch": "^9.0.0", "semver": "^7.5.3" }, "engines": { - "node": ">=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://github.com/sponsors/mysticatea" }, "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-plugin-n/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "eslint": ">=8.23.0" } }, "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint-plugin-n/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, "engines": { - "node": "*" - } - }, - "node_modules/eslint-plugin-n/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -6393,21 +6382,6 @@ "node": ">=0.10.0" } }, - "node_modules/event-stream": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", - "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==", - "dev": true, - "dependencies": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", - "pause-stream": "0.0.11", - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" - } - }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -6520,29 +6494,6 @@ "pend": "~1.2.0" } }, - "node_modules/fetch-blob": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", - "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "paypal", - "url": "https://paypal.me/jimmywarting" - } - ], - "dependencies": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - }, - "engines": { - "node": "^12.20 || >= 14.13" - } - }, "node_modules/figures": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/figures/-/figures-6.0.1.tgz", @@ -6624,15 +6575,16 @@ } }, "node_modules/find-versions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz", - "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-6.0.0.tgz", + "integrity": "sha512-2kCCtc+JvcZ86IGAz3Z2Y0A1baIz9fL31pH/0S1IqZr9Iwnjq8izfPtrCyQKO6TLMPELLsQMre7VDqeIKCsHkA==", "dev": true, "dependencies": { - "semver-regex": "^4.0.5" + "semver-regex": "^4.0.5", + "super-regex": "^1.0.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -6676,24 +6628,6 @@ "is-callable": "^1.1.3" } }, - "node_modules/formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "dev": true, - "dependencies": { - "fetch-blob": "^3.1.2" - }, - "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==", - "dev": true - }, "node_modules/from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -6752,6 +6686,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/function-timeout": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/function-timeout/-/function-timeout-1.0.1.tgz", + "integrity": "sha512-6yPMImFFuaMPNaTMTBuolA8EanHJWF5Vju0NHpObRURT105J6x1Mf2a7J4P7Sqk2xDxv24N5L0RatEhTBhNmdA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/function.prototype.name": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", @@ -6779,15 +6725,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/fx": { - "version": "31.0.0", - "resolved": "https://registry.npmjs.org/fx/-/fx-31.0.0.tgz", - "integrity": "sha512-OoeYSPKqNKmfnH4s+rGYI0c8OZmqqOOXsUtqy0YyHqQQoQSDiDs3m3M9uXKx5OQR+jDx7/FhYqpO3kl/As/xgg==", - "dev": true, - "bin": { - "fx": "index.js" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -7878,9 +7815,9 @@ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "node_modules/jschardet": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.0.tgz", - "integrity": "sha512-MND0yjRsoQ/3iFXce7lqV/iBmqH9oWGUTlty36obRBZjhFDWCLKjXgfxY75wYfwlW7EFqw52tyziy/q4WsQmrA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.2.tgz", + "integrity": "sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA==", "dev": true, "engines": { "node": ">=0.1.90" @@ -8277,12 +8214,6 @@ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, - "node_modules/map-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==", - "dev": true - }, "node_modules/marked": { "version": "12.0.0", "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.0.tgz", @@ -8334,9 +8265,9 @@ "dev": true }, "node_modules/memfs": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.8.0.tgz", - "integrity": "sha512-fcs7trFxZlOMadmTw5nyfOwS3il9pr3y+6xzLfXNwmuR/D0i4wz6rJURxArAbcJDGalbpbMvQ/IFI0NojRZgRg==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.8.1.tgz", + "integrity": "sha512-7q/AdPzf2WpwPlPL4v1kE2KsJsHl7EF4+hAeVzlyanr2+YnR21NVn9mDqo+7DEaKDRsQy8nvxPlKH4WqMtiO0w==", "dependencies": { "tslib": "^2.0.0" }, @@ -8434,9 +8365,9 @@ } }, "node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -8555,25 +8486,6 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } - ], - "engines": { - "node": ">=10.5.0" - } - }, "node_modules/node-emoji": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz", @@ -8601,24 +8513,6 @@ "url": "https://github.com/sindresorhus/is?sponsor=1" } }, - "node_modules/node-fetch": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", - "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", - "dev": true, - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, "node_modules/node-gyp-build": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz", @@ -12082,15 +11976,6 @@ "node": ">=8" } }, - "node_modules/pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==", - "dev": true, - "dependencies": { - "through": "~2.3" - } - }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -12785,21 +12670,6 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, - "node_modules/ps-tree": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", - "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==", - "dev": true, - "dependencies": { - "event-stream": "=3.3.4" - }, - "bin": { - "ps-tree": "bin/ps-tree.js" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -13206,9 +13076,9 @@ } }, "node_modules/rollup": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", - "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.1.tgz", + "integrity": "sha512-4LnHSdd3QK2pa1J6dFbfm1HN0D7vSK/ZuZTsdyUAlA6Rr1yTouUTL13HaDOGJVgby461AhrNGBS7sCGXXtT+SA==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -13221,19 +13091,21 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.13.0", - "@rollup/rollup-android-arm64": "4.13.0", - "@rollup/rollup-darwin-arm64": "4.13.0", - "@rollup/rollup-darwin-x64": "4.13.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", - "@rollup/rollup-linux-arm64-gnu": "4.13.0", - "@rollup/rollup-linux-arm64-musl": "4.13.0", - "@rollup/rollup-linux-riscv64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-musl": "4.13.0", - "@rollup/rollup-win32-arm64-msvc": "4.13.0", - "@rollup/rollup-win32-ia32-msvc": "4.13.0", - "@rollup/rollup-win32-x64-msvc": "4.13.0", + "@rollup/rollup-android-arm-eabi": "4.14.1", + "@rollup/rollup-android-arm64": "4.14.1", + "@rollup/rollup-darwin-arm64": "4.14.1", + "@rollup/rollup-darwin-x64": "4.14.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.14.1", + "@rollup/rollup-linux-arm64-gnu": "4.14.1", + "@rollup/rollup-linux-arm64-musl": "4.14.1", + "@rollup/rollup-linux-powerpc64le-gnu": "4.14.1", + "@rollup/rollup-linux-riscv64-gnu": "4.14.1", + "@rollup/rollup-linux-s390x-gnu": "4.14.1", + "@rollup/rollup-linux-x64-gnu": "4.14.1", + "@rollup/rollup-linux-x64-musl": "4.14.1", + "@rollup/rollup-win32-arm64-msvc": "4.14.1", + "@rollup/rollup-win32-ia32-msvc": "4.14.1", + "@rollup/rollup-win32-x64-msvc": "4.14.1", "fsevents": "~2.3.2" } }, @@ -13525,23 +13397,23 @@ } }, "node_modules/semantic-release": { - "version": "23.0.5", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.0.5.tgz", - "integrity": "sha512-4eZG/vRTV8E7rw5oHPv2Fht5qx6ITemE/b1vzG42ayYVcffJqXYy40nP4bHEPWX1/kleJWWrlPVDt1hSYVlpKQ==", + "version": "23.0.7", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.0.7.tgz", + "integrity": "sha512-PFxXQE57zrYiCbWKkdsVUF08s0SifEw3WhDhrN47ZEUWQiLl21FI9Dg/H8g7i/lPx0IkF6u7PjJbgxPceXKBeg==", "dev": true, "dependencies": { "@semantic-release/commit-analyzer": "^12.0.0", "@semantic-release/error": "^4.0.0", "@semantic-release/github": "^10.0.0", "@semantic-release/npm": "^12.0.0", - "@semantic-release/release-notes-generator": "^12.0.0", + "@semantic-release/release-notes-generator": "^13.0.0", "aggregate-error": "^5.0.0", "cosmiconfig": "^9.0.0", "debug": "^4.0.0", "env-ci": "^11.0.0", "execa": "^8.0.0", "figures": "^6.0.0", - "find-versions": "^5.1.0", + "find-versions": "^6.0.0", "get-stream": "^6.0.0", "git-log-parser": "^1.2.0", "hook-std": "^3.0.0", @@ -13774,6 +13646,42 @@ "semantic-release": ">=20.1.0" } }, + "node_modules/semantic-release/node_modules/@semantic-release/release-notes-generator": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-13.0.0.tgz", + "integrity": "sha512-LEeZWb340keMYuREMyxrODPXJJ0JOL8D/mCl74B4LdzbxhtXV2LrPN2QBEcGJrlQhoqLO0RhxQb6masHytKw+A==", + "dev": true, + "dependencies": { + "conventional-changelog-angular": "^7.0.0", + "conventional-changelog-writer": "^7.0.0", + "conventional-commits-filter": "^4.0.0", + "conventional-commits-parser": "^5.0.0", + "debug": "^4.0.0", + "get-stream": "^7.0.0", + "import-from-esm": "^1.0.3", + "into-stream": "^7.0.0", + "lodash-es": "^4.17.21", + "read-pkg-up": "^11.0.0" + }, + "engines": { + "node": ">=20.8.1" + }, + "peerDependencies": { + "semantic-release": ">=20.1.0" + } + }, + "node_modules/semantic-release/node_modules/@semantic-release/release-notes-generator/node_modules/get-stream": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-7.0.1.tgz", + "integrity": "sha512-3M8C1EOFN6r8AMUhwUAACIoXZJEOufDU5+0gFFN5uNs6XYOralD2Pqkl7m046va6x77FwposWXbAhPPIOus7mQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/semantic-release/node_modules/before-after-hook": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz", @@ -14153,18 +14061,6 @@ "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", "dev": true }, - "node_modules/split": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", - "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==", - "dev": true, - "dependencies": { - "through": "2" - }, - "engines": { - "node": "*" - } - }, "node_modules/split-on-first": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", @@ -14195,15 +14091,6 @@ "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility", "dev": true }, - "node_modules/stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==", - "dev": true, - "dependencies": { - "duplexer": "~0.1.1" - } - }, "node_modules/stream-combiner2": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", @@ -14351,6 +14238,22 @@ "postcss": "^8.2.15" } }, + "node_modules/super-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/super-regex/-/super-regex-1.0.0.tgz", + "integrity": "sha512-CY8u7DtbvucKuquCmOFEKhr9Besln7n9uN8eFbwcoGYWXOMW07u2o8njWaiXt11ylS3qoGF55pILjRmPlbodyg==", + "dev": true, + "dependencies": { + "function-timeout": "^1.0.1", + "time-span": "^5.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -14430,6 +14333,15 @@ "node": ">=10.13.0" } }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/tar-fs": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", @@ -14553,6 +14465,21 @@ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", "dev": true }, + "node_modules/time-span": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/time-span/-/time-span-5.1.0.tgz", + "integrity": "sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==", + "dev": true, + "dependencies": { + "convert-hrtime": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/tiny-invariant": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", @@ -14604,9 +14531,9 @@ } }, "node_modules/ts-api-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.1.tgz", - "integrity": "sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", "dev": true, "engines": { "node": ">=16" @@ -14727,9 +14654,9 @@ } }, "node_modules/type-fest": { - "version": "4.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.13.1.tgz", - "integrity": "sha512-ASMgM+Vf2cLwDMt1KXSkMUDSYCxtckDJs8zsaVF/mYteIsiARKCVtyXtcK38mIKbLTctZP8v6GMqdNaeI3fo7g==", + "version": "4.15.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.15.0.tgz", + "integrity": "sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==", "dev": true, "engines": { "node": ">=16" @@ -14804,9 +14731,9 @@ } }, "node_modules/typescript": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", - "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz", + "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -15054,24 +14981,6 @@ "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.0.0.tgz", "integrity": "sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==" }, - "node_modules/web-streams-polyfill": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz", - "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/webpod": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/webpod/-/webpod-0.0.2.tgz", - "integrity": "sha512-cSwwQIeg8v4i3p4ajHhwgR7N6VyxAf+KYSSsY6Pd3aETE+xEU4vbitz7qQkB0I321xnhDdgtxuiSfk5r/FVtjg==", - "dev": true, - "bin": { - "webpod": "dist/index.js" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -15285,32 +15194,19 @@ } }, "node_modules/zx": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/zx/-/zx-7.2.3.tgz", - "integrity": "sha512-QODu38nLlYXg/B/Gw7ZKiZrvPkEsjPN3LQ5JFXM7h0JvwhEdPNNl+4Ao1y4+o3CLNiDUNcwzQYZ4/Ko7kKzCMA==", - "dev": true, - "dependencies": { - "@types/fs-extra": "^11.0.1", - "@types/minimist": "^1.2.2", - "@types/node": "^18.16.3", - "@types/ps-tree": "^1.1.2", - "@types/which": "^3.0.0", - "chalk": "^5.2.0", - "fs-extra": "^11.1.1", - "fx": "*", - "globby": "^13.1.4", - "minimist": "^1.2.8", - "node-fetch": "3.3.1", - "ps-tree": "^1.2.0", - "webpod": "^0", - "which": "^3.0.0", - "yaml": "^2.2.2" - }, + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/zx/-/zx-8.0.1.tgz", + "integrity": "sha512-Y+ITW1GQjADk7qgrbhnukMgoNsJmlyx53cUQ6/6NXU+BMBdCbTc6flTOHUctmzKvPjTmdwaddzJY/dbLie9sQg==", + "dev": true, "bin": { "zx": "build/cli.js" }, "engines": { "node": ">= 16.0.0" + }, + "optionalDependencies": { + "@types/fs-extra": "^11.0.4", + "@types/node": ">=20.12.5" } }, "node_modules/zx/node_modules/@types/fs-extra": { @@ -15318,67 +15214,20 @@ "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", "dev": true, + "optional": true, "dependencies": { "@types/jsonfile": "*", "@types/node": "*" } }, - "node_modules/zx/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/zx/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "dev": true, - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zx/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zx/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "node_modules/zx/node_modules/@types/node": { + "version": "20.12.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.6.tgz", + "integrity": "sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==", "dev": true, + "optional": true, "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "undici-types": "~5.26.4" } } } diff --git a/package.json b/package.json index bdb8dcb9..217e8332 100644 --- a/package.json +++ b/package.json @@ -41,12 +41,12 @@ } }, "devDependencies": { - "@babel/core": "^7.24.3", + "@babel/core": "^7.24.4", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.24.1", - "@babel/preset-env": "^7.24.3", + "@babel/preset-env": "^7.24.4", "@babel/preset-typescript": "^7.24.1", - "@codingame/commitlint-config-codingame": "^1.0.10", + "@codingame/commitlint-config-codingame": "^1.1.1", "@codingame/eslint-config": "^1.1.10", "@codingame/semantic-release-config-github": "^1.0.0", "@codingame/tsconfig": "^1.1.1", @@ -65,41 +65,41 @@ "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.32", "@types/yauzl": "^2.10.3", - "@typescript-eslint/eslint-plugin": "^7.3.1", - "@typescript-eslint/parser": "^7.3.1", + "@typescript-eslint/eslint-plugin": "^7.6.0", + "@typescript-eslint/parser": "^7.6.0", "@vscode/iconv-lite-umd": "^0.7.0", "@web/rollup-plugin-import-meta-assets": "^2.2.1", "change-package-name": "^1.0.5", "eslint": "^8.57.0", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-n": "^16.6.2", + "eslint-plugin-n": "^17.0.0", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-unused-imports": "^3.1.0", "fast-glob": "^3.3.2", "graceful-fs": "^4.2.11", "is-builtin-module": "^3.2.1", "js-cleanup": "^1.2.0", - "jschardet": "^3.1.0", + "jschardet": "^3.1.2", "package-json": "^10.0.0", "param-case": "^3.0.4", "pascal-case": "^3.1.2", "patch-package": "^8.0.0", "recast": "^0.23.6", - "rollup": "^4.13.0", + "rollup": "^4.14.1", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.1.0", "rollup-plugin-styles": "^4.0.0", - "semantic-release": "23.0.5", + "semantic-release": "23.0.7", "semver": "^7.6.0", "ts-morph": "^22.0.0", "ts-node": "^10.9.2", - "type-fest": "^4.13.1", - "typescript": "5.4.2", + "type-fest": "^4.15.0", + "typescript": "5.4.4", "vscode-marked": "npm:marked@=3.0.2", "vscode-semver": "npm:semver@=5.5.0", "yargs": "^17.7.2", - "zx": "^7.2.3" + "zx": "^8.0.1" }, "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", @@ -123,7 +123,7 @@ "css-url-parser": "^1.1.3", "kerberos": "^2.0.1", "keytar": "^7.9.0", - "memfs": "^4.8.0", + "memfs": "^4.8.1", "mime-types": "^2.1.35", "node-pty": "1.1.0-beta11", "vscode-oniguruma": "1.7.0", @@ -137,7 +137,7 @@ "rollup": "$rollup", "recast": "$recast", "@xterm/xterm": "5.5.0-beta.12", - "@typescript-eslint/eslint-plugin": "$@typescript-eslint/eslint-plugin" + "eslint-plugin-n": "$eslint-plugin-n" }, "volta": { "node": "18.17.1",