diff --git a/.ncurc.json b/.ncurc.json index a0186ac7..b5c04a45 100644 --- a/.ncurc.json +++ b/.ncurc.json @@ -4,6 +4,7 @@ "@microsoft/1ds-post-js", "@types/node", "@types/vscode-semver", + "@vscode/codicons", "@vscode/iconv-lite-umd", "@vscode/proxy-agent", "@vscode/ripgrep", diff --git a/demo/package-lock.json b/demo/package-lock.json index 24695e73..9a77ace8 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -154,6 +154,7 @@ "@codingame/monaco-vscode-terminal-service-override": "file:../dist/packages/monaco-vscode-terminal-service-override", "@codingame/monaco-vscode-testing-service-override": "file:../dist/packages/monaco-vscode-testing-service-override", "@codingame/monaco-vscode-textmate-service-override": "file:../dist/packages/monaco-vscode-textmate-service-override", + "@codingame/monaco-vscode-theme-2026-default-extension": "file:../dist/packages/monaco-vscode-theme-2026-default-extension", "@codingame/monaco-vscode-theme-abyss-default-extension": "file:../dist/packages/monaco-vscode-theme-abyss-default-extension", "@codingame/monaco-vscode-theme-defaults-default-extension": "file:../dist/packages/monaco-vscode-theme-defaults-default-extension", "@codingame/monaco-vscode-theme-kimbie-dark-default-extension": "file:../dist/packages/monaco-vscode-theme-kimbie-dark-default-extension", @@ -310,6 +311,7 @@ "@codingame/monaco-vscode-simple-browser-default-extension": "0.0.0-semantic-release", "@codingame/monaco-vscode-sql-default-extension": "0.0.0-semantic-release", "@codingame/monaco-vscode-swift-default-extension": "0.0.0-semantic-release", + "@codingame/monaco-vscode-theme-2026-default-extension": "0.0.0-semantic-release", "@codingame/monaco-vscode-theme-abyss-default-extension": "0.0.0-semantic-release", "@codingame/monaco-vscode-theme-defaults-default-extension": "0.0.0-semantic-release", "@codingame/monaco-vscode-theme-kimbie-dark-default-extension": "0.0.0-semantic-release", @@ -1599,6 +1601,14 @@ "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release" } }, + "node_modules/@codingame/monaco-vscode-theme-2026-default-extension": { + "version": "0.0.0-semantic-release", + "resolved": "file:../dist/packages/monaco-vscode-theme-2026-default-extension", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-api": "0.0.0-semantic-release" + } + }, "node_modules/@codingame/monaco-vscode-theme-abyss-default-extension": { "version": "0.0.0-semantic-release", "resolved": "file:../dist/packages/monaco-vscode-theme-abyss-default-extension", @@ -1709,8 +1719,7 @@ "resolved": "file:../dist/packages/monaco-vscode-treesitter-service-override", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-api": "0.0.0-semantic-release", - "@vscode/tree-sitter-wasm": "0.3.0" + "@codingame/monaco-vscode-api": "0.0.0-semantic-release" } }, "node_modules/@codingame/monaco-vscode-typescript-basics-default-extension": { @@ -1813,6 +1822,7 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-api": "0.0.0-semantic-release", + "@codingame/monaco-vscode-katex-common": "0.0.0-semantic-release", "marked": "14.0.0" } }, @@ -1869,14 +1879,14 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-api": "0.0.0-semantic-release", - "@xterm/addon-clipboard": "0.3.0-beta.97", - "@xterm/addon-image": "0.10.0-beta.97", - "@xterm/addon-ligatures": "0.11.0-beta.97", - "@xterm/addon-progress": "0.3.0-beta.97", - "@xterm/addon-search": "0.17.0-beta.97", - "@xterm/addon-serialize": "0.15.0-beta.97", - "@xterm/addon-unicode11": "0.10.0-beta.97", - "@xterm/addon-webgl": "0.20.0-beta.104" + "@xterm/addon-clipboard": "0.3.0-beta.147", + "@xterm/addon-image": "0.10.0-beta.147", + "@xterm/addon-ligatures": "0.11.0-beta.147", + "@xterm/addon-progress": "0.3.0-beta.147", + "@xterm/addon-search": "0.17.0-beta.147", + "@xterm/addon-serialize": "0.15.0-beta.147", + "@xterm/addon-unicode11": "0.10.0-beta.147", + "@xterm/addon-webgl": "0.20.0-beta.146" } }, "node_modules/@codingame/monaco-vscode-xterm-common": { @@ -1886,13 +1896,13 @@ "dependencies": { "@codingame/monaco-vscode-api": "0.0.0-semantic-release", "@codingame/monaco-vscode-xterm-addons-common": "0.0.0-semantic-release", - "@xterm/xterm": "6.1.0-beta.97" + "@xterm/xterm": "6.1.0-beta.147" } }, "node_modules/@codingame/monaco-vscode-xterm-common/node_modules/@xterm/xterm": { - "version": "6.1.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.97.tgz", - "integrity": "sha512-YEn7p+wS2qQ1dyvIXHxmjxmVc/Y1Xv+gZNHayJMAH4FdoxP9CCrhsvpNjBwSynft5t0BWD7FqqsNXNei01oxKw==", + "version": "6.1.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.147.tgz", + "integrity": "sha512-3Q0NJFkde5wqtDSaFOAk2t1GVHbUkCEgDRdKT7dc3TylwxyGuKNzSkVYjH/tEGcb2BLa3wFVimAHQQp6KSCt9Q==", "license": "MIT", "workspaces": [ "addons/*" @@ -1907,9 +1917,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", - "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", + "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", "cpu": [ "ppc64" ], @@ -1924,9 +1934,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", - "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", + "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", "cpu": [ "arm" ], @@ -1941,9 +1951,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", - "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", + "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", "cpu": [ "arm64" ], @@ -1958,9 +1968,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", - "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", + "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", "cpu": [ "x64" ], @@ -1975,9 +1985,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", + "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", "cpu": [ "arm64" ], @@ -1992,9 +2002,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", - "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", + "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", "cpu": [ "x64" ], @@ -2009,9 +2019,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", - "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", + "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", "cpu": [ "arm64" ], @@ -2026,9 +2036,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", - "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", + "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", "cpu": [ "x64" ], @@ -2043,9 +2053,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", - "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", + "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", "cpu": [ "arm" ], @@ -2060,9 +2070,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", - "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", + "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", "cpu": [ "arm64" ], @@ -2077,9 +2087,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", - "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", + "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", "cpu": [ "ia32" ], @@ -2094,9 +2104,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", - "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", + "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", "cpu": [ "loong64" ], @@ -2111,9 +2121,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", - "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", + "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", "cpu": [ "mips64el" ], @@ -2128,9 +2138,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", - "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", + "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", "cpu": [ "ppc64" ], @@ -2145,9 +2155,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", - "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", + "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", "cpu": [ "riscv64" ], @@ -2162,9 +2172,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", - "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", + "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", "cpu": [ "s390x" ], @@ -2179,9 +2189,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", - "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", + "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", "cpu": [ "x64" ], @@ -2196,9 +2206,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", - "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", + "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", "cpu": [ "arm64" ], @@ -2213,9 +2223,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", - "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", + "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", "cpu": [ "x64" ], @@ -2230,9 +2240,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", - "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", + "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", "cpu": [ "arm64" ], @@ -2247,9 +2257,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", - "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", + "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", "cpu": [ "x64" ], @@ -2264,9 +2274,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", - "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", + "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", "cpu": [ "arm64" ], @@ -2281,9 +2291,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", - "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", + "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", "cpu": [ "x64" ], @@ -2298,9 +2308,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", - "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", + "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", "cpu": [ "arm64" ], @@ -2315,9 +2325,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", - "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", + "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", "cpu": [ "ia32" ], @@ -2332,9 +2342,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", - "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", + "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", "cpu": [ "x64" ], @@ -2425,9 +2435,9 @@ } }, "node_modules/@jsonjoy.com/buffers": { - "version": "17.65.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-17.65.0.tgz", - "integrity": "sha512-eBrIXd0/Ld3p9lpDDlMaMn6IEfWqtHMD+z61u0JrIiPzsV1r7m6xDZFRxJyvIFTEO+SWdYF9EiQbXZGd8BzPfA==", + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-17.67.0.tgz", + "integrity": "sha512-tfExRpYxBvi32vPs9ZHaTjSP4fHAfzSmcahOfNxtvGHcyJel+aibkPlGeBB+7AoC6hL7lXIE++8okecBxx7lcw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2633,9 +2643,9 @@ } }, "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/base64": { - "version": "17.65.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-17.65.0.tgz", - "integrity": "sha512-Xrh7Fm/M0QAYpekSgmskdZYnFdSGnsxJ/tHaolA4bNwWdG9i65S8m83Meh7FOxyJyQAdo4d4J97NOomBLEfkDQ==", + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-17.67.0.tgz", + "integrity": "sha512-5SEsJGsm15aP8TQGkDfJvz9axgPwAEm98S5DxOuYe8e1EbfajcDmgeXXzccEjh+mLnjqEKrkBdjHWS5vFNwDdw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2650,9 +2660,9 @@ } }, "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/codegen": { - "version": "17.65.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-17.65.0.tgz", - "integrity": "sha512-7MXcRYe7n3BG+fo3jicvjB0+6ypl2Y/bQp79Sp7KeSiiCgLqw4Oled6chVv07/xLVTdo3qa1CD0VCCnPaw+RGA==", + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-17.67.0.tgz", + "integrity": "sha512-idnkUplROpdBOV0HMcwhsCUS5TRUi9poagdGs70A6S4ux9+/aPuKbh8+UYRTLYQHtXvAdNfQWXDqZEx5k4Dj2Q==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2667,17 +2677,17 @@ } }, "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/json-pack": { - "version": "17.65.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-17.65.0.tgz", - "integrity": "sha512-e0SG/6qUCnVhHa0rjDJHgnXnbsacooHVqQHxspjvlYQSkHm+66wkHw6Gql+3u/WxI/b1VsOdUi0M+fOtkgKGdQ==", + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-17.67.0.tgz", + "integrity": "sha512-t0ejURcGaZsn1ClbJ/3kFqSOjlryd92eQY465IYrezsXmPcfHPE/av4twRSxf6WE+TkZgLY+71vCZbiIiFKA/w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/base64": "17.65.0", - "@jsonjoy.com/buffers": "17.65.0", - "@jsonjoy.com/codegen": "17.65.0", - "@jsonjoy.com/json-pointer": "17.65.0", - "@jsonjoy.com/util": "17.65.0", + "@jsonjoy.com/base64": "17.67.0", + "@jsonjoy.com/buffers": "17.67.0", + "@jsonjoy.com/codegen": "17.67.0", + "@jsonjoy.com/json-pointer": "17.67.0", + "@jsonjoy.com/util": "17.67.0", "hyperdyperid": "^1.2.0", "thingies": "^2.5.0", "tree-dump": "^1.1.0" @@ -2694,13 +2704,13 @@ } }, "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/json-pointer": { - "version": "17.65.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-17.65.0.tgz", - "integrity": "sha512-uhTe+XhlIZpWOxgPcnO+iSCDgKKBpwkDVTyYiXX9VayGV8HSFVJM67M6pUE71zdnXF1W0Da21AvnhlmdwYPpow==", + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-17.67.0.tgz", + "integrity": "sha512-+iqOFInH+QZGmSuaybBUNdh7yvNrXvqR+h3wjXm0N/3JK1EyyFAeGJvqnmQL61d1ARLlk/wJdFKSL+LHJ1eaUA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/util": "17.65.0" + "@jsonjoy.com/util": "17.67.0" }, "engines": { "node": ">=10.0" @@ -2714,14 +2724,14 @@ } }, "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/util": { - "version": "17.65.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-17.65.0.tgz", - "integrity": "sha512-cWiEHZccQORf96q2y6zU3wDeIVPeidmGqd9cNKJRYoVHTV0S1eHPy5JTbHpMnGfDvtvujQwQozOqgO9ABu6h0w==", + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-17.67.0.tgz", + "integrity": "sha512-6+8xBaz1rLSohlGh68D1pdw3AwDi9xydm8QNlAFkvnavCJYSze+pxoW2VKP8p308jtlMRLs5NTHfPlZLd4w7ew==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/buffers": "17.65.0", - "@jsonjoy.com/codegen": "17.65.0" + "@jsonjoy.com/buffers": "17.67.0", + "@jsonjoy.com/codegen": "17.67.0" }, "engines": { "node": ">=10.0" @@ -3405,9 +3415,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.19.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.8.tgz", - "integrity": "sha512-ebO/Yl+EAvVe8DnMfi+iaAyIqYdK0q/q0y0rw82INWEKJOBe6b/P3YWE8NW7oOlF/nXFNrHwhARrN/hdgDkraA==", + "version": "22.19.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.10.tgz", + "integrity": "sha512-tF5VOugLS/EuDlTBijk0MqABfP8UxgYazTLo3uIn3b4yJgg26QRbVYJYsDtHrjdDUIRfP70+VfhTTc+CE1yskw==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" @@ -3511,12 +3521,6 @@ "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", "license": "MIT" }, - "node_modules/@vscode/tree-sitter-wasm": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.3.0.tgz", - "integrity": "sha512-4kjB1jgLyG9VimGfyJb1F8/GFdrx55atsBCH/9r2D/iZHAUDCvZ5zhWXB7sRQ2z2WkkuNYm/0pgQtUm1jhdf7A==", - "license": "MIT" - }, "node_modules/@vscode/vscode-languagedetection": { "name": "@codingame/vscode-languagedetection", "version": "1.0.23", @@ -3528,30 +3532,30 @@ } }, "node_modules/@xterm/addon-clipboard": { - "version": "0.3.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.97.tgz", - "integrity": "sha512-8+1tM4WD1MnQccYc/+Kbo+OeptIEf0rn5az6AUw+lnNHPlJa71Xj8KQNBM5f8sns7uoFZzBxpse8SOTttVefBw==", + "version": "0.3.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.147.tgz", + "integrity": "sha512-U5HHcl/XiYpafV+Pajvt8jpVoC4g3EFUtav1WElCC0XzFkwcSqZvT5/4aJDdnCd208CXOuliY72//GD0XC5lcw==", "license": "MIT", "dependencies": { "js-base64": "^3.7.5" }, "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-image": { - "version": "0.10.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.97.tgz", - "integrity": "sha512-O5P/QFVAQRuZ8sKj2dT6sTyHz/l98g+1tKKqDRZYVAobL6elbAMsh3UL/eQBWfDrBfD23XZ93UcgOFCF62YXuQ==", + "version": "0.10.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.147.tgz", + "integrity": "sha512-BPPxxfbLT5XTSYzxoYScjRKfb3QacixurvXGLPXwGrGplUm+m9569NULPr2vxWnsdsyrSrpDj6Qnvb7FtJHWWg==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-ligatures": { - "version": "0.11.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.97.tgz", - "integrity": "sha512-r2WX1JHJBO9tiVzjnHVjD38IOMQI5m7mzZt+2cDAwJTDoFJO6WktxUxX8QV90mCbXLFS6jwX+6G2tzSPKLFsNg==", + "version": "0.11.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.147.tgz", + "integrity": "sha512-QR4yuF2sgFfXv8hddBc9HfYFYjAErAVi3kk4zPbkZVyzXvlQjSH6v+8wF0q7wDM3o/Elty56QQl2TvA0OrNoDw==", "license": "MIT", "dependencies": { "lru-cache": "^6.0.0", @@ -3561,58 +3565,58 @@ "node": ">8.0.0" }, "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-progress": { - "version": "0.3.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.97.tgz", - "integrity": "sha512-bSBb6gBN8Y/RsVMlD1AFCSydqnM9jF0s5USu1Cl3ZJqonC62LnM0BnzBz3LdD21yTLnW38Ogk5//uyA4F5ZNsA==", + "version": "0.3.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.147.tgz", + "integrity": "sha512-e3kylaOvj0CNYMrdQEPKa1J3y14RKMP2hGr0uV4AuUVPtpXjiYgYxwzGJIBMU1Vt9k/Lmjb3Y1+uGcVMwiRqQg==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-search": { - "version": "0.17.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.97.tgz", - "integrity": "sha512-PL2n3OJmlcTTVOm2SAtLuR9XB/qz/Y3TNtq8ST+PzSIfeXepy6VveyimWtCUBYrTamKMTuXWe5A5dopmE15RMQ==", + "version": "0.17.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.147.tgz", + "integrity": "sha512-Ud9LMcbJ/gmhQf7fP7RsjKikO1jMEMjtIOB6u8EUqYASSP2dSbX+nmmJgPHe1RsICgn/yVvYdKFDGjK6vxOW8w==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-serialize": { - "version": "0.15.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.97.tgz", - "integrity": "sha512-FWEEQBNVGWfYaaOrCehB2mrc3ZHw6OtAM6Hw3WY+0BuVnK9k1i5+LG4rHDzSjUFyEHrig9ROdgzhOHWpGnRa0g==", + "version": "0.15.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.147.tgz", + "integrity": "sha512-bPbAAOOlKP5afxwMqG71Cy2lR2dZk3jgZbB4cODdCHmcCiKlj78F0k++EV4Kf5mCife0a3Gq/FeMH8imYKXsJw==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-unicode11": { - "version": "0.10.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.97.tgz", - "integrity": "sha512-Dd/Tei9UOtHR9rMMsy2NQ+9ZHfRE+FRC3qxTMDartpsXRbxtvzb3p4a358ivgwuSNIgCyRAELXzbFcWWDa73Ng==", + "version": "0.10.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.147.tgz", + "integrity": "sha512-UvqSah7amkoEbESIv0A5eS2QF69skN5zEfLNi6sctQC9Rh3ZkzY592IalAL7XDiux+tc819PBITBECCAr6JMog==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-webgl": { - "version": "0.20.0-beta.104", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz", - "integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==", + "version": "0.20.0-beta.146", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.146.tgz", + "integrity": "sha512-ln18gU0T5ifBC6dsGEM27h8plP/X3MC29M3qNGWRqaUVMLo585P4T74zMgIOuyUlVMa29HOa0VZDVjkFpd7iQw==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.105" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/xterm": { - "version": "6.1.0-beta.141", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.141.tgz", - "integrity": "sha512-dwcmHvdFfekzNkb6lirSZnkSET21LKBwlwyRENTsIeU2U+4u0MFztUjO44e+MpDR0y+Mv/eeQza0mvhnkmC1Mg==", + "version": "6.1.0-beta.151", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.151.tgz", + "integrity": "sha512-RQ8FufFqt6kjh99qjly653CVjgAsDu5a8VtEEH3G9xnxGpacA7SQC84SWnIHb+8SVNFJrltZATIVTl41w923Sg==", "license": "MIT", "peer": true, "workspaces": [ @@ -4070,9 +4074,9 @@ } }, "node_modules/esbuild": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", - "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", + "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -4083,32 +4087,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.2", - "@esbuild/android-arm": "0.27.2", - "@esbuild/android-arm64": "0.27.2", - "@esbuild/android-x64": "0.27.2", - "@esbuild/darwin-arm64": "0.27.2", - "@esbuild/darwin-x64": "0.27.2", - "@esbuild/freebsd-arm64": "0.27.2", - "@esbuild/freebsd-x64": "0.27.2", - "@esbuild/linux-arm": "0.27.2", - "@esbuild/linux-arm64": "0.27.2", - "@esbuild/linux-ia32": "0.27.2", - "@esbuild/linux-loong64": "0.27.2", - "@esbuild/linux-mips64el": "0.27.2", - "@esbuild/linux-ppc64": "0.27.2", - "@esbuild/linux-riscv64": "0.27.2", - "@esbuild/linux-s390x": "0.27.2", - "@esbuild/linux-x64": "0.27.2", - "@esbuild/netbsd-arm64": "0.27.2", - "@esbuild/netbsd-x64": "0.27.2", - "@esbuild/openbsd-arm64": "0.27.2", - "@esbuild/openbsd-x64": "0.27.2", - "@esbuild/openharmony-arm64": "0.27.2", - "@esbuild/sunos-x64": "0.27.2", - "@esbuild/win32-arm64": "0.27.2", - "@esbuild/win32-ia32": "0.27.2", - "@esbuild/win32-x64": "0.27.2" + "@esbuild/aix-ppc64": "0.27.3", + "@esbuild/android-arm": "0.27.3", + "@esbuild/android-arm64": "0.27.3", + "@esbuild/android-x64": "0.27.3", + "@esbuild/darwin-arm64": "0.27.3", + "@esbuild/darwin-x64": "0.27.3", + "@esbuild/freebsd-arm64": "0.27.3", + "@esbuild/freebsd-x64": "0.27.3", + "@esbuild/linux-arm": "0.27.3", + "@esbuild/linux-arm64": "0.27.3", + "@esbuild/linux-ia32": "0.27.3", + "@esbuild/linux-loong64": "0.27.3", + "@esbuild/linux-mips64el": "0.27.3", + "@esbuild/linux-ppc64": "0.27.3", + "@esbuild/linux-riscv64": "0.27.3", + "@esbuild/linux-s390x": "0.27.3", + "@esbuild/linux-x64": "0.27.3", + "@esbuild/netbsd-arm64": "0.27.3", + "@esbuild/netbsd-x64": "0.27.3", + "@esbuild/openbsd-arm64": "0.27.3", + "@esbuild/openbsd-x64": "0.27.3", + "@esbuild/openharmony-arm64": "0.27.3", + "@esbuild/sunos-x64": "0.27.3", + "@esbuild/win32-arm64": "0.27.3", + "@esbuild/win32-ia32": "0.27.3", + "@esbuild/win32-x64": "0.27.3" } }, "node_modules/escalade": { @@ -4776,7 +4780,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -4928,6 +4931,7 @@ "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.8" }, diff --git a/demo/package.json b/demo/package.json index 91d0ef9b..8cab812e 100644 --- a/demo/package.json +++ b/demo/package.json @@ -17,21 +17,17 @@ }, "devDependencies": { "@codingame/esbuild-import-meta-url-plugin": "^1.0.3", + "@codingame/monaco-vscode-rollup-extension-directory-plugin": "file:../dist/packages/monaco-vscode-rollup-extension-directory-plugin", + "@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/packages/monaco-vscode-rollup-vsix-plugin", "@types/dockerode": "^4.0.1", "@types/express": "^5.0.6", "@types/node": "^22.19.7", "@types/wicg-file-system-access": "^2023.10.7", "@types/ws": "^8.18.1", "typescript": "~5.9.3", - "vite": "~7.3.1", - "@codingame/monaco-vscode-rollup-extension-directory-plugin": "file:../dist/packages/monaco-vscode-rollup-extension-directory-plugin", - "@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/packages/monaco-vscode-rollup-vsix-plugin" + "vite": "~7.3.1" }, "dependencies": { - "ansi-colors": "^4.1.3", - "dockerode": "^4.0.9", - "express": "^5.2.1", - "ws": "^8.19.0", "@codingame/monaco-vscode-accessibility-service-override": "file:../dist/packages/monaco-vscode-accessibility-service-override", "@codingame/monaco-vscode-ai-service-override": "file:../dist/packages/monaco-vscode-ai-service-override", "@codingame/monaco-vscode-all-default-extensions": "file:../dist/packages/monaco-vscode-all-default-extensions", @@ -60,13 +56,11 @@ "@codingame/monaco-vscode-docker-default-extension": "file:../dist/packages/monaco-vscode-docker-default-extension", "@codingame/monaco-vscode-dotenv-default-extension": "file:../dist/packages/monaco-vscode-dotenv-default-extension", "@codingame/monaco-vscode-edit-sessions-service-override": "file:../dist/packages/monaco-vscode-edit-sessions-service-override", - "monaco-editor": "file:../dist/packages/monaco-vscode-editor-api", "@codingame/monaco-vscode-editor-service-override": "file:../dist/packages/monaco-vscode-editor-service-override", "@codingame/monaco-vscode-emmet-default-extension": "file:../dist/packages/monaco-vscode-emmet-default-extension", "@codingame/monaco-vscode-emmet-service-override": "file:../dist/packages/monaco-vscode-emmet-service-override", "@codingame/monaco-vscode-environment-service-override": "file:../dist/packages/monaco-vscode-environment-service-override", "@codingame/monaco-vscode-explorer-service-override": "file:../dist/packages/monaco-vscode-explorer-service-override", - "vscode": "file:../dist/packages/monaco-vscode-extension-api", "@codingame/monaco-vscode-extension-editing-default-extension": "file:../dist/packages/monaco-vscode-extension-editing-default-extension", "@codingame/monaco-vscode-extension-gallery-service-override": "file:../dist/packages/monaco-vscode-extension-gallery-service-override", "@codingame/monaco-vscode-extensions-service-override": "file:../dist/packages/monaco-vscode-extensions-service-override", @@ -180,6 +174,7 @@ "@codingame/monaco-vscode-terminal-service-override": "file:../dist/packages/monaco-vscode-terminal-service-override", "@codingame/monaco-vscode-testing-service-override": "file:../dist/packages/monaco-vscode-testing-service-override", "@codingame/monaco-vscode-textmate-service-override": "file:../dist/packages/monaco-vscode-textmate-service-override", + "@codingame/monaco-vscode-theme-2026-default-extension": "file:../dist/packages/monaco-vscode-theme-2026-default-extension", "@codingame/monaco-vscode-theme-abyss-default-extension": "file:../dist/packages/monaco-vscode-theme-abyss-default-extension", "@codingame/monaco-vscode-theme-defaults-default-extension": "file:../dist/packages/monaco-vscode-theme-defaults-default-extension", "@codingame/monaco-vscode-theme-kimbie-dark-default-extension": "file:../dist/packages/monaco-vscode-theme-kimbie-dark-default-extension", @@ -213,9 +208,15 @@ "@codingame/monaco-vscode-xml-default-extension": "file:../dist/packages/monaco-vscode-xml-default-extension", "@codingame/monaco-vscode-xterm-addons-common": "file:../dist/packages/monaco-vscode-xterm-addons-common", "@codingame/monaco-vscode-xterm-common": "file:../dist/packages/monaco-vscode-xterm-common", - "@codingame/monaco-vscode-yaml-default-extension": "file:../dist/packages/monaco-vscode-yaml-default-extension" + "@codingame/monaco-vscode-yaml-default-extension": "file:../dist/packages/monaco-vscode-yaml-default-extension", + "ansi-colors": "^4.1.3", + "dockerode": "^4.0.9", + "express": "^5.2.1", + "monaco-editor": "file:../dist/packages/monaco-vscode-editor-api", + "vscode": "file:../dist/packages/monaco-vscode-extension-api", + "ws": "^8.19.0" }, "volta": { "extends": "../package.json" } -} \ No newline at end of file +} diff --git a/demo/src/main.common.ts b/demo/src/main.common.ts index 26ab4db5..a1915e84 100644 --- a/demo/src/main.common.ts +++ b/demo/src/main.common.ts @@ -43,6 +43,7 @@ import '@codingame/monaco-vscode-vb-default-extension' import '@codingame/monaco-vscode-xml-default-extension' import '@codingame/monaco-vscode-yaml-default-extension' import '@codingame/monaco-vscode-theme-defaults-default-extension' +import '@codingame/monaco-vscode-theme-2026-default-extension' import '@codingame/monaco-vscode-theme-seti-default-extension' import '@codingame/monaco-vscode-references-view-default-extension' import '@codingame/monaco-vscode-search-result-default-extension' diff --git a/package-lock.json b/package-lock.json index 3f9858ba..9e0e3183 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,23 +13,22 @@ "@microsoft/1ds-post-js": "^3.2.13", "@rollup/pluginutils": "^5.3.0", "@vscode/iconv-lite-umd": "0.7.1", - "@vscode/proxy-agent": "^0.36.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.13", - "@vscode/spdlog": "^0.15.2", - "@vscode/tree-sitter-wasm": "^0.3.0", + "@vscode/spdlog": "^0.15.7", "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-clipboard": "^0.3.0-beta.91", - "@xterm/addon-image": "^0.10.0-beta.91", - "@xterm/addon-ligatures": "^0.11.0-beta.91", - "@xterm/addon-progress": "^0.3.0-beta.91", - "@xterm/addon-search": "^0.17.0-beta.91", - "@xterm/addon-serialize": "^0.15.0-beta.91", - "@xterm/addon-unicode11": "^0.10.0-beta.91", - "@xterm/addon-webgl": "^0.20.0-beta.101", - "@xterm/headless": "^6.1.0-beta.91", - "@xterm/xterm": "^6.1.0-beta.91", + "@xterm/addon-clipboard": "^0.3.0-beta.109", + "@xterm/addon-image": "^0.10.0-beta.109", + "@xterm/addon-ligatures": "^0.11.0-beta.109", + "@xterm/addon-progress": "^0.3.0-beta.109", + "@xterm/addon-search": "^0.17.0-beta.109", + "@xterm/addon-serialize": "^0.15.0-beta.109", + "@xterm/addon-unicode11": "^0.10.0-beta.109", + "@xterm/addon-webgl": "^0.20.0-beta.108", + "@xterm/headless": "^6.1.0-beta.109", + "@xterm/xterm": "^6.1.0-beta.109", "cookie": "^0.7.2", "css-url-parser": "^1.1.4", "dompurify": "^3.3.1", @@ -41,7 +40,7 @@ "marked": "~14.0.0", "memfs": "^4.56.10", "mime-types": "^3.0.2", - "node-pty": "^1.1.0-beta43", + "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", "thenby": "^1.3.4", "vscode-css-languageservice": "6.2.14", @@ -53,15 +52,15 @@ "yazl": "^2.4.3" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.28.6", - "@babel/preset-env": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", + "@babel/preset-env": "^7.29.0", "@babel/preset-typescript": "^7.28.5", "@codingame/commitlint-config-codingame": "^1.2.1", "@codingame/semantic-release-config-github": "^2.2.1", "@codingame/tsconfig": "^1.2.1", - "@commitlint/cli": "^20.3.1", + "@commitlint/cli": "^20.4.1", "@rollup/plugin-commonjs": "^29.0.0", "@rollup/plugin-dynamic-import-vars": "^2.1.5", "@rollup/plugin-json": "^6.1.0", @@ -74,6 +73,8 @@ "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.35", "@types/yauzl": "^2.10.3", + "@vscode/codicons": "^0.0.44", + "@vscode/tree-sitter-wasm": "^0.3.0", "acorn": "^8.15.0", "chalk": "^5.6.2", "change-case": "^5.4.4", @@ -87,17 +88,17 @@ "postcss-url": "^10.1.3", "prettier": "^3.8.1", "recast": "^0.23.11", - "rollup": "^4.57.0", + "rollup": "^4.57.1", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.3.0", - "semantic-release": "25.0.2", + "semantic-release": "25.0.3", "tsx": "^4.21.0", - "type-fest": "^5.4.2", + "type-fest": "^5.4.3", "typescript": "^5.9.3", "typescript-eslint": "^8.54.0", "vscode-oniguruma": "1.7.0", "vscode-semver": "npm:semver@=5.5.0", - "vscode-textmate": "^9.3.0", + "vscode-textmate": "^9.3.2", "yargs": "^18.0.0", "zx": "^8.8.5" } @@ -155,9 +156,9 @@ "license": "MIT" }, "node_modules/@babel/code-frame": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz", - "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.28.5", @@ -169,30 +170,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.6.tgz", - "integrity": "sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", + "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz", - "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", + "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "peer": true, "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/generator": "^7.28.6", + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-module-transforms": "^7.28.6", "@babel/helpers": "^7.28.6", - "@babel/parser": "^7.28.6", + "@babel/parser": "^7.29.0", "@babel/template": "^7.28.6", - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6", + "@babel/traverse": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -209,13 +210,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz", - "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==", + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", + "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", "dev": true, "dependencies": { - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -293,17 +294,16 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz", - "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz", + "integrity": "sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.27.2", - "@babel/helper-plugin-utils": "^7.27.1", - "debug": "^4.4.1", + "@babel/helper-compilation-targets": "^7.28.6", + "@babel/helper-plugin-utils": "^7.28.6", + "debug": "^4.4.3", "lodash.debounce": "^4.0.8", - "resolve": "^1.22.10" + "resolve": "^1.22.11" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -491,12 +491,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz", - "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", + "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", "dev": true, "dependencies": { - "@babel/types": "^7.28.6" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -607,9 +607,9 @@ } }, "node_modules/@babel/plugin-proposal-decorators": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.6.tgz", - "integrity": "sha512-RVdFPPyY9fCRAX68haPmOk2iyKW8PKJFthmm8NeSI3paNxKWGZIn99+VbIf0FrtCpFnPgnpF/L48tadi617ULg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.29.0.tgz", + "integrity": "sha512-CVBVv3VY/XRMxRYq5dwr2DS7/MvqPm23cOCjbwNnVrfOqcWlnefua1uUs0sjdKOGjvPUG633o07uWzJq4oI6dA==", "dev": true, "dependencies": { "@babel/helper-create-class-features-plugin": "^7.28.6", @@ -747,14 +747,14 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.6.tgz", - "integrity": "sha512-9knsChgsMzBV5Yh3kkhrZNxH3oCYAfMBkNNaVN4cP2RVlFPe8wYdwwcnOsAbkdDoV9UjFtOXWrWB52M8W4jNeA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz", + "integrity": "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-remap-async-to-generator": "^7.27.1", - "@babel/traverse": "^7.28.6" + "@babel/traverse": "^7.29.0" }, "engines": { "node": ">=6.9.0" @@ -928,9 +928,9 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.28.6.tgz", - "integrity": "sha512-5suVoXjC14lUN6ZL9OLKIHCNVWCrqGqlmEp/ixdXjvgnEl/kauLvvMO/Xw9NyMc95Joj1AeLVPVMvibBgSoFlA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.0.tgz", + "integrity": "sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==", "dev": true, "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.28.5", @@ -1137,16 +1137,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz", - "integrity": "sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz", + "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.28.3", - "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-module-transforms": "^7.28.6", + "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.5" + "@babel/traverse": "^7.29.0" }, "engines": { "node": ">=6.9.0" @@ -1173,14 +1172,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz", - "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz", + "integrity": "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.27.1", - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-create-regexp-features-plugin": "^7.28.5", + "@babel/helper-plugin-utils": "^7.28.6" }, "engines": { "node": ">=6.9.0" @@ -1367,9 +1365,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.6.tgz", - "integrity": "sha512-eZhoEZHYQLL5uc1gS5e9/oTknS0sSSAtd5TkKMUp3J+S/CaUjagc0kOUPsEbDmMeva0nC3WWl4SxVY6+OBuxfw==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz", + "integrity": "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" @@ -1579,12 +1577,12 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.6.tgz", - "integrity": "sha512-GaTI4nXDrs7l0qaJ6Rg06dtOXTBCG6TMDB44zbqofCIC4PqC7SEvmFFtpxzCDw9W5aJ7RKVshgXTLvLdBFV/qw==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.0.tgz", + "integrity": "sha512-fNEdfc0yi16lt6IZo2Qxk3knHVdfMYX33czNb4v8yWhemoBhibCpQK/uYHtSKIiO+p/zd3+8fYVXhQdOVV608w==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.28.6", + "@babel/compat-data": "^7.29.0", "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-validator-option": "^7.27.1", @@ -1598,7 +1596,7 @@ "@babel/plugin-syntax-import-attributes": "^7.28.6", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.27.1", - "@babel/plugin-transform-async-generator-functions": "^7.28.6", + "@babel/plugin-transform-async-generator-functions": "^7.29.0", "@babel/plugin-transform-async-to-generator": "^7.28.6", "@babel/plugin-transform-block-scoped-functions": "^7.27.1", "@babel/plugin-transform-block-scoping": "^7.28.6", @@ -1609,7 +1607,7 @@ "@babel/plugin-transform-destructuring": "^7.28.5", "@babel/plugin-transform-dotall-regex": "^7.28.6", "@babel/plugin-transform-duplicate-keys": "^7.27.1", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.28.6", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.0", "@babel/plugin-transform-dynamic-import": "^7.27.1", "@babel/plugin-transform-explicit-resource-management": "^7.28.6", "@babel/plugin-transform-exponentiation-operator": "^7.28.6", @@ -1622,9 +1620,9 @@ "@babel/plugin-transform-member-expression-literals": "^7.27.1", "@babel/plugin-transform-modules-amd": "^7.27.1", "@babel/plugin-transform-modules-commonjs": "^7.28.6", - "@babel/plugin-transform-modules-systemjs": "^7.28.5", + "@babel/plugin-transform-modules-systemjs": "^7.29.0", "@babel/plugin-transform-modules-umd": "^7.27.1", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0", "@babel/plugin-transform-new-target": "^7.27.1", "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6", "@babel/plugin-transform-numeric-separator": "^7.28.6", @@ -1636,7 +1634,7 @@ "@babel/plugin-transform-private-methods": "^7.28.6", "@babel/plugin-transform-private-property-in-object": "^7.28.6", "@babel/plugin-transform-property-literals": "^7.27.1", - "@babel/plugin-transform-regenerator": "^7.28.6", + "@babel/plugin-transform-regenerator": "^7.29.0", "@babel/plugin-transform-regexp-modifiers": "^7.28.6", "@babel/plugin-transform-reserved-words": "^7.27.1", "@babel/plugin-transform-shorthand-properties": "^7.27.1", @@ -1649,10 +1647,10 @@ "@babel/plugin-transform-unicode-regex": "^7.27.1", "@babel/plugin-transform-unicode-sets-regex": "^7.28.6", "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.14", - "babel-plugin-polyfill-corejs3": "^0.13.0", - "babel-plugin-polyfill-regenerator": "^0.6.5", - "core-js-compat": "^3.43.0", + "babel-plugin-polyfill-corejs2": "^0.4.15", + "babel-plugin-polyfill-corejs3": "^0.14.0", + "babel-plugin-polyfill-regenerator": "^0.6.6", + "core-js-compat": "^3.48.0", "semver": "^6.3.1" }, "engines": { @@ -1712,17 +1710,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz", - "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", + "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/generator": "^7.28.6", + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.6", + "@babel/parser": "^7.29.0", "@babel/template": "^7.28.6", - "@babel/types": "^7.28.6", + "@babel/types": "^7.29.0", "debug": "^4.3.1" }, "engines": { @@ -1730,9 +1728,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz", - "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -1791,17 +1789,16 @@ } }, "node_modules/@commitlint/cli": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-20.3.1.tgz", - "integrity": "sha512-NtInjSlyev/+SLPvx/ulz8hRE25Wf5S9dLNDcIwazq0JyB4/w1ROF/5nV0ObPTX8YpRaKYeKtXDYWqumBNHWsw==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-20.4.1.tgz", + "integrity": "sha512-uuFKKpc7OtQM+6SRqT+a4kV818o1pS+uvv/gsRhyX7g4x495jg+Q7P0+O9VNGyLXBYP0syksS7gMRDJKcekr6A==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/format": "^20.3.1", - "@commitlint/lint": "^20.3.1", - "@commitlint/load": "^20.3.1", - "@commitlint/read": "^20.3.1", - "@commitlint/types": "^20.3.1", + "@commitlint/format": "^20.4.0", + "@commitlint/lint": "^20.4.1", + "@commitlint/load": "^20.4.0", + "@commitlint/read": "^20.4.0", + "@commitlint/types": "^20.4.0", "tinyexec": "^1.0.0", "yargs": "^17.0.0" }, @@ -1932,13 +1929,12 @@ } }, "node_modules/@commitlint/config-validator": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-20.3.1.tgz", - "integrity": "sha512-ErVLC/IsHhcvxCyh+FXo7jy12/nkQySjWXYgCoQbZLkFp4hysov8KS6CdxBB0cWjbZWjvNOKBMNoUVqkmGmahw==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-20.4.0.tgz", + "integrity": "sha512-zShmKTF+sqyNOfAE0vKcqnpvVpG0YX8F9G/ZIQHI2CoKyK+PSdladXMSns400aZ5/QZs+0fN75B//3Q5CHw++w==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/types": "^20.3.1", + "@commitlint/types": "^20.4.0", "ajv": "^8.11.0" }, "engines": { @@ -1946,13 +1942,12 @@ } }, "node_modules/@commitlint/ensure": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-20.3.1.tgz", - "integrity": "sha512-h664FngOEd7bHAm0j8MEKq+qm2mH+V+hwJiIE2bWcw3pzJMlO0TPKtk0ATyRAtV6jQw+xviRYiIjjSjfajiB5w==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-20.4.1.tgz", + "integrity": "sha512-WLQqaFx1pBooiVvBrA1YfJNFqZF8wS/YGOtr5RzApDbV9tQ52qT5VkTsY65hFTnXhW8PcDfZLaknfJTmPejmlw==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/types": "^20.3.1", + "@commitlint/types": "^20.4.0", "lodash.camelcase": "^4.3.0", "lodash.kebabcase": "^4.1.1", "lodash.snakecase": "^4.1.1", @@ -1968,33 +1963,30 @@ "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-20.0.0.tgz", "integrity": "sha512-xyCoOShoPuPL44gVa+5EdZsBVao/pNzpQhkzq3RdtlFdKZtjWcLlUFQHSWBuhk5utKYykeJPSz2i8ABHQA+ZZw==", "dev": true, - "license": "MIT", "engines": { "node": ">=v18" } }, "node_modules/@commitlint/format": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-20.3.1.tgz", - "integrity": "sha512-jfsjGPFTd2Yti2YHwUH4SPRPbWKAJAwrfa3eNa9bXEdrXBb9mCwbIrgYX38LdEJK9zLJ3AsLBP4/FLEtxyu2AA==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-20.4.0.tgz", + "integrity": "sha512-i3ki3WR0rgolFVX6r64poBHXM1t8qlFel1G1eCBvVgntE3fCJitmzSvH5JD/KVJN/snz6TfaX2CLdON7+s4WVQ==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/types": "^20.3.1", - "chalk": "^5.3.0" + "@commitlint/types": "^20.4.0", + "picocolors": "^1.1.1" }, "engines": { "node": ">=v18" } }, "node_modules/@commitlint/is-ignored": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-20.3.1.tgz", - "integrity": "sha512-tWwAoh93QvAhxgp99CzCuHD86MgxE4NBtloKX+XxQxhfhSwHo7eloiar/yzx53YW9eqSLP95zgW2KDDk4/WX+A==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-20.4.1.tgz", + "integrity": "sha512-In5EO4JR1lNsAv1oOBBO24V9ND1IqdAJDKZiEpdfjDl2HMasAcT7oA+5BKONv1pRoLG380DGPE2W2RIcUwdgLA==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/types": "^20.3.1", + "@commitlint/types": "^20.4.0", "semver": "^7.6.0" }, "engines": { @@ -2002,11 +1994,10 @@ } }, "node_modules/@commitlint/is-ignored/node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -2015,77 +2006,71 @@ } }, "node_modules/@commitlint/lint": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-20.3.1.tgz", - "integrity": "sha512-LaOtrQ24+6SfUaWg8A+a+Wc77bvLbO5RIr6iy9F7CI3/0iq1uPEWgGRCwqWTuLGHkZDAcwaq0gZ01zpwZ1jCGw==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-20.4.1.tgz", + "integrity": "sha512-g94LrGl/c6UhuhDQqNqU232aslLEN2vzc7MPfQTHzwzM4GHNnEAwVWWnh0zX8S5YXecuLXDwbCsoGwmpAgPWKA==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/is-ignored": "^20.3.1", - "@commitlint/parse": "^20.3.1", - "@commitlint/rules": "^20.3.1", - "@commitlint/types": "^20.3.1" + "@commitlint/is-ignored": "^20.4.1", + "@commitlint/parse": "^20.4.1", + "@commitlint/rules": "^20.4.1", + "@commitlint/types": "^20.4.0" }, "engines": { "node": ">=v18" } }, "node_modules/@commitlint/load": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-20.3.1.tgz", - "integrity": "sha512-YDD9XA2XhgYgbjju8itZ/weIvOOobApDqwlPYCX5NLO/cPtw2UMO5Cmn44Ks8RQULUVI5fUT6roKvyxcoLbNmw==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-20.4.0.tgz", + "integrity": "sha512-Dauup/GfjwffBXRJUdlX/YRKfSVXsXZLnINXKz0VZkXdKDcaEILAi9oflHGbfydonJnJAbXEbF3nXPm9rm3G6A==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/config-validator": "^20.3.1", + "@commitlint/config-validator": "^20.4.0", "@commitlint/execute-rule": "^20.0.0", - "@commitlint/resolve-extends": "^20.3.1", - "@commitlint/types": "^20.3.1", - "chalk": "^5.3.0", + "@commitlint/resolve-extends": "^20.4.0", + "@commitlint/types": "^20.4.0", "cosmiconfig": "^9.0.0", "cosmiconfig-typescript-loader": "^6.1.0", - "lodash.isplainobject": "^4.0.6", - "lodash.merge": "^4.6.2", - "lodash.uniq": "^4.5.0" + "is-plain-obj": "^4.1.0", + "lodash.mergewith": "^4.6.2", + "picocolors": "^1.1.1" }, "engines": { "node": ">=v18" } }, "node_modules/@commitlint/message": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-20.0.0.tgz", - "integrity": "sha512-gLX4YmKnZqSwkmSB9OckQUrI5VyXEYiv3J5JKZRxIp8jOQsWjZgHSG/OgEfMQBK9ibdclEdAyIPYggwXoFGXjQ==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-20.4.0.tgz", + "integrity": "sha512-B5lGtvHgiLAIsK5nLINzVW0bN5hXv+EW35sKhYHE8F7V9Uz1fR4tx3wt7mobA5UNhZKUNgB/+ldVMQE6IHZRyA==", "dev": true, - "license": "MIT", "engines": { "node": ">=v18" } }, "node_modules/@commitlint/parse": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-20.3.1.tgz", - "integrity": "sha512-TuUTdbLpyUNLgDzLDYlI2BeTE6V/COZbf3f8WwsV0K6eq/2nSpNTMw7wHtXb+YxeY9wwxBp/Ldad4P+YIxHJoA==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-20.4.1.tgz", + "integrity": "sha512-XNtZjeRcFuAfUnhYrCY02+mpxwY4OmnvD3ETbVPs25xJFFz1nRo/25nHj+5eM+zTeRFvWFwD4GXWU2JEtoK1/w==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/types": "^20.3.1", - "conventional-changelog-angular": "^7.0.0", - "conventional-commits-parser": "^5.0.0" + "@commitlint/types": "^20.4.0", + "conventional-changelog-angular": "^8.1.0", + "conventional-commits-parser": "^6.2.1" }, "engines": { "node": ">=v18" } }, "node_modules/@commitlint/read": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-20.3.1.tgz", - "integrity": "sha512-nCmJAdIg3OdNVUpQW0Idk/eF/vfOo2W2xzmvRmNeptLrzFK7qhwwl/kIwy1Q1LZrKHUFNj7PGNpIT5INbgZWzA==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-20.4.0.tgz", + "integrity": "sha512-QfpFn6/I240ySEGv7YWqho4vxqtPpx40FS7kZZDjUJ+eHxu3azfhy7fFb5XzfTqVNp1hNoI3tEmiEPbDB44+cg==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/top-level": "^20.0.0", - "@commitlint/types": "^20.3.1", + "@commitlint/top-level": "^20.4.0", + "@commitlint/types": "^20.4.0", "git-raw-commits": "^4.0.0", "minimist": "^1.2.8", "tinyexec": "^1.0.0" @@ -2095,14 +2080,13 @@ } }, "node_modules/@commitlint/resolve-extends": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-20.3.1.tgz", - "integrity": "sha512-iGTGeyaoDyHDEZNjD8rKeosjSNs8zYanmuowY4ful7kFI0dnY4b5QilVYaFQJ6IM27S57LAeH5sKSsOHy4bw5w==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-20.4.0.tgz", + "integrity": "sha512-ay1KM8q0t+/OnlpqXJ+7gEFQNlUtSU5Gxr8GEwnVf2TPN3+ywc5DzL3JCxmpucqxfHBTFwfRMXxPRRnR5Ki20g==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/config-validator": "^20.3.1", - "@commitlint/types": "^20.3.1", + "@commitlint/config-validator": "^20.4.0", + "@commitlint/types": "^20.4.0", "global-directory": "^4.0.1", "import-meta-resolve": "^4.0.0", "lodash.mergewith": "^4.6.2", @@ -2113,16 +2097,15 @@ } }, "node_modules/@commitlint/rules": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-20.3.1.tgz", - "integrity": "sha512-/uic4P+4jVNpqQxz02+Y6vvIC0A2J899DBztA1j6q3f3MOKwydlNrojSh0dQmGDxxT1bXByiRtDhgFnOFnM6Pg==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-20.4.1.tgz", + "integrity": "sha512-WtqypKEPbQEuJwJS4aKs0OoJRBKz1HXPBC9wRtzVNH68FLhPWzxXlF09hpUXM9zdYTpm4vAdoTGkWiBgQ/vL0g==", "dev": true, - "license": "MIT", "dependencies": { - "@commitlint/ensure": "^20.3.1", - "@commitlint/message": "^20.0.0", + "@commitlint/ensure": "^20.4.1", + "@commitlint/message": "^20.4.0", "@commitlint/to-lines": "^20.0.0", - "@commitlint/types": "^20.3.1" + "@commitlint/types": "^20.4.0" }, "engines": { "node": ">=v18" @@ -2133,33 +2116,30 @@ "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-20.0.0.tgz", "integrity": "sha512-2l9gmwiCRqZNWgV+pX1X7z4yP0b3ex/86UmUFgoRt672Ez6cAM2lOQeHFRUTuE6sPpi8XBCGnd8Kh3bMoyHwJw==", "dev": true, - "license": "MIT", "engines": { "node": ">=v18" } }, "node_modules/@commitlint/top-level": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-20.0.0.tgz", - "integrity": "sha512-drXaPSP2EcopukrUXvUXmsQMu3Ey/FuJDc/5oiW4heoCfoE5BdLQyuc7veGeE3aoQaTVqZnh4D5WTWe2vefYKg==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-20.4.0.tgz", + "integrity": "sha512-NDzq8Q6jmFaIIBC/GG6n1OQEaHdmaAAYdrZRlMgW6glYWGZ+IeuXmiymDvQNXPc82mVxq2KiE3RVpcs+1OeDeA==", "dev": true, - "license": "MIT", "dependencies": { - "find-up": "^7.0.0" + "escalade": "^3.2.0" }, "engines": { "node": ">=v18" } }, "node_modules/@commitlint/types": { - "version": "20.3.1", - "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-20.3.1.tgz", - "integrity": "sha512-VmIFV/JkBRhDRRv7N5B7zEUkNZIx9Mp+8Pe65erz0rKycXLsi8Epcw0XJ+btSeRXgTzE7DyOyA9bkJ9mn/yqVQ==", + "version": "20.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-20.4.0.tgz", + "integrity": "sha512-aO5l99BQJ0X34ft8b0h7QFkQlqxC6e7ZPVmBKz13xM9O8obDaM1Cld4sQlJDXXU/VFuUzQ30mVtHjVz74TuStw==", "dev": true, - "license": "MIT", "dependencies": { - "@types/conventional-commits-parser": "^5.0.0", - "chalk": "^5.3.0" + "conventional-commits-parser": "^6.2.1", + "picocolors": "^1.1.1" }, "engines": { "node": ">=v18" @@ -3723,9 +3703,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.0.tgz", - "integrity": "sha512-tPgXB6cDTndIe1ah7u6amCI1T0SsnlOuKgg10Xh3uizJk4e5M1JGaUMk7J4ciuAUcFpbOiNhm2XIjP9ON0dUqA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz", + "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==", "cpu": [ "arm" ], @@ -3736,9 +3716,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.0.tgz", - "integrity": "sha512-sa4LyseLLXr1onr97StkU1Nb7fWcg6niokTwEVNOO7awaKaoRObQ54+V/hrF/BP1noMEaaAW6Fg2d/CfLiq3Mg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz", + "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==", "cpu": [ "arm64" ], @@ -3749,9 +3729,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.0.tgz", - "integrity": "sha512-/NNIj9A7yLjKdmkx5dC2XQ9DmjIECpGpwHoGmA5E1AhU0fuICSqSWScPhN1yLCkEdkCwJIDu2xIeLPs60MNIVg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz", + "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==", "cpu": [ "arm64" ], @@ -3762,9 +3742,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.0.tgz", - "integrity": "sha512-xoh8abqgPrPYPr7pTYipqnUi1V3em56JzE/HgDgitTqZBZ3yKCWI+7KUkceM6tNweyUKYru1UMi7FC060RyKwA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz", + "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==", "cpu": [ "x64" ], @@ -3775,9 +3755,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.0.tgz", - "integrity": "sha512-PCkMh7fNahWSbA0OTUQ2OpYHpjZZr0hPr8lId8twD7a7SeWrvT3xJVyza+dQwXSSq4yEQTMoXgNOfMCsn8584g==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz", + "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==", "cpu": [ "arm64" ], @@ -3788,9 +3768,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.0.tgz", - "integrity": "sha512-1j3stGx+qbhXql4OCDZhnK7b01s6rBKNybfsX+TNrEe9JNq4DLi1yGiR1xW+nL+FNVvI4D02PUnl6gJ/2y6WJA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz", + "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==", "cpu": [ "x64" ], @@ -3801,9 +3781,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.0.tgz", - "integrity": "sha512-eyrr5W08Ms9uM0mLcKfM/Uzx7hjhz2bcjv8P2uynfj0yU8GGPdz8iYrBPhiLOZqahoAMB8ZiolRZPbbU2MAi6Q==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz", + "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==", "cpu": [ "arm" ], @@ -3814,9 +3794,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.0.tgz", - "integrity": "sha512-Xds90ITXJCNyX9pDhqf85MKWUI4lqjiPAipJ8OLp8xqI2Ehk+TCVhF9rvOoN8xTbcafow3QOThkNnrM33uCFQA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz", + "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==", "cpu": [ "arm" ], @@ -3827,9 +3807,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.0.tgz", - "integrity": "sha512-Xws2KA4CLvZmXjy46SQaXSejuKPhwVdaNinldoYfqruZBaJHqVo6hnRa8SDo9z7PBW5x84SH64+izmldCgbezw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz", + "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==", "cpu": [ "arm64" ], @@ -3840,9 +3820,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.0.tgz", - "integrity": "sha512-hrKXKbX5FdaRJj7lTMusmvKbhMJSGWJ+w++4KmjiDhpTgNlhYobMvKfDoIWecy4O60K6yA4SnztGuNTQF+Lplw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz", + "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==", "cpu": [ "arm64" ], @@ -3853,9 +3833,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.0.tgz", - "integrity": "sha512-6A+nccfSDGKsPm00d3xKcrsBcbqzCTAukjwWK6rbuAnB2bHaL3r9720HBVZ/no7+FhZLz/U3GwwZZEh6tOSI8Q==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz", + "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==", "cpu": [ "loong64" ], @@ -3866,9 +3846,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.0.tgz", - "integrity": "sha512-4P1VyYUe6XAJtQH1Hh99THxr0GKMMwIXsRNOceLrJnaHTDgk1FTcTimDgneRJPvB3LqDQxUmroBclQ1S0cIJwQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz", + "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==", "cpu": [ "loong64" ], @@ -3879,9 +3859,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.0.tgz", - "integrity": "sha512-8Vv6pLuIZCMcgXre6c3nOPhE0gjz1+nZP6T+hwWjr7sVH8k0jRkH+XnfjjOTglyMBdSKBPPz54/y1gToSKwrSQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz", + "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==", "cpu": [ "ppc64" ], @@ -3892,9 +3872,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.0.tgz", - "integrity": "sha512-r1te1M0Sm2TBVD/RxBPC6RZVwNqUTwJTA7w+C/IW5v9Ssu6xmxWEi+iJQlpBhtUiT1raJ5b48pI8tBvEjEFnFA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz", + "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==", "cpu": [ "ppc64" ], @@ -3905,9 +3885,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.0.tgz", - "integrity": "sha512-say0uMU/RaPm3CDQLxUUTF2oNWL8ysvHkAjcCzV2znxBr23kFfaxocS9qJm+NdkRhF8wtdEEAJuYcLPhSPbjuQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz", + "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==", "cpu": [ "riscv64" ], @@ -3918,9 +3898,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.0.tgz", - "integrity": "sha512-/MU7/HizQGsnBREtRpcSbSV1zfkoxSTR7wLsRmBPQ8FwUj5sykrP1MyJTvsxP5KBq9SyE6kH8UQQQwa0ASeoQQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz", + "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==", "cpu": [ "riscv64" ], @@ -3931,9 +3911,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.0.tgz", - "integrity": "sha512-Q9eh+gUGILIHEaJf66aF6a414jQbDnn29zeu0eX3dHMuysnhTvsUvZTCAyZ6tJhUjnvzBKE4FtuaYxutxRZpOg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz", + "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==", "cpu": [ "s390x" ], @@ -3944,9 +3924,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.0.tgz", - "integrity": "sha512-OR5p5yG5OKSxHReWmwvM0P+VTPMwoBS45PXTMYaskKQqybkS3Kmugq1W+YbNWArF8/s7jQScgzXUhArzEQ7x0A==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz", + "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==", "cpu": [ "x64" ], @@ -3957,9 +3937,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.0.tgz", - "integrity": "sha512-XeatKzo4lHDsVEbm1XDHZlhYZZSQYym6dg2X/Ko0kSFgio+KXLsxwJQprnR48GvdIKDOpqWqssC3iBCjoMcMpw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz", + "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==", "cpu": [ "x64" ], @@ -3970,9 +3950,9 @@ ] }, "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.0.tgz", - "integrity": "sha512-Lu71y78F5qOfYmubYLHPcJm74GZLU6UJ4THkf/a1K7Tz2ycwC2VUbsqbJAXaR6Bx70SRdlVrt2+n5l7F0agTUw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz", + "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==", "cpu": [ "x64" ], @@ -3983,9 +3963,9 @@ ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.0.tgz", - "integrity": "sha512-v5xwKDWcu7qhAEcsUubiav7r+48Uk/ENWdr82MBZZRIm7zThSxCIVDfb3ZeRRq9yqk+oIzMdDo6fCcA5DHfMyA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz", + "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==", "cpu": [ "arm64" ], @@ -3996,9 +3976,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.0.tgz", - "integrity": "sha512-XnaaaSMGSI6Wk8F4KK3QP7GfuuhjGchElsVerCplUuxRIzdvZ7hRBpLR0omCmw+kI2RFJB80nenhOoGXlJ5TfQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz", + "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==", "cpu": [ "arm64" ], @@ -4009,9 +3989,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.0.tgz", - "integrity": "sha512-3K1lP+3BXY4t4VihLw5MEg6IZD3ojSYzqzBG571W3kNQe4G4CcFpSUQVgurYgib5d+YaCjeFow8QivWp8vuSvA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz", + "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==", "cpu": [ "ia32" ], @@ -4022,9 +4002,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.0.tgz", - "integrity": "sha512-MDk610P/vJGc5L5ImE4k5s+GZT3en0KoK1MKPXCRgzmksAMk79j4h3k1IerxTNqwDLxsGxStEZVBqG0gIqZqoA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz", + "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==", "cpu": [ "x64" ], @@ -4035,9 +4015,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.0.tgz", - "integrity": "sha512-Zv7v6q6aV+VslnpwzqKAmrk5JdVkLUzok2208ZXGipjb+msxBr/fJPZyeEXiFgH7k62Ak0SLIfxQRZQvTuf7rQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz", + "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==", "cpu": [ "x64" ], @@ -4077,35 +4057,6 @@ "semantic-release": ">=20.1.0" } }, - "node_modules/@semantic-release/commit-analyzer/node_modules/conventional-changelog-angular": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.1.0.tgz", - "integrity": "sha512-GGf2Nipn1RUCAktxuVauVr1e3r8QrLP/B0lEUsFktmGqc3ddbQkhoJZHJctVU829U1c6mTSWftrVOCHaL85Q3w==", - "dev": true, - "license": "ISC", - "dependencies": { - "compare-func": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@semantic-release/commit-analyzer/node_modules/conventional-commits-parser": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.2.1.tgz", - "integrity": "sha512-20pyHgnO40rvfI0NGF/xiEoFMkXDtkF8FwHvk5BokoFoCuTQRI8vrNCNFWUOfuolKJMm1tPCHc8GgYEtr1XRNA==", - "dev": true, - "license": "MIT", - "dependencies": { - "meow": "^13.0.0" - }, - "bin": { - "conventional-commits-parser": "dist/cli/index.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@semantic-release/error": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@semantic-release/error/-/error-4.0.0.tgz", @@ -4216,35 +4167,6 @@ "semantic-release": ">=20.1.0" } }, - "node_modules/@semantic-release/release-notes-generator/node_modules/conventional-changelog-angular": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.1.0.tgz", - "integrity": "sha512-GGf2Nipn1RUCAktxuVauVr1e3r8QrLP/B0lEUsFktmGqc3ddbQkhoJZHJctVU829U1c6mTSWftrVOCHaL85Q3w==", - "dev": true, - "license": "ISC", - "dependencies": { - "compare-func": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@semantic-release/release-notes-generator/node_modules/conventional-commits-parser": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.2.1.tgz", - "integrity": "sha512-20pyHgnO40rvfI0NGF/xiEoFMkXDtkF8FwHvk5BokoFoCuTQRI8vrNCNFWUOfuolKJMm1tPCHc8GgYEtr1XRNA==", - "dev": true, - "license": "MIT", - "dependencies": { - "meow": "^13.0.0" - }, - "bin": { - "conventional-commits-parser": "dist/cli/index.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@sindresorhus/is": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", @@ -4672,6 +4594,13 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@vscode/codicons": { + "version": "0.0.44", + "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.44.tgz", + "integrity": "sha512-F7qPRumUK3EHjNdopfICLGRf3iNPoZQt+McTHAn4AlOWPB3W2kL4H0S7uqEqbyZ6rCxaeDjpAn3MCUnwTu/VJQ==", + "dev": true, + "license": "CC-BY-4.0" + }, "node_modules/@vscode/iconv-lite-umd": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.1.tgz", @@ -4685,9 +4614,9 @@ "license": "MIT" }, "node_modules/@vscode/proxy-agent": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.36.0.tgz", - "integrity": "sha512-W4mls/+zErqTYcKC41utdmoYnBWZRH1dRF9U4cBAyKU5EhcnWfVsPBvUnXXw1CffI3djmMWnu9JrF/Ynw7lkcg==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz", + "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -4728,9 +4657,9 @@ } }, "node_modules/@vscode/spdlog": { - "version": "0.15.4", - "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.4.tgz", - "integrity": "sha512-NmFasVWjn/6BjHMAjqalsbG2srQCt8yfC0EczP5wzNQFawv74rhvuarhWi44x3St9LB8bZBxrpbT7igPaTJwcw==", + "version": "0.15.7", + "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.7.tgz", + "integrity": "sha512-xpHAtw0IESD6wmjqLr6LbpYAmr8ZYm8AT7hGE7oM7AojNeOBngXLOqmzpXbTNTAvXBq1KHy8PwbMmY24uYR/oQ==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -4743,6 +4672,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.3.0.tgz", "integrity": "sha512-4kjB1jgLyG9VimGfyJb1F8/GFdrx55atsBCH/9r2D/iZHAUDCvZ5zhWXB7sRQ2z2WkkuNYm/0pgQtUm1jhdf7A==", + "dev": true, "license": "MIT" }, "node_modules/@vscode/vscode-languagedetection": { @@ -4797,30 +4727,30 @@ "license": "MIT" }, "node_modules/@xterm/addon-clipboard": { - "version": "0.3.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.97.tgz", - "integrity": "sha512-8+1tM4WD1MnQccYc/+Kbo+OeptIEf0rn5az6AUw+lnNHPlJa71Xj8KQNBM5f8sns7uoFZzBxpse8SOTttVefBw==", + "version": "0.3.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.147.tgz", + "integrity": "sha512-U5HHcl/XiYpafV+Pajvt8jpVoC4g3EFUtav1WElCC0XzFkwcSqZvT5/4aJDdnCd208CXOuliY72//GD0XC5lcw==", "license": "MIT", "dependencies": { "js-base64": "^3.7.5" }, "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-image": { - "version": "0.10.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.97.tgz", - "integrity": "sha512-O5P/QFVAQRuZ8sKj2dT6sTyHz/l98g+1tKKqDRZYVAobL6elbAMsh3UL/eQBWfDrBfD23XZ93UcgOFCF62YXuQ==", + "version": "0.10.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.147.tgz", + "integrity": "sha512-BPPxxfbLT5XTSYzxoYScjRKfb3QacixurvXGLPXwGrGplUm+m9569NULPr2vxWnsdsyrSrpDj6Qnvb7FtJHWWg==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-ligatures": { - "version": "0.11.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.97.tgz", - "integrity": "sha512-r2WX1JHJBO9tiVzjnHVjD38IOMQI5m7mzZt+2cDAwJTDoFJO6WktxUxX8QV90mCbXLFS6jwX+6G2tzSPKLFsNg==", + "version": "0.11.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.147.tgz", + "integrity": "sha512-QR4yuF2sgFfXv8hddBc9HfYFYjAErAVi3kk4zPbkZVyzXvlQjSH6v+8wF0q7wDM3o/Elty56QQl2TvA0OrNoDw==", "license": "MIT", "dependencies": { "lru-cache": "^6.0.0", @@ -4830,7 +4760,7 @@ "node": ">8.0.0" }, "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-ligatures/node_modules/lru-cache": { @@ -4852,63 +4782,63 @@ "license": "ISC" }, "node_modules/@xterm/addon-progress": { - "version": "0.3.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.97.tgz", - "integrity": "sha512-bSBb6gBN8Y/RsVMlD1AFCSydqnM9jF0s5USu1Cl3ZJqonC62LnM0BnzBz3LdD21yTLnW38Ogk5//uyA4F5ZNsA==", + "version": "0.3.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.147.tgz", + "integrity": "sha512-e3kylaOvj0CNYMrdQEPKa1J3y14RKMP2hGr0uV4AuUVPtpXjiYgYxwzGJIBMU1Vt9k/Lmjb3Y1+uGcVMwiRqQg==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-search": { - "version": "0.17.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.97.tgz", - "integrity": "sha512-PL2n3OJmlcTTVOm2SAtLuR9XB/qz/Y3TNtq8ST+PzSIfeXepy6VveyimWtCUBYrTamKMTuXWe5A5dopmE15RMQ==", + "version": "0.17.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.147.tgz", + "integrity": "sha512-Ud9LMcbJ/gmhQf7fP7RsjKikO1jMEMjtIOB6u8EUqYASSP2dSbX+nmmJgPHe1RsICgn/yVvYdKFDGjK6vxOW8w==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-serialize": { - "version": "0.15.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.97.tgz", - "integrity": "sha512-FWEEQBNVGWfYaaOrCehB2mrc3ZHw6OtAM6Hw3WY+0BuVnK9k1i5+LG4rHDzSjUFyEHrig9ROdgzhOHWpGnRa0g==", + "version": "0.15.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.147.tgz", + "integrity": "sha512-bPbAAOOlKP5afxwMqG71Cy2lR2dZk3jgZbB4cODdCHmcCiKlj78F0k++EV4Kf5mCife0a3Gq/FeMH8imYKXsJw==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-unicode11": { - "version": "0.10.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.97.tgz", - "integrity": "sha512-Dd/Tei9UOtHR9rMMsy2NQ+9ZHfRE+FRC3qxTMDartpsXRbxtvzb3p4a358ivgwuSNIgCyRAELXzbFcWWDa73Ng==", + "version": "0.10.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.147.tgz", + "integrity": "sha512-UvqSah7amkoEbESIv0A5eS2QF69skN5zEfLNi6sctQC9Rh3ZkzY592IalAL7XDiux+tc819PBITBECCAr6JMog==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/addon-webgl": { - "version": "0.20.0-beta.104", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz", - "integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==", + "version": "0.20.0-beta.146", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.146.tgz", + "integrity": "sha512-ln18gU0T5ifBC6dsGEM27h8plP/X3MC29M3qNGWRqaUVMLo585P4T74zMgIOuyUlVMa29HOa0VZDVjkFpd7iQw==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.105" + "@xterm/xterm": "^6.1.0-beta.147" } }, "node_modules/@xterm/headless": { - "version": "6.1.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.97.tgz", - "integrity": "sha512-eozAhAozrCL7u0oAa62uahVm+ES7sVSMITXqLmB+P4jnXRZ8FnxqLg2Tx0Xm8xDcU2Q0R7Wqna53OkWAx9wp/g==", + "version": "6.1.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.147.tgz", + "integrity": "sha512-5tW6N8iiK4q9MJTP5zpeunU/tTiygdNUN7uEFhoIfInjcVi0qH1u9cmCZlDvAEUcAJT9HbNIexAAigUP2i+7jQ==", "license": "MIT", "workspaces": [ "addons/*" ] }, "node_modules/@xterm/xterm": { - "version": "6.1.0-beta.97", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.97.tgz", - "integrity": "sha512-YEn7p+wS2qQ1dyvIXHxmjxmVc/Y1Xv+gZNHayJMAH4FdoxP9CCrhsvpNjBwSynft5t0BWD7FqqsNXNei01oxKw==", + "version": "6.1.0-beta.147", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.147.tgz", + "integrity": "sha512-3Q0NJFkde5wqtDSaFOAk2t1GVHbUkCEgDRdKT7dc3TylwxyGuKNzSkVYjH/tEGcb2BLa3wFVimAHQQp6KSCt9Q==", "license": "MIT", "peer": true, "workspaces": [ @@ -4977,7 +4907,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -5093,14 +5022,13 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz", - "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz", + "integrity": "sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.27.7", - "@babel/helper-define-polyfill-provider": "^0.6.5", + "@babel/compat-data": "^7.28.6", + "@babel/helper-define-polyfill-provider": "^0.6.6", "semver": "^6.3.1" }, "peerDependencies": { @@ -5108,27 +5036,25 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz", - "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.0.tgz", + "integrity": "sha512-AvDcMxJ34W4Wgy4KBIIePQTAOP1Ie2WFwkQp3dB7FQ/f0lI5+nM96zUnYEOE1P9sEg0es5VCP0HxiWu5fUHZAQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.5", - "core-js-compat": "^3.43.0" + "@babel/helper-define-polyfill-provider": "^0.6.6", + "core-js-compat": "^3.48.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz", - "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz", + "integrity": "sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.5" + "@babel/helper-define-polyfill-provider": "^0.6.6" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -5736,16 +5662,15 @@ "license": "ISC" }, "node_modules/conventional-changelog-angular": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", - "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.1.0.tgz", + "integrity": "sha512-GGf2Nipn1RUCAktxuVauVr1e3r8QrLP/B0lEUsFktmGqc3ddbQkhoJZHJctVU829U1c6mTSWftrVOCHaL85Q3w==", "dev": true, - "license": "ISC", "dependencies": { "compare-func": "^2.0.0" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/conventional-changelog-conventionalcommits": { @@ -5804,35 +5729,18 @@ } }, "node_modules/conventional-commits-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz", - "integrity": "sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.2.1.tgz", + "integrity": "sha512-20pyHgnO40rvfI0NGF/xiEoFMkXDtkF8FwHvk5BokoFoCuTQRI8vrNCNFWUOfuolKJMm1tPCHc8GgYEtr1XRNA==", "dev": true, - "license": "MIT", "dependencies": { - "is-text-path": "^2.0.0", - "JSONStream": "^1.3.5", - "meow": "^12.0.1", - "split2": "^4.0.0" + "meow": "^13.0.0" }, "bin": { - "conventional-commits-parser": "cli.mjs" + "conventional-commits-parser": "dist/cli/index.js" }, "engines": { - "node": ">=16" - } - }, - "node_modules/conventional-commits-parser/node_modules/meow": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", - "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16.10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=18" } }, "node_modules/convert-hrtime": { @@ -5865,13 +5773,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.47.0.tgz", - "integrity": "sha512-IGfuznZ/n7Kp9+nypamBhvwdwLsW6KC8IOaURw2doAK5e98AG3acVLdh0woOnEqCfUtS+Vu882JE4k/DAm3ItQ==", + "version": "3.48.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.48.0.tgz", + "integrity": "sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==", "dev": true, - "license": "MIT", "dependencies": { - "browserslist": "^4.28.0" + "browserslist": "^4.28.1" }, "funding": { "type": "opencollective", @@ -5918,7 +5825,6 @@ "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.2.0.tgz", "integrity": "sha512-GEN39v7TgdxgIoNcdkRE3uiAzQt3UXLyHbRHD6YoL048XAeOomyxaP+Hh/+2C6C2wYjxJ2onhJcsQp+L4YEkVQ==", "dev": true, - "license": "MIT", "dependencies": { "jiti": "^2.6.1" }, @@ -5993,7 +5899,6 @@ "resolved": "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz", "integrity": "sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -6891,8 +6796,7 @@ "type": "opencollective", "url": "https://opencollective.com/fastify" } - ], - "license": "BSD-3-Clause" + ] }, "node_modules/fastq": { "version": "1.20.1", @@ -6979,24 +6883,6 @@ "node": ">=8" } }, - "node_modules/find-up": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz", - "integrity": "sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^7.2.0", - "path-exists": "^5.0.0", - "unicorn-magic": "^0.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/find-up-simple": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz", @@ -7263,7 +7149,6 @@ "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz", "integrity": "sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==", "dev": true, - "license": "MIT", "dependencies": { "dargs": "^8.0.0", "meow": "^12.0.1", @@ -7281,7 +7166,6 @@ "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.10" }, @@ -7351,7 +7235,6 @@ "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz", "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==", "dev": true, - "license": "MIT", "dependencies": { "ini": "4.1.1" }, @@ -7728,7 +7611,6 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true, - "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -7904,19 +7786,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-text-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz", - "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "text-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/is-unicode-supported": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", @@ -8092,8 +7961,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/json-stable-stringify": { "version": "1.3.0", @@ -8164,33 +8032,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true, - "engines": [ - "node >= 0.2.0" - ], - "license": "MIT" - }, - "node_modules/JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "license": "(MIT OR Apache-2.0)", - "dependencies": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - }, - "bin": { - "JSONStream": "bin.js" - }, - "engines": { - "node": "*" - } - }, "node_modules/katex": { "version": "0.16.27", "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.27.tgz", @@ -8329,22 +8170,6 @@ "node": ">=4" } }, - "node_modules/locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^6.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/lodash-es": { "version": "4.17.22", "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.22.tgz", @@ -8356,8 +8181,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lodash.capitalize": { "version": "4.2.1", @@ -8370,8 +8194,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lodash.escaperegexp": { "version": "4.1.2", @@ -8398,8 +8221,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lodash.merge": { "version": "4.6.2", @@ -8412,29 +8234,19 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lodash.snakecase": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lodash.startcase": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz", "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lodash.uniqby": { "version": "4.7.0", @@ -8447,8 +8259,7 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz", "integrity": "sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lru-cache": { "version": "5.1.1", @@ -8867,9 +8678,9 @@ } }, "node_modules/node-pty": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0.tgz", - "integrity": "sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==", + "version": "1.2.0-beta.10", + "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.10.tgz", + "integrity": "sha512-vONwSCtAiOVNxeaP/lzDdRw733Q6uB/ELOCFM8DUfKMw6rTFovwFCuvqr9usya7JXV2pfaers3EwuzZfv0QtwA==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -11253,38 +11064,6 @@ "node": ">=8" } }, - "node_modules/p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-map": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", @@ -11526,16 +11305,6 @@ "node": ">=10" } }, - "node_modules/path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -12251,7 +12020,6 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -12309,9 +12077,9 @@ } }, "node_modules/rollup": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.0.tgz", - "integrity": "sha512-e5lPJi/aui4TO1LpAXIRLySmwXSE8k3b9zoGfd42p67wzxog4WHjiZF3M2uheQih4DGyc25QEV4yRBbpueNiUA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz", + "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==", "devOptional": true, "peer": true, "dependencies": { @@ -12325,31 +12093,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.57.0", - "@rollup/rollup-android-arm64": "4.57.0", - "@rollup/rollup-darwin-arm64": "4.57.0", - "@rollup/rollup-darwin-x64": "4.57.0", - "@rollup/rollup-freebsd-arm64": "4.57.0", - "@rollup/rollup-freebsd-x64": "4.57.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.57.0", - "@rollup/rollup-linux-arm-musleabihf": "4.57.0", - "@rollup/rollup-linux-arm64-gnu": "4.57.0", - "@rollup/rollup-linux-arm64-musl": "4.57.0", - "@rollup/rollup-linux-loong64-gnu": "4.57.0", - "@rollup/rollup-linux-loong64-musl": "4.57.0", - "@rollup/rollup-linux-ppc64-gnu": "4.57.0", - "@rollup/rollup-linux-ppc64-musl": "4.57.0", - "@rollup/rollup-linux-riscv64-gnu": "4.57.0", - "@rollup/rollup-linux-riscv64-musl": "4.57.0", - "@rollup/rollup-linux-s390x-gnu": "4.57.0", - "@rollup/rollup-linux-x64-gnu": "4.57.0", - "@rollup/rollup-linux-x64-musl": "4.57.0", - "@rollup/rollup-openbsd-x64": "4.57.0", - "@rollup/rollup-openharmony-arm64": "4.57.0", - "@rollup/rollup-win32-arm64-msvc": "4.57.0", - "@rollup/rollup-win32-ia32-msvc": "4.57.0", - "@rollup/rollup-win32-x64-gnu": "4.57.0", - "@rollup/rollup-win32-x64-msvc": "4.57.0", + "@rollup/rollup-android-arm-eabi": "4.57.1", + "@rollup/rollup-android-arm64": "4.57.1", + "@rollup/rollup-darwin-arm64": "4.57.1", + "@rollup/rollup-darwin-x64": "4.57.1", + "@rollup/rollup-freebsd-arm64": "4.57.1", + "@rollup/rollup-freebsd-x64": "4.57.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.57.1", + "@rollup/rollup-linux-arm-musleabihf": "4.57.1", + "@rollup/rollup-linux-arm64-gnu": "4.57.1", + "@rollup/rollup-linux-arm64-musl": "4.57.1", + "@rollup/rollup-linux-loong64-gnu": "4.57.1", + "@rollup/rollup-linux-loong64-musl": "4.57.1", + "@rollup/rollup-linux-ppc64-gnu": "4.57.1", + "@rollup/rollup-linux-ppc64-musl": "4.57.1", + "@rollup/rollup-linux-riscv64-gnu": "4.57.1", + "@rollup/rollup-linux-riscv64-musl": "4.57.1", + "@rollup/rollup-linux-s390x-gnu": "4.57.1", + "@rollup/rollup-linux-x64-gnu": "4.57.1", + "@rollup/rollup-linux-x64-musl": "4.57.1", + "@rollup/rollup-openbsd-x64": "4.57.1", + "@rollup/rollup-openharmony-arm64": "4.57.1", + "@rollup/rollup-win32-arm64-msvc": "4.57.1", + "@rollup/rollup-win32-ia32-msvc": "4.57.1", + "@rollup/rollup-win32-x64-gnu": "4.57.1", + "@rollup/rollup-win32-x64-msvc": "4.57.1", "fsevents": "~2.3.2" } }, @@ -12459,11 +12227,10 @@ "license": "MIT" }, "node_modules/semantic-release": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-25.0.2.tgz", - "integrity": "sha512-6qGjWccl5yoyugHt3jTgztJ9Y0JVzyH8/Voc/D8PlLat9pwxQYXz7W1Dpnq5h0/G5GCYGUaDSlYcyk3AMh5A6g==", + "version": "25.0.3", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-25.0.3.tgz", + "integrity": "sha512-WRgl5GcypwramYX4HV+eQGzUbD7UUbljVmS+5G1uMwX/wLgYuJAxGeerXJDMO2xshng4+FXqCgyB5QfClV6WjA==", "dev": true, - "license": "MIT", "peer": true, "dependencies": { "@semantic-release/commit-analyzer": "^13.0.1", @@ -12492,7 +12259,6 @@ "read-package-up": "^12.0.0", "resolve-from": "^5.0.0", "semver": "^7.3.2", - "semver-diff": "^5.0.0", "signale": "^1.2.1", "yargs": "^18.0.0" }, @@ -12570,36 +12336,6 @@ "semver": "bin/semver.js" } }, - "node_modules/semver-diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-5.0.0.tgz", - "integrity": "sha512-0HbGtOm+S7T6NGQ/pxJSJipJvc4DK3FcRVMRkhsIwJDJ4Jcz5DQC1cPPzB5GhzyHjwttW878HaWQq46CkL3cqg==", - "deprecated": "Deprecated as the semver package now supports this built-in.", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/semver-diff/node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/semver-regex": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz", @@ -12965,7 +12701,6 @@ "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", "dev": true, - "license": "ISC", "engines": { "node": ">= 10.x" } @@ -13244,19 +12979,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/text-extensions": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz", - "integrity": "sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/thenby": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz", @@ -13302,13 +13024,6 @@ "tslib": "^2" } }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "license": "MIT" - }, "node_modules/through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -13354,7 +13069,6 @@ "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", "dev": true, - "license": "MIT", "engines": { "node": ">=18" } @@ -13503,9 +13217,9 @@ } }, "node_modules/type-fest": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.4.2.tgz", - "integrity": "sha512-FLEenlVYf7Zcd34ISMLo3ZzRE1gRjY1nMDTp+bQRBiPsaKyIW8K3Zr99ioHDUgA9OGuGGJPyYpNcffGmBhJfGg==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.4.3.tgz", + "integrity": "sha512-AXSAQJu79WGc79/3e9/CR77I/KQgeY1AhNvcShIH4PTcGYyC4xv6H4R4AUOwkPS5799KlVDAu8zExeCrkGquiA==", "dev": true, "dependencies": { "tagged-tag": "^1.0.0" @@ -14094,19 +13808,6 @@ "buffer-crc32": "~0.2.3" } }, - "node_modules/yocto-queue": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", - "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/yoctocolors": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.2.tgz", diff --git a/package.json b/package.json index fa5f3788..5ce3c9c5 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,9 @@ }, "config": { "vscode": { - "version": "1.108.2", - "ref": "1.108.2", - "commit": "c9d77990917f3102ada88be140d28b038d1dd7c7" + "version": "1.109.0", + "ref": "1.109.0", + "commit": "bdd88df003631aaa0bcbe057cb0a940b80a476fa" }, "monaco": { "ref": "v0.55.1", @@ -40,15 +40,15 @@ } }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.28.6", - "@babel/preset-env": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", + "@babel/preset-env": "^7.29.0", "@babel/preset-typescript": "^7.28.5", "@codingame/commitlint-config-codingame": "^1.2.1", "@codingame/semantic-release-config-github": "^2.2.1", "@codingame/tsconfig": "^1.2.1", - "@commitlint/cli": "^20.3.1", + "@commitlint/cli": "^20.4.1", "@rollup/plugin-commonjs": "^29.0.0", "@rollup/plugin-dynamic-import-vars": "^2.1.5", "@rollup/plugin-json": "^6.1.0", @@ -61,6 +61,8 @@ "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.35", "@types/yauzl": "^2.10.3", + "@vscode/codicons": "^0.0.44", + "@vscode/tree-sitter-wasm": "^0.3.0", "acorn": "^8.15.0", "chalk": "^5.6.2", "change-case": "^5.4.4", @@ -74,17 +76,17 @@ "postcss-url": "^10.1.3", "prettier": "^3.8.1", "recast": "^0.23.11", - "rollup": "^4.57.0", + "rollup": "^4.57.1", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.3.0", - "semantic-release": "25.0.2", + "semantic-release": "25.0.3", "tsx": "^4.21.0", - "type-fest": "^5.4.2", + "type-fest": "^5.4.3", "typescript": "^5.9.3", "typescript-eslint": "^8.54.0", "vscode-oniguruma": "1.7.0", "vscode-semver": "npm:semver@=5.5.0", - "vscode-textmate": "^9.3.0", + "vscode-textmate": "^9.3.2", "yargs": "^18.0.0", "zx": "^8.8.5" }, @@ -93,23 +95,22 @@ "@microsoft/1ds-post-js": "^3.2.13", "@rollup/pluginutils": "^5.3.0", "@vscode/iconv-lite-umd": "0.7.1", - "@vscode/proxy-agent": "^0.36.0", + "@vscode/proxy-agent": "^0.37.0", "@vscode/ripgrep": "^1.15.13", - "@vscode/spdlog": "^0.15.2", - "@vscode/tree-sitter-wasm": "^0.3.0", + "@vscode/spdlog": "^0.15.7", "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-clipboard": "^0.3.0-beta.91", - "@xterm/addon-image": "^0.10.0-beta.91", - "@xterm/addon-ligatures": "^0.11.0-beta.91", - "@xterm/addon-progress": "^0.3.0-beta.91", - "@xterm/addon-search": "^0.17.0-beta.91", - "@xterm/addon-serialize": "^0.15.0-beta.91", - "@xterm/addon-unicode11": "^0.10.0-beta.91", - "@xterm/addon-webgl": "^0.20.0-beta.101", - "@xterm/headless": "^6.1.0-beta.91", - "@xterm/xterm": "^6.1.0-beta.91", + "@xterm/addon-clipboard": "^0.3.0-beta.109", + "@xterm/addon-image": "^0.10.0-beta.109", + "@xterm/addon-ligatures": "^0.11.0-beta.109", + "@xterm/addon-progress": "^0.3.0-beta.109", + "@xterm/addon-search": "^0.17.0-beta.109", + "@xterm/addon-serialize": "^0.15.0-beta.109", + "@xterm/addon-unicode11": "^0.10.0-beta.109", + "@xterm/addon-webgl": "^0.20.0-beta.108", + "@xterm/headless": "^6.1.0-beta.109", + "@xterm/xterm": "^6.1.0-beta.109", "cookie": "^0.7.2", "css-url-parser": "^1.1.4", "dompurify": "^3.3.1", @@ -121,7 +122,7 @@ "marked": "~14.0.0", "memfs": "^4.56.10", "mime-types": "^3.0.2", - "node-pty": "^1.1.0-beta43", + "node-pty": "^1.2.0-beta.10", "tas-client": "0.3.1", "thenby": "^1.3.4", "vscode-css-languageservice": "6.2.14", @@ -132,13 +133,6 @@ "yauzl": "^3.0.0", "yazl": "^2.4.3" }, - "overrides": { - "typescript": "$typescript", - "rollup": "$rollup", - "recast": "$recast", - "@xterm/xterm": "^6.1.0-beta.91", - "cross-spawn": "7.0.6" - }, "volta": { "node": "22.21.1", "npm": "11.6.2" diff --git a/rollup/plugins/css-import-plugin.ts b/rollup/plugins/css-import-plugin.ts index e03dab7e..d2575de9 100644 --- a/rollup/plugins/css-import-plugin.ts +++ b/rollup/plugins/css-import-plugin.ts @@ -17,7 +17,6 @@ export default ({ include = ['**/*.css'], exclude = [] }: Options = {}): Plugin => { - const styles: Record = {} const filter = createFilter(include, exclude) return { @@ -45,52 +44,76 @@ export default ({ }, /** - * Transform the css into a module containing it + * Transform the css into a module containing it, also resolve assets and emit rollup assets for them */ - transform(code, id) { + async transform(code, id) { if (!filter(id)) return - styles[id] = code + const replacements: Record = {} + + await postcss([ + postcssUrl({ + url: async (asset) => { + let fileName: string | undefined + if (preserveAssetsRoot != null) { + fileName = path + .relative(path.resolve(process.cwd(), preserveAssetsRoot), asset.absolutePath!) + .replace(/^(\.\.\/)+/g, '') + } + + const resolved = await this.resolve(asset.url, id) + if (resolved != null && !resolved.external) { + const assetId = this.emitFile({ + type: 'asset', + fileName, + source: await fs.promises.readFile(resolved.id), + needsCodeReference: false + }) + + replacements[asset.url] = assetId + } + + return asset.url + } + }) + ]).process(code, { from: id }) return { - code: `renderCSS(${JSON.stringify(code)}); export default 'fakeExport'` + code: `renderCSS(${JSON.stringify(code)}, {${Object.entries(replacements) + .map(([url, assetId]) => `"${url}": import.meta.ROLLUP_FILE_URL_${assetId}`) + .join(', ')}}); export default 'fakeExport'` } }, /** - * transform back the chunk into a css file, and emit referenced asset files + * transform back the chunk into a css file, replacing the urls with the emitted ones */ async renderChunk(code, chunk) { if (chunk.fileName.endsWith('.css')) { const parsed = acorn.parse(code, { ecmaVersion: 2022, sourceType: 'module' }) - const css = ( - ((parsed.body[0] as acorn.ExpressionStatement).expression as acorn.CallExpression) - .arguments[0] as acorn.Literal - ).value as string - - await postcss([ - postcssUrl({ - url: async (asset) => { - let fileName: string | undefined - if (preserveAssetsRoot != null) { - fileName = path - .relative(path.resolve(process.cwd(), preserveAssetsRoot), asset.absolutePath!) - .replace(/^(\.\.\/)+/g, '') - } - - this.emitFile({ - type: 'asset', - fileName, - source: await fs.promises.readFile(asset.absolutePath!), - needsCodeReference: false - }) - return asset.url + const renderCssArguments = ( + (parsed.body[0] as acorn.ExpressionStatement).expression as acorn.CallExpression + ).arguments + const css = (renderCssArguments[0] as acorn.Literal).value as string + const replacements = (renderCssArguments[1] as acorn.ObjectExpression).properties.reduce( + (acc, prop) => { + if ( + prop.type === 'Property' && + prop.key.type === 'Literal' && + prop.value.type === 'Literal' + ) { + acc[prop.key.value as string] = prop.value.value as string } - }) - ]).process(css, { from: chunk.fileName }) + return acc + }, + {} as Record + ) - return css + return Object.entries(replacements).reduce( + (acc, [url, replacedUrl]) => acc.replaceAll(url, replacedUrl), + css + ) } return null diff --git a/rollup/plugins/vscode-asset-glob-meta-url-plugin.ts b/rollup/plugins/vscode-asset-glob-meta-url-plugin.ts index 5c92ba24..36c85d45 100644 --- a/rollup/plugins/vscode-asset-glob-meta-url-plugin.ts +++ b/rollup/plugins/vscode-asset-glob-meta-url-plugin.ts @@ -4,7 +4,13 @@ import glob from 'fast-glob' import * as nodePath from 'node:path' import * as fs from 'node:fs' -export default ({ vscodeSrcDir }: { vscodeSrcDir: string }): Plugin => { +export default ({ + vscodeSrcDir, + nodeModulesDir +}: { + vscodeSrcDir: string + nodeModulesDir: string +}): Plugin => { const realPaths = new Map() return { name: 'vscode-asset-glob-meta-url', @@ -13,7 +19,8 @@ export default ({ vscodeSrcDir }: { vscodeSrcDir: string }): Plugin => { return null } - const fakePath = nodePath.resolve(vscodeSrcDir, importee.replace(/\*/, 'all')) + const baseDir = importee.startsWith('vs') ? vscodeSrcDir : nodeModulesDir + const fakePath = nodePath.resolve(baseDir, importee.replace(/\*/, 'all')) realPaths.set(fakePath, importee) return fakePath }, @@ -22,11 +29,20 @@ export default ({ vscodeSrcDir }: { vscodeSrcDir: string }): Plugin => { if (realPath == null) { return undefined } - const files = await glob(realPath, { cwd: vscodeSrcDir }) + + const baseDir = realPath.startsWith('vs') ? vscodeSrcDir : nodeModulesDir + const files = await glob(realPath, { + cwd: baseDir + }) + + if (files.length === 0) { + this.warn(`No files found for glob ${realPath}`) + return `export default {}` + } const fileRefs = await Promise.all( files.map(async (file) => { - const filePath = nodePath.resolve(vscodeSrcDir, file) + const filePath = nodePath.resolve(baseDir, file) const ref = this.emitFile({ type: 'asset', name: nodePath.basename(file), diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index f07ecf40..f95d0b63 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -28,7 +28,8 @@ import { TSCONFIG, external, VSCODE_SRC_DIR, - sanitizeFileName + sanitizeFileName, + BASE_DIR } from './tools/config.js' import { transformImportEqualsTransformerFactory } from './tools/typescript.js' import json from '@rollup/plugin-json' @@ -161,7 +162,10 @@ export default (args: Record): rollup.RollupOptions => { 'globalThis.require': 'undefined', preventAssignment: true }), - vscodeAssetGlobMetaUrl({ vscodeSrcDir: VSCODE_SRC_DIR }), + vscodeAssetGlobMetaUrl({ + vscodeSrcDir: VSCODE_SRC_DIR, + nodeModulesDir: nodePath.resolve(BASE_DIR, 'node_modules') + }), css({ preserveAssetsRoot: SRC_DIR }), diff --git a/rollup/tools/configuredSubpackagePlugin.ts b/rollup/tools/configuredSubpackagePlugin.ts index 2e283f67..b908df15 100644 --- a/rollup/tools/configuredSubpackagePlugin.ts +++ b/rollup/tools/configuredSubpackagePlugin.ts @@ -188,7 +188,7 @@ export function configuredSubpackagePlugin(): rollup.Plugin { } throw new Error( - `Unable to name package with groups ${groups} and dependencies ${externalDependencies}` + `Unable to name package with groups ${Array.from(groups)} and dependencies ${Array.from(externalDependencies)}` ) }, getMainModule(id) { diff --git a/rollup/tools/vscode.ts b/rollup/tools/vscode.ts index bed31d53..4c80c403 100644 --- a/rollup/tools/vscode.ts +++ b/rollup/tools/vscode.ts @@ -310,7 +310,7 @@ export default { } if (transformed) { - patchedCode = recast.print(ast).code + patchedCode = recast.prettyPrint(ast).code patchedCode = patchedCode.replace(/\/\*#__PURE__\*\/\s+/g, '/*#__PURE__*/ ') // Remove space after PURE comment } @@ -346,11 +346,15 @@ function resolveVscode(importee: string, importer?: string) { export function resolveVscodePlugin(vscodeVersion?: string, vscodeCommit?: string): rollup.Plugin { return { name: 'resolve-vscode', - resolveId: (importeeUrl, importer) => { + resolveId(this: rollup.PluginContext, importeeUrl, importer) { const result = /^(.*?)(\?.*)?$/.exec(importeeUrl)! const importee = result[1]! const search = result[2] ?? '' + if (importee.endsWith('codicon.ttf')) { + return this.resolve('@vscode/codicons/dist/codicon.ttf') + } + const resolved = resolveVscode(importee, importer) if (resolved != null) { @@ -358,6 +362,33 @@ export function resolveVscodePlugin(vscodeVersion?: string, vscodeCommit?: strin } return undefined }, + async transform(code, id) { + if (id.endsWith('tree-sitter.js')) { + // Remove the UMD to commonjs wrapper around tree-sitter, because it prevent rollup to properly resolve the imports and tree-shake the code + + // basically revert what is done in https://github.com/microsoft/vscode-tree-sitter-wasm/blob/f2b6e6f646aa32388a5c6d6ee960e85d294a26a9/build/compileTreeSitterWasm.ts#L74-L109 + let cleanCode = code + .split('\n') + .slice(21, -1) + .join('\n') + .replaceAll('getCurrentScriptUrl()', 'import.meta.url') + + // Remove dynamic imports of node built-in and other stuff to make it importable + .replaceAll('await import(', 'shouldNotBeUsed(') + .replaceAll('if (ENVIRONMENT_IS_NODE) {', 'if (false) {') + .replaceAll('new URL("tree-sitter.wasm", import.meta.url).href', 'undefined') + + const moduleExportKey = 'return {' + const indexLastExport = cleanCode.lastIndexOf(moduleExportKey) + const exportsStart = indexLastExport + moduleExportKey.length + const exportsEnd = cleanCode.indexOf('}', exportsStart) + const exports = cleanCode.substring(exportsStart, exportsEnd) + cleanCode = `${cleanCode.substring(0, indexLastExport)}\nexport { ${exports} };` + + return cleanCode + } + return undefined + }, async load(id) { if (!id.startsWith(VSCODE_SRC_DIR) && !id.startsWith(OVERRIDE_PATH)) { return undefined diff --git a/src/extension-tools.ts b/src/extension-tools.ts index 8a9a900d..34ae8eeb 100644 --- a/src/extension-tools.ts +++ b/src/extension-tools.ts @@ -221,6 +221,9 @@ async function extractResourcesFromExtensionManifestContribute( ).flat() ) } + if (contribute.css != null) { + resources.push(...contribute.css.map((css) => css.path)) + } return resources.filter( (resource, index, list) => !resource.startsWith('$(') && !list.slice(0, index).some((o) => o === resource) diff --git a/src/extension.api.ts b/src/extension.api.ts index 79945390..84a7f1fc 100644 --- a/src/extension.api.ts +++ b/src/extension.api.ts @@ -350,7 +350,6 @@ const api: typeof vscode = { LanguageModelToolResult2: extHostTypes.LanguageModelToolResult2, McpHttpServerDefinition: extHostTypes.McpHttpServerDefinition, AISearchKeyword: searchExtTypes.AISearchKeyword, - ChatPrepareToolInvocationPart: extHostTypes.ChatPrepareToolInvocationPart, InlineCompletionsDisposeReasonKind: extHostTypes.InlineCompletionsDisposeReasonKind, ChatToolInvocationPart: extHostTypes.ChatToolInvocationPart, ChatResponseMultiDiffPart: extHostTypes.ChatResponseMultiDiffPart, @@ -372,7 +371,13 @@ const api: typeof vscode = { McpStdioServerDefinition2: extHostTypes.McpStdioServerDefinition, McpHttpServerDefinition2: extHostTypes.McpHttpServerDefinition, TerminalCompletionItem: extHostTypes.TerminalCompletionItem, - ChatSessionChangedFile: extHostTypes.ChatSessionChangedFile + ChatSessionChangedFile: extHostTypes.ChatSessionChangedFile, + ChatResponseWorkspaceEditPart: extHostTypes.ChatResponseWorkspaceEditPart, + ChatQuestionType: extHostTypes.ChatQuestionType, + ChatQuestion: extHostTypes.ChatQuestion, + ChatResponseQuestionCarouselPart: extHostTypes.ChatResponseQuestionCarouselPart, + McpToolInvocationContentData: extHostTypes.McpToolInvocationContentData, + ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2 } // @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config diff --git a/src/missing-services.ts b/src/missing-services.ts index 4bfa99b0..8321ac30 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -5,7 +5,7 @@ import { type IDynamicListEventMultiplexer } from 'vs/base/common/event' import { Disposable, type IDisposable } from 'vs/base/common/lifecycle' -import { ResourceSet } from 'vs/base/common/map' +import { ResourceMap, ResourceSet } from 'vs/base/common/map' import { constObservable } from 'vs/base/common/observable' import { OS } from 'vs/base/common/platform' import { joinPath } from 'vs/base/common/resources' @@ -161,34 +161,34 @@ import { } from 'vs/workbench/browser/parts/editor/editor' import type { IViewContainerModel } from 'vs/workbench/common/views' import { IViewDescriptorService } from 'vs/workbench/common/views.service' +import { IChatAttachmentResolveService } from 'vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service' +import { IChatContextPickService } from 'vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service' import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat.service' -import { IChatAttachmentResolveService } from 'vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service' -import { IChatMarkdownAnchorService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service' -import { IChatContextPickService } from 'vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service' import { IChatOutputRendererService } from 'vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service' +import { IChatMarkdownAnchorService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service' +import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/attachments/chatVariables.service' +import { IChatService } from 'vs/workbench/contrib/chat/common/chatService/chatService.service' +import { IChatSessionsService } from 'vs/workbench/contrib/chat/common/chatSessionsService.service' +import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service' +import { IChatEditingService } from 'vs/workbench/contrib/chat/common/editing/chatEditingService.service' +import { ILanguageModelIgnoredFilesService } from 'vs/workbench/contrib/chat/common/ignoredFiles.service' +import { ILanguageModelStatsService } from 'vs/workbench/contrib/chat/common/languageModelStats.service' +import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels.service' +import { IChatTransferService } from 'vs/workbench/contrib/chat/common/model/chatTransferService.service' import { IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/participants/chatAgents.service' -import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service' -import { IChatEditingService } from 'vs/workbench/contrib/chat/common/editing/chatEditingService.service' -import { IChatService } from 'vs/workbench/contrib/chat/common/chatService/chatService.service' -import { IChatSessionsService } from 'vs/workbench/contrib/chat/common/chatSessionsService.service' import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/participants/chatSlashCommands.service' +import { IPromptsService } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service' import { IChatTodoListService } from 'vs/workbench/contrib/chat/common/tools/chatTodoListService.service' -import { IChatTransferService } from 'vs/workbench/contrib/chat/common/model/chatTransferService.service' -import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/attachments/chatVariables.service' -import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.service' -import { ILanguageModelIgnoredFilesService } from 'vs/workbench/contrib/chat/common/ignoredFiles.service' -import { ILanguageModelStatsService } from 'vs/workbench/contrib/chat/common/languageModelStats.service' import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsService.service' -import { ILanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels.service' -import { IPromptsService } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service' +import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.service' import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService.service' import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor.service' import type { @@ -214,7 +214,6 @@ import { IIssueFormService, IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue.service' -import { IDefaultLogLevelsService } from 'vs/workbench/services/log/common/defaultLogLevels.service' import { IMcpRegistry } from 'vs/workbench/contrib/mcp/common/mcpRegistryTypes.service' import { IMcpElicitationService, @@ -361,6 +360,7 @@ import { IActiveLanguagePackService, ILocaleService } from 'vs/workbench/services/localization/common/locale.service' +import { IDefaultLogLevelsService } from 'vs/workbench/services/log/common/defaultLogLevels.service' import { IWorkbenchMcpManagementService } from 'vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service' import { INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService.service' import { IOutlineService } from 'vs/workbench/services/outline/browser/outline.service' @@ -413,6 +413,13 @@ import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/comm import { IAiSettingsSearchService } from 'vscode/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.service' import { Codicon } from 'vs/base/common/codicons' +import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService' +import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker.service' +import type { + ContextKeyValue, + IContextKey, + IScopedContextKeyService +} from 'vs/platform/contextkey/common/contextkey.js' import { NullDataChannelService } from 'vs/platform/dataChannel/common/dataChannel' import { IDataChannelService } from 'vs/platform/dataChannel/common/dataChannel.service' import { IDefaultAccountService } from 'vs/platform/defaultAccount/common/defaultAccount.service' @@ -420,30 +427,37 @@ import { IImageResizeService } from 'vs/platform/imageResize/common/imageResizeS import { IMarkdownRendererService } from 'vs/platform/markdown/browser/markdownRenderer.service' import { McpGalleryManifestStatus } from 'vs/platform/mcp/common/mcpGalleryManifest' import { IMcpGalleryManifestService } from 'vs/platform/mcp/common/mcpGalleryManifest.service' -import { IChatContextService } from 'vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service' +import type { IAgentSessionsModel } from 'vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel' +import { IAgentSessionsService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service' +import { IAgentSessionProjectionService } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.service' +import { AgentStatusMode } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.js' +import { IAgentTitleBarStatusService } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.service' +import { IChatEditingExplanationModelManager } from 'vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service' import { IChatStatusItemService } from 'vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service' -import { IChatLayoutService } from 'vs/workbench/contrib/chat/common/widget/chatLayoutService.service' +import { IChatTipService } from 'vs/workbench/contrib/chat/browser/chatTipService.service.js' +import { IChatContextService } from 'vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service' +import { IChatToolOutputStateCache } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service' import { IChatModeService } from 'vs/workbench/contrib/chat/common/chatModes.service' +import { ILanguageModelsConfigurationService } from 'vs/workbench/contrib/chat/common/languageModelsConfiguration.service.js' import { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service' import { ToolDataSource, ToolSet, VSCodeToolReference } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsService' +import { IChatLayoutService } from 'vs/workbench/contrib/chat/common/widget/chatLayoutService.service' import { IRandomService } from 'vs/workbench/contrib/editTelemetry/browser/randomService.service' import { IAiEditTelemetryService } from 'vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service' import { LazyCollectionState } from 'vs/workbench/contrib/mcp/common/mcpTypes' import { INotebookOutlineEntryFactory } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service' import { ISCMRepositorySelectionMode } from 'vs/workbench/contrib/scm/common/scm' +import { ITerminalSandboxService } from 'vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service' import { ChatEntitlement } from 'vs/workbench/services/chat/common/chatEntitlementService' -import type { IInlineCompletionsUnificationState } from 'vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification' import { IInlineCompletionsUnificationService } from 'vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service' -import { IAgentSessionsService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service' -import type { IAgentSessionsModel } from 'vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel' +import { DefaultWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.js' +import { IWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.service.js' import { IUserAttentionService } from 'vs/workbench/services/userAttention/common/userAttentionService.service' import { ICodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service' -import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService' -import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker.service' import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale @@ -1484,6 +1498,14 @@ class WorkspaceTrustRequestService implements IWorkspaceTrustRequestService { requestWorkspaceTrust: IWorkspaceTrustRequestService['requestWorkspaceTrust'] = async () => true requestWorkspaceTrustOnStartup: IWorkspaceTrustRequestService['requestWorkspaceTrustOnStartup'] = () => null + + onDidInitiateResourcesTrustRequest: IWorkspaceTrustRequestService['onDidInitiateResourcesTrustRequest'] = + Event.None + @Unsupported + completeResourcesTrustRequest: IWorkspaceTrustRequestService['completeResourcesTrustRequest'] = + unsupported + requestResourcesTrust: IWorkspaceTrustRequestService['requestResourcesTrust'] = async () => + undefined } registerSingleton( IWorkspaceTrustRequestService, @@ -2534,6 +2556,7 @@ class UpdateService implements IUpdateService { isLatestVersion: IUpdateService['isLatestVersion'] = async () => true @Unsupported _applySpecificUpdate: IUpdateService['_applySpecificUpdate'] = unsupported + disableProgressiveReleases: IUpdateService['disableProgressiveReleases'] = async () => {} } registerSingleton(IUpdateService, UpdateService, InstantiationType.Eager) class StatusbarService implements IStatusbarService { @@ -3310,6 +3333,12 @@ class ChatService implements IChatService { setTitle: IChatService['setTitle'] = unsupported transferredSessionResource: IChatService['transferredSessionResource'] = undefined getSessionTitle: IChatService['getSessionTitle'] = () => undefined + + onDidCreateModel: IChatService['onDidCreateModel'] = Event.None + onDidReceiveQuestionCarouselAnswer: IChatService['onDidReceiveQuestionCarouselAnswer'] = + Event.None + @Unsupported + notifyQuestionCarouselAnswer: IChatService['notifyQuestionCarouselAnswer'] = unsupported } registerSingleton(IChatService, ChatService, InstantiationType.Delayed) class ChatMarkdownAnchorService implements IChatMarkdownAnchorService { @@ -4433,6 +4462,28 @@ class LanguageModelsService implements ILanguageModelsService { getVendors: ILanguageModelsService['getVendors'] = () => [] registerLanguageModelProvider: ILanguageModelsService['registerLanguageModelProvider'] = () => Disposable.None + + onDidChangeLanguageModelVendors: ILanguageModelsService['onDidChangeLanguageModelVendors'] = () => + Disposable.None + lookupLanguageModelByQualifiedName: ILanguageModelsService['lookupLanguageModelByQualifiedName'] = + () => undefined + getLanguageModelGroups: ILanguageModelsService['getLanguageModelGroups'] = () => [] + @Unsupported + deltaLanguageModelChatProviderDescriptors: ILanguageModelsService['deltaLanguageModelChatProviderDescriptors'] = + unsupported + + @Unsupported + addLanguageModelsProviderGroup: ILanguageModelsService['addLanguageModelsProviderGroup'] = + unsupported + @Unsupported + removeLanguageModelsProviderGroup: ILanguageModelsService['removeLanguageModelsProviderGroup'] = + unsupported + @Unsupported + configureLanguageModelsProviderGroup: ILanguageModelsService['configureLanguageModelsProviderGroup'] = + unsupported + @Unsupported + migrateLanguageModelsProviderGroup: ILanguageModelsService['migrateLanguageModelsProviderGroup'] = + unsupported } registerSingleton(ILanguageModelsService, LanguageModelsService, InstantiationType.Delayed) class ChatSlashCommandService implements IChatSlashCommandService { @@ -4678,30 +4729,16 @@ registerSingleton( ) class InlineChatSessionService implements IInlineChatSessionService { _serviceBrand: undefined - onDidMoveSession: IInlineChatSessionService['onDidMoveSession'] = Event.None - onDidStashSession: IInlineChatSessionService['onDidStashSession'] = Event.None - @Unsupported - moveSession: IInlineChatSessionService['moveSession'] = unsupported @Unsupported - getCodeEditor: IInlineChatSessionService['getCodeEditor'] = unsupported - @Unsupported - stashSession: IInlineChatSessionService['stashSession'] = unsupported onWillStartSession: IInlineChatSessionService['onWillStartSession'] = Event.None - onDidEndSession: IInlineChatSessionService['onDidEndSession'] = Event.None @Unsupported createSession: IInlineChatSessionService['createSession'] = unsupported - getSession: IInlineChatSessionService['getSession'] = () => undefined - @Unsupported - releaseSession: IInlineChatSessionService['releaseSession'] = unsupported - @Unsupported - registerSessionKeyComputer: IInlineChatSessionService['registerSessionKeyComputer'] = unsupported @Unsupported dispose: IInlineChatSessionService['dispose'] = unsupported - @Unsupported - createSession2: IInlineChatSessionService['createSession2'] = unsupported - getSession2: IInlineChatSessionService['getSession2'] = () => undefined onDidChangeSessions = Event.None getSessionBySessionUri: IInlineChatSessionService['getSessionBySessionUri'] = () => undefined + + getSessionByTextModel: IInlineChatSessionService['getSessionBySessionUri'] = () => undefined } registerSingleton(IInlineChatSessionService, InlineChatSessionService, InstantiationType.Delayed) class NotebookEditorWorkerService implements INotebookEditorWorkerService { @@ -5201,6 +5238,63 @@ class TrustedDomainService implements ITrustedDomainService { trustedDomains: ITrustedDomainService['trustedDomains'] = [] } registerSingleton(ITrustedDomainService, TrustedDomainService, InstantiationType.Delayed) + +class FakeKeybindingContextKey< + T extends ContextKeyValue = ContextKeyValue +> implements IContextKey { + private _defaultValue: T | undefined + private _value: T | undefined + + constructor(defaultValue: T | undefined) { + this._defaultValue = defaultValue + this._value = this._defaultValue + } + + public set(value: T | undefined): void { + this._value = value + } + + public reset(): void { + this._value = this._defaultValue + } + + public get(): T | undefined { + return this._value + } +} + +class FakeContextKeyService implements IContextKeyService, IScopedContextKeyService { + dispose: IScopedContextKeyService['dispose'] = () => {} + + public _serviceBrand: undefined + private _keys = new Map() + + public createKey: IContextKeyService['createKey'] = ( + key: string, + defaultValue: T | undefined + ): IContextKey => { + const ret = new FakeKeybindingContextKey(defaultValue) + this._keys.set(key, ret) + return ret + } + public contextMatchesRules: IContextKeyService['contextMatchesRules'] = () => false + public onDidChangeContext: IContextKeyService['onDidChangeContext'] = Event.None + public bufferChangeEvents: IContextKeyService['bufferChangeEvents'] = (callback: () => void) => { + callback() + } + public getContextKeyValue: IContextKeyService['getContextKeyValue'] = (key: string) => { + const value = this._keys.get(key) + if (value) { + return value.get() as T + } + return undefined + } + public getContext: IContextKeyService['getContext'] = () => ({ getValue: () => undefined }) + public createScoped: IContextKeyService['createScoped'] = () => this + public createOverlay: IContextKeyService['createOverlay'] = () => this + updateParent: IContextKeyService['updateParent'] = () => {} +} + class LanguageModelToolsService implements ILanguageModelToolsService { _serviceBrand: undefined getTool: ILanguageModelToolsService['getTool'] = () => undefined @@ -5237,22 +5331,40 @@ class LanguageModelToolsService implements ILanguageModelToolsService { 'vscode', VSCodeToolReference.vscode, Codicon.tools, - ToolDataSource.Internal + ToolDataSource.Internal, + undefined, + undefined, + new FakeContextKeyService() ) executeToolSet: ILanguageModelToolsService['executeToolSet'] = new ToolSet( 'execute', VSCodeToolReference.vscode, Codicon.terminal, - ToolDataSource.Internal + ToolDataSource.Internal, + undefined, + undefined, + new FakeContextKeyService() ) readToolSet: ILanguageModelToolsService['readToolSet'] = new ToolSet( 'read', VSCodeToolReference.vscode, Codicon.eye, - ToolDataSource.Internal + ToolDataSource.Internal, + undefined, + undefined, + new FakeContextKeyService() + ) + agentToolSet: ILanguageModelToolsService['agentToolSet'] = new ToolSet( + 'read', + VSCodeToolReference.vscode, + Codicon.eye, + ToolDataSource.Internal, + undefined, + undefined, + new FakeContextKeyService() ) - toolsObservable: ILanguageModelToolsService['toolsObservable'] = constObservable([]) + getFullReferenceNames: ILanguageModelToolsService['getFullReferenceNames'] = () => [] getFullReferenceName: ILanguageModelToolsService['getFullReferenceName'] = (tool) => @@ -5263,6 +5375,16 @@ class LanguageModelToolsService implements ILanguageModelToolsService { getDeprecatedFullReferenceNames: ILanguageModelToolsService['getDeprecatedFullReferenceNames'] = () => new Map() toFullReferenceNames: ILanguageModelToolsService['toFullReferenceNames'] = () => [] + + onDidInvokeTool: ILanguageModelToolsService['onDidInvokeTool'] = Event.None + observeTools: ILanguageModelToolsService['observeTools'] = () => constObservable([]) + + getAllToolsIncludingDisabled: ILanguageModelToolsService['getAllToolsIncludingDisabled'] = + () => [] + beginToolCall: ILanguageModelToolsService['beginToolCall'] = () => undefined + @Unsupported + updateToolStream: ILanguageModelToolsService['updateToolStream'] = unsupported + getToolSetsForModel: ILanguageModelToolsService['getToolSetsForModel'] = () => [] } registerSingleton(ILanguageModelToolsService, LanguageModelToolsService, InstantiationType.Delayed) class IssueFormService implements IIssueFormService { @@ -5292,12 +5414,6 @@ registerSingleton(ICodeMapperService, CodeMapperService, InstantiationType.Delay class ChatEditingService implements IChatEditingService { _serviceBrand: undefined editingSessionsObs: IChatEditingService['editingSessionsObs'] = constObservable([]) - hasRelatedFilesProviders: IChatEditingService['hasRelatedFilesProviders'] = () => false - @Unsupported - registerRelatedFilesProvider: IChatEditingService['registerRelatedFilesProvider'] = () => { - return unsupported() - } - getRelatedFiles: IChatEditingService['getRelatedFiles'] = async () => undefined getEditingSession: IChatEditingService['getEditingSession'] = () => undefined @Unsupported startOrContinueGlobalEditingSession: IChatEditingService['startOrContinueGlobalEditingSession'] = @@ -5466,7 +5582,7 @@ registerSingleton(IChatEntitlementService, ChatEntitlementsService, Instantiatio class PromptsService implements IPromptsService { _serviceBrand: undefined listPromptFiles: IPromptsService['listPromptFiles'] = async () => [] - getSourceFolders: IPromptsService['getSourceFolders'] = () => [] + getSourceFolders: IPromptsService['getSourceFolders'] = async () => [] dispose: IPromptsService['dispose'] = (): void => {} resolvePromptSlashCommand: IPromptsService['resolvePromptSlashCommand'] = async () => undefined @Unsupported @@ -5495,9 +5611,14 @@ class PromptsService implements IPromptsService { @Unsupported getPromptSlashCommandName: IPromptsService['getPromptSlashCommandName'] = unsupported - registerCustomAgentsProvider: IPromptsService['registerCustomAgentsProvider'] = () => - Disposable.None findAgentSkills: IPromptsService['findAgentSkills'] = async () => undefined + + getResolvedSourceFolders: IPromptsService['getResolvedSourceFolders'] = async () => [] + + @Unsupported + registerPromptFileProvider: IPromptsService['registerPromptFileProvider'] = unsupported + @Unsupported + getPromptDiscoveryInfo: IPromptsService['getPromptDiscoveryInfo'] = unsupported } registerSingleton(IPromptsService, PromptsService, InstantiationType.Eager) @@ -5585,13 +5706,21 @@ registerSingleton( class NullDefaultAccountService extends Disposable implements IDefaultAccountService { declare _serviceBrand: undefined + onDidChangePolicyData: IDefaultAccountService['onDidChangePolicyData'] = Event.None + policyData: IDefaultAccountService['policyData'] = null + @Unsupported + getDefaultAccountAuthenticationProvider: IDefaultAccountService['getDefaultAccountAuthenticationProvider'] = + unsupported + @Unsupported + setDefaultAccountProvider: IDefaultAccountService['setDefaultAccountProvider'] = () => {} + refresh: IDefaultAccountService['refresh'] = async () => null + @Unsupported + signIn: IDefaultAccountService['signIn'] = unsupported readonly onDidChangeDefaultAccount: IDefaultAccountService['onDidChangeDefaultAccount'] = Event.None getDefaultAccount: IDefaultAccountService['getDefaultAccount'] = async () => null - - setDefaultAccount: IDefaultAccountService['setDefaultAccount'] = () => {} } registerSingleton(IDefaultAccountService, NullDefaultAccountService, InstantiationType.Delayed) class DynamicAuthenticationProviderStorageService implements IDynamicAuthenticationProviderStorageService { @@ -5896,7 +6025,6 @@ class ChatSessionsService implements IChatSessionsService { _serviceBrand: undefined onDidChangeInProgress: IChatSessionsService['onDidChangeInProgress'] = Event.None getAllChatSessionContributions: IChatSessionsService['getAllChatSessionContributions'] = () => [] - getAllChatSessionItemProviders: IChatSessionsService['getAllChatSessionItemProviders'] = () => [] @Unsupported reportInProgress: IChatSessionsService['reportInProgress'] = unsupported @@ -5922,7 +6050,6 @@ class ChatSessionsService implements IChatSessionsService { undefined getInputPlaceholderForSessionType: IChatSessionsService['getInputPlaceholderForSessionType'] = () => undefined - getAllChatSessionItems: IChatSessionsService['getAllChatSessionItems'] = async () => [] onDidChangeContentProviderSchemes: IChatSessionsService['onDidChangeContentProviderSchemes'] = Event.None @@ -5948,8 +6075,6 @@ class ChatSessionsService implements IChatSessionsService { @Unsupported setOptionGroupsForSessionType: IChatSessionsService['setOptionGroupsForSessionType'] = unsupported - setOptionsChangeCallback: IChatSessionsService['setOptionsChangeCallback'] = () => {} - @Unsupported notifySessionOptionsChange: IChatSessionsService['notifySessionOptionsChange'] = unsupported @@ -5963,6 +6088,11 @@ class ChatSessionsService implements IChatSessionsService { undefined onDidChangeOptionGroups: IChatSessionsService['onDidChangeOptionGroups'] = Event.None + + getChatSessionItems: IChatSessionsService['getChatSessionItems'] = async () => [] + getCustomAgentTargetForSessionType: IChatSessionsService['getCustomAgentTargetForSessionType'] = + () => undefined + onRequestNotifyExtension: IChatSessionsService['onRequestNotifyExtension'] = Event.None } registerSingleton(IChatSessionsService, ChatSessionsService, InstantiationType.Delayed) @@ -6011,7 +6141,7 @@ registerSingleton(IAiEditTelemetryService, AiEditTelemetryService, Instantiation class InlineCompletionsUnificationService implements IInlineCompletionsUnificationService { @Unsupported - get state(): IInlineCompletionsUnificationState { + get state(): IInlineCompletionsUnificationService['state'] { return unsupported() } onDidStateChange: IInlineCompletionsUnificationService['onDidStateChange'] = Event.None @@ -6094,8 +6224,14 @@ class ChatContextService implements PublicMembers { _serviceBrand: undefined setChatContextProvider: IChatContextService['setChatContextProvider'] = () => {} - registerChatContextProvider: IChatContextService['registerChatContextProvider'] = () => - Disposable.None + registerChatWorkspaceContextProvider: IChatContextService['registerChatWorkspaceContextProvider'] = + () => Disposable.None + + registerChatExplicitContextProvider: IChatContextService['registerChatExplicitContextProvider'] = + () => Disposable.None + + registerChatResourceContextProvider: IChatContextService['registerChatResourceContextProvider'] = + () => Disposable.None unregisterChatContextProvider: IChatContextService['unregisterChatContextProvider'] = () => {} @@ -6106,6 +6242,11 @@ class ChatContextService implements PublicMembers { resolveChatContext: IChatContextService['resolveChatContext'] = async (context) => context dispose: IChatContextService['dispose'] = () => {} + + setExecuteCommandCallback: IChatContextService['setExecuteCommandCallback'] = () => {} + + @Unsupported + executeChatContextItemCommand: IChatContextService['executeChatContextItemCommand'] = unsupported } registerSingleton(IChatContextService, ChatContextService, InstantiationType.Delayed) @@ -6154,11 +6295,19 @@ class TerminalChatService implements ITerminalChatService { hasChatSessionAutoApproval: ITerminalChatService['hasChatSessionAutoApproval'] = () => false addSessionAutoApproveRule: ITerminalChatService['addSessionAutoApproveRule'] = () => {} getSessionAutoApproveRules: ITerminalChatService['getSessionAutoApproveRules'] = () => ({}) + + getChatSessionResourceForInstance: ITerminalChatService['getChatSessionResourceForInstance'] = + () => undefined + continueInBackground: ITerminalChatService['continueInBackground'] = () => {} + onDidContinueInBackground: ITerminalChatService['onDidContinueInBackground'] = Event.None } registerSingleton(ITerminalChatService, TerminalChatService, InstantiationType.Delayed) class AgentSessionsModel implements IAgentSessionsModel { + onDidChangeSessionArchivedState: IAgentSessionsModel['onDidChangeSessionArchivedState'] = + Event.None + resolved: IAgentSessionsModel['resolved'] = false onWillResolve: IAgentSessionsModel['onWillResolve'] = Event.None onDidResolve: IAgentSessionsModel['onDidResolve'] = Event.None onDidChangeSessions: IAgentSessionsModel['onDidChangeSessions'] = Event.None @@ -6196,3 +6345,129 @@ class CodeCompareModelService implements ICodeCompareModelService { } registerSingleton(ICodeCompareModelService, CodeCompareModelService, InstantiationType.Delayed) + +class AgentSessionProjectionService implements IAgentSessionProjectionService { + _serviceBrand: undefined + + isActive: IAgentSessionProjectionService['isActive'] = false + activeSession: IAgentSessionProjectionService['activeSession'] = undefined + onDidChangeProjectionMode: IAgentSessionProjectionService['onDidChangeProjectionMode'] = + Event.None + onDidChangeActiveSession: IAgentSessionProjectionService['onDidChangeActiveSession'] = Event.None + + @Unsupported + enterProjection: IAgentSessionProjectionService['enterProjection'] = unsupported + + @Unsupported + exitProjection: IAgentSessionProjectionService['exitProjection'] = unsupported +} + +registerSingleton( + IAgentSessionProjectionService, + AgentSessionProjectionService, + InstantiationType.Delayed +) + +class AgentTitleBarStatusService implements IAgentTitleBarStatusService { + _serviceBrand: undefined + mode: IAgentTitleBarStatusService['mode'] = AgentStatusMode.Default + sessionInfo: IAgentTitleBarStatusService['sessionInfo'] = undefined + onDidChangeMode: IAgentTitleBarStatusService['onDidChangeMode'] = Event.None + onDidChangeSessionInfo: IAgentTitleBarStatusService['onDidChangeSessionInfo'] = Event.None + @Unsupported + enterSessionMode: IAgentTitleBarStatusService['enterSessionMode'] = unsupported + @Unsupported + enterSessionReadyMode: IAgentTitleBarStatusService['enterSessionReadyMode'] = unsupported + @Unsupported + exitSessionReadyMode: IAgentTitleBarStatusService['exitSessionReadyMode'] = unsupported + @Unsupported + exitSessionMode: IAgentTitleBarStatusService['exitSessionMode'] = unsupported + @Unsupported + updateSessionTitle: IAgentTitleBarStatusService['updateSessionTitle'] = unsupported +} + +registerSingleton( + IAgentTitleBarStatusService, + AgentTitleBarStatusService, + InstantiationType.Delayed +) + +class LanguageModelsConfigurationService implements ILanguageModelsConfigurationService { + _serviceBrand: undefined + @Unsupported + get configurationFile(): ILanguageModelsConfigurationService['configurationFile'] { + return unsupported() + } + onDidChangeLanguageModelGroups: ILanguageModelsConfigurationService['onDidChangeLanguageModelGroups'] = + Event.None + + getLanguageModelsProviderGroups: ILanguageModelsConfigurationService['getLanguageModelsProviderGroups'] = + () => [] + @Unsupported + addLanguageModelsProviderGroup: ILanguageModelsConfigurationService['addLanguageModelsProviderGroup'] = + unsupported + @Unsupported + updateLanguageModelsProviderGroup: ILanguageModelsConfigurationService['updateLanguageModelsProviderGroup'] = + unsupported + @Unsupported + removeLanguageModelsProviderGroup: ILanguageModelsConfigurationService['removeLanguageModelsProviderGroup'] = + unsupported + @Unsupported + configureLanguageModels: ILanguageModelsConfigurationService['configureLanguageModels'] = + unsupported +} + +registerSingleton( + ILanguageModelsConfigurationService, + LanguageModelsConfigurationService, + InstantiationType.Delayed +) + +class ChatTipService implements IChatTipService { + _serviceBrand: undefined + + getNextTip: IChatTipService['getNextTip'] = () => undefined +} + +registerSingleton(IChatTipService, ChatTipService, InstantiationType.Delayed) + +class ChatEditingExplanationModelManager implements IChatEditingExplanationModelManager { + _serviceBrand: undefined + + state: IChatEditingExplanationModelManager['state'] = constObservable(new ResourceMap()) + + @Unsupported + generateExplanations: IChatEditingExplanationModelManager['generateExplanations'] = unsupported +} + +registerSingleton( + IChatEditingExplanationModelManager, + ChatEditingExplanationModelManager, + InstantiationType.Delayed +) + +class ChatToolOutputStateCache implements IChatToolOutputStateCache { + _serviceBrand: undefined + get: IChatToolOutputStateCache['get'] = () => undefined + set: IChatToolOutputStateCache['set'] = () => {} +} + +registerSingleton(IChatToolOutputStateCache, ChatToolOutputStateCache, InstantiationType.Delayed) + +class TerminalSandboxService implements ITerminalSandboxService { + _serviceBrand: undefined + isEnabled: ITerminalSandboxService['isEnabled'] = async () => false + getSandboxConfigPath: ITerminalSandboxService['getSandboxConfigPath'] = async () => undefined + getTempDir: ITerminalSandboxService['getTempDir'] = () => undefined + + @Unsupported + wrapCommand: ITerminalSandboxService['wrapCommand'] = unsupported + + @Unsupported + setNeedsForceUpdateConfigFile: ITerminalSandboxService['setNeedsForceUpdateConfigFile'] = + unsupported +} + +registerSingleton(ITerminalSandboxService, TerminalSandboxService, InstantiationType.Delayed) + +registerSingleton(IWorkbenchModeService, DefaultWorkbenchModeService, InstantiationType.Delayed) diff --git a/src/service-override/base.ts b/src/service-override/base.ts index add002c6..8260e35b 100644 --- a/src/service-override/base.ts +++ b/src/service-override/base.ts @@ -37,6 +37,8 @@ import { MarkdownRendererService } from 'vs/platform/markdown/browser/markdownRe import { IUserAttentionService } from 'vs/workbench/services/userAttention/common/userAttentionService.service' import { UserAttentionService } from 'vs/workbench/services/userAttention/browser/userAttentionBrowser' import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService' +import { IRenameSymbolTrackerService } from 'vs/editor/browser/services/renameSymbolTrackerService.service' +import { RenameSymbolTrackerService } from 'vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService' class BrowserPathServiceOverride extends AbstractPathService { constructor( @@ -74,6 +76,11 @@ export default function getServiceOverride(): IEditorOverrideServices { true ), [IMarkdownRendererService.toString()]: new SyncDescriptor(MarkdownRendererService, [], true), - [IUserAttentionService.toString()]: new SyncDescriptor(UserAttentionService, [], true) + [IUserAttentionService.toString()]: new SyncDescriptor(UserAttentionService, [], true), + [IRenameSymbolTrackerService.toString()]: new SyncDescriptor( + RenameSymbolTrackerService, + [], + true + ) } } diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index 31a8f711..19bb7ce8 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -78,6 +78,20 @@ import { AgentSessionsService } from 'vs/workbench/contrib/chat/browser/agentSes import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/widget/chatWidgetService' import { ICodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service' import { CodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart' +import { IAgentSessionProjectionService } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.service' +import { IAgentTitleBarStatusService } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.service' +import { ILanguageModelsConfigurationService } from 'vs/workbench/contrib/chat/common/languageModelsConfiguration.service' +import { IChatTipService } from 'vs/workbench/contrib/chat/browser/chatTipService.service' +import { IChatEditingExplanationModelManager } from 'vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service' +import { IChatToolOutputStateCache } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service' +import { AgentSessionProjectionService } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService' +import { AgentTitleBarStatusService } from 'vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService' +import { LanguageModelsConfigurationService } from 'vs/workbench/contrib/chat/browser/languageModelsConfigurationService' +import { ChatTipService } from 'vs/workbench/contrib/chat/browser/chatTipService' +import { ChatEditingExplanationModelManager } from 'vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager' +import { ChatToolOutputStateCache } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache' +import { ITerminalSandboxService } from 'vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service' +import { TerminalSandboxService } from 'vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService' import 'vs/workbench/contrib/chat/browser/chat.contribution' import 'vs/workbench/contrib/terminal/terminal.chat.contribution' import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution' @@ -160,6 +174,29 @@ export default function getServiceOverride(): IEditorOverrideServices { [IChatContextService.toString()]: new SyncDescriptor(ChatContextService, [], true), [ITerminalChatService.toString()]: new SyncDescriptor(TerminalChatService, [], true), [IAgentSessionsService.toString()]: new SyncDescriptor(AgentSessionsService, [], true), - [ICodeCompareModelService.toString()]: new SyncDescriptor(CodeCompareModelService, [], true) + [ICodeCompareModelService.toString()]: new SyncDescriptor(CodeCompareModelService, [], true), + [IAgentSessionProjectionService.toString()]: new SyncDescriptor( + AgentSessionProjectionService, + [], + true + ), + [IAgentTitleBarStatusService.toString()]: new SyncDescriptor( + AgentTitleBarStatusService, + [], + true + ), + [ILanguageModelsConfigurationService.toString()]: new SyncDescriptor( + LanguageModelsConfigurationService, + [], + true + ), + [IChatTipService.toString()]: new SyncDescriptor(ChatTipService, [], true), + [IChatEditingExplanationModelManager.toString()]: new SyncDescriptor( + ChatEditingExplanationModelManager, + [], + true + ), + [IChatToolOutputStateCache.toString()]: new SyncDescriptor(ChatToolOutputStateCache, [], true), + [ITerminalSandboxService.toString()]: new SyncDescriptor(TerminalSandboxService, [], true) } } diff --git a/src/service-override/layout.ts b/src/service-override/layout.ts index 0151f51a..74a90871 100644 --- a/src/service-override/layout.ts +++ b/src/service-override/layout.ts @@ -1,9 +1,33 @@ +import type { IDisposable } from '@xterm/headless' +import * as dom from 'vs/base/browser/dom' +import { isAncestorUsingFlowTo } from 'vs/base/browser/dom' +import type { IViewSize } from 'vs/base/browser/ui/grid/gridview' +import { coalesce } from 'vs/base/common/arrays' +import { Emitter, Event } from 'vs/base/common/event' +import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle' +import { isChrome, isFirefox, isLinux, isSafari, isWindows } from 'vs/base/common/platform' +import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService.service' +import { StandaloneCodeEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor' import { type IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' +import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' +import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' +import type { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' +import type { ILayoutOffsetInfo } from 'vs/platform/layout/browser/layoutService' +import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' +import { getMenuBarVisibility, getTitleBarStyle } from 'vs/platform/window/common/window' +import { Part } from 'vs/workbench/browser/part' +import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart' +import { type IViewContainerModel, ViewContainerLocation } from 'vs/workbench/common/views' +import { IViewDescriptorService } from 'vs/workbench/common/views.service' +import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service' +import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' +import { IHostService } from 'vs/workbench/services/host/browser/host.service' import { ActivityBarPosition, + type IPartVisibilityChangeEvent, LayoutSettings, type PanelAlignment, Parts, @@ -12,35 +36,13 @@ import { positionToString } from 'vs/workbench/services/layout/browser/layoutService' import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service' -import type { ILayoutOffsetInfo } from 'vs/platform/layout/browser/layoutService' -import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service' -import { Emitter, Event } from 'vs/base/common/event' -import * as dom from 'vs/base/browser/dom' -import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { Part } from 'vs/workbench/browser/part' -import { isAncestorUsingFlowTo } from 'vs/base/browser/dom' +import { WorkbenchModeService } from 'vs/workbench/services/layout/browser/workbenchModeService' +import { IWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.service' import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite.service' -import { type IViewContainerModel, ViewContainerLocation } from 'vs/workbench/common/views' -import { IViewDescriptorService } from 'vs/workbench/common/views.service' -import { isChrome, isFirefox, isLinux, isSafari, isWindows } from 'vs/base/common/platform' -import { coalesce } from 'vs/base/common/arrays' -import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart' -import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService.service' import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar.service' -import type { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' -import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' -import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle' -import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service' -import { StandaloneCodeEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor' -import { IHostService } from 'vs/workbench/services/host/browser/host.service' -import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService.service' -import { getMenuBarVisibility, getTitleBarStyle } from 'vs/platform/window/common/window' -import type { IDisposable } from '@xterm/headless' -import type { IViewSize } from 'vs/base/browser/ui/grid/gridview' import { onRenderWorkbench } from '../lifecycle' -import { getWorkbenchContainer } from '../workbench' import { unsupported } from '../tools' - +import { getWorkbenchContainer } from '../workbench' export class LayoutService extends Disposable implements ILayoutService, IWorkbenchLayoutService { declare readonly _serviceBrand: undefined @@ -451,7 +453,7 @@ export class LayoutService extends Disposable implements ILayoutService, IWorkbe } else { this.hiddenParts.delete(part) } - this._onDidChangePartVisibility.fire() + this._onDidChangePartVisibility.fire({ partId: part, visible: !hidden }) const location = (>>{ [Parts.SIDEBAR_PART]: ViewContainerLocation.Sidebar, @@ -521,7 +523,7 @@ export class LayoutService extends Disposable implements ILayoutService, IWorkbe return true } - private _onDidChangePartVisibility = new Emitter() + private _onDidChangePartVisibility = new Emitter() onDidChangePartVisibility = this._onDidChangePartVisibility.event readonly offset: ILayoutOffsetInfo = { top: 0, quickPickTop: 0 } @@ -589,7 +591,8 @@ function getServiceOverride(container?: HTMLElement): IEditorOverrideServices function getServiceOverride(container?: HTMLElement): IEditorOverrideServices { return { - [ILayoutService.toString()]: new SyncDescriptor(LayoutService, [container], true) + [ILayoutService.toString()]: new SyncDescriptor(LayoutService, [container], true), + [IWorkbenchModeService.toString()]: new SyncDescriptor(WorkbenchModeService, [], true) } } diff --git a/src/service-override/treesitter.ts b/src/service-override/treesitter.ts index 2ff7707b..0553cea8 100644 --- a/src/service-override/treesitter.ts +++ b/src/service-override/treesitter.ts @@ -5,20 +5,27 @@ import { ITreeSitterThemeService } from 'vs/editor/common/services/treeSitter/tr import { TreeSitterThemeService } from 'vs/workbench/services/treeSitter/browser/treeSitterThemeService' import { ITreeSitterLibraryService } from 'vs/editor/common/services/treeSitter/treeSitterLibraryService.service' import { TreeSitterLibraryService } from 'vs/workbench/services/treeSitter/browser/treeSitterLibraryService' +import treeSitterAssets from '@vscode/tree-sitter-wasm/wasm/tree-sitter-*.wasm' +// @ts-expect-error -- `declare module` syntax doesn't support escaping `*` in the path not having more than one wildcard +import treeSitterScmAssets from 'vs/editor/common/languages/**/*.scm' +import { nodeModulesPath } from 'vs/base/common/network' +import { FileAccess } from 'vs/base/common/network' + +// Don't use registerAssets for tree-sitter assets, because we also need to return an unresolvable url for files that doesn't exists +FileAccess.registerAppResourceLoader((moduleId) => { + if (moduleId.startsWith('vs/editor/common/languages/') && moduleId.endsWith('.scm')) { + return treeSitterScmAssets[moduleId] ?? `not-found:///${moduleId}` + } +}) registerAssets({ - 'vs/../../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm': new URL( + [`${nodeModulesPath}/@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm`]: new URL( '@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm', import.meta.url ).href, - 'vs/../../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm': new URL( - '@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm', - import.meta.url - ).href, - 'vs/editor/common/languages/highlights/typescript.scm': new URL( - '../../vscode/src/vs/editor/common/languages/highlights/typescript.scm', - import.meta.url - ).href + ...Object.fromEntries( + Object.entries(treeSitterAssets).map(([key, value]) => [`${nodeModulesPath}/${key}`, value]) + ) }) export default function getServiceOverride(): IEditorOverrideServices { diff --git a/src/types.d.ts b/src/types.d.ts index a4c77e86..e96ef7ed 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -5,6 +5,11 @@ declare module 'vs/platform/accessibilitySignal/browser/media/*.mp3' { export default assets } +declare module '@vscode/tree-sitter-wasm/wasm/tree-sitter-*.wasm' { + const assets: Record + export default assets +} + declare module 'vs/workbench/contrib/debug/browser/media/*.png' { const assets: Record export default assets diff --git a/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch b/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch index 6677c8a3..88e72838 100644 --- a/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch +++ b/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch @@ -5,12 +5,12 @@ Subject: [PATCH] feat: add static asset url mechanism --- src/tsec.exemptions.json | 1 + - src/vs/base/common/network.ts | 33 ++- + src/vs/base/common/network.ts | 44 +++- .../api/browser/mainThreadExtensionService.ts | 7 + .../workbench/api/common/extHost.protocol.ts | 1 + .../workbench/api/common/extensionHostMain.ts | 5 + .../api/worker/extensionHostWorker.ts | 222 +++++++++++++----- - 6 files changed, 208 insertions(+), 61 deletions(-) + 6 files changed, 219 insertions(+), 61 deletions(-) diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index 83691e2de5a..359518360b6 100644 @@ -25,7 +25,7 @@ index 83691e2de5a..359518360b6 100644 "vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts", "vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts" diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts -index e47b42672fb..b6b16332f5f 100644 +index 74cb106fd3c..bb963d537c8 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -8,6 +8,8 @@ import * as platform from './platform.js'; @@ -37,28 +37,39 @@ index e47b42672fb..b6b16332f5f 100644 export namespace Schemas { -@@ -270,6 +272,20 @@ export const VSCODE_AUTHORITY = 'vscode-app'; +@@ -275,6 +277,31 @@ export const VSCODE_AUTHORITY = 'vscode-app'; class FileAccessImpl { private static readonly FALLBACK_AUTHORITY = VSCODE_AUTHORITY; + private staticBrowserUris = new ResourceMap(); + private appResourcePathUrls = new Map string)>(); ++ private appResourceUrlMapper: ((moduleId: string) => string | undefined)[] = []; + + public registerAppResourcePathUrl(moduleId: string, url: string | (() => string)): void { + this.appResourcePathUrls.set(moduleId, url); + } + ++ public registerAppResourceLoader(loader: (moduleId: string) => string | undefined): void { ++ this.appResourceUrlMapper.push(loader); ++ } ++ + private toUrl(moduleId: string): string { + let url = this.appResourcePathUrls.get(moduleId); + if (typeof url === 'function') { + url = url(); + } ++ for (const mapper of this.appResourceUrlMapper) { ++ const result = mapper(moduleId); ++ if (result) { ++ return result; ++ } ++ } + return new URL(url ?? moduleId, globalThis.location?.href ?? import.meta.url).toString(); + } /** * Returns a URI to use in contexts where the browser is responsible -@@ -317,7 +333,7 @@ class FileAccessImpl { +@@ -322,7 +349,7 @@ class FileAccessImpl { }); } @@ -67,7 +78,7 @@ index e47b42672fb..b6b16332f5f 100644 } /** -@@ -368,7 +384,20 @@ class FileAccessImpl { +@@ -373,7 +400,20 @@ class FileAccessImpl { return URI.file(modulePath); } @@ -108,10 +119,10 @@ index 4cfaf6a58cb..b7f63a0d276 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 fa015c3f912..f047d29b62b 100644 +index 3ea06f3076a..4a47e80969d 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts -@@ -1661,6 +1661,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { +@@ -1694,6 +1694,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-patches/0007-fix-apply-style-only-on-standalone-editors.patch b/vscode-patches/0007-fix-apply-style-only-on-standalone-editors.patch index 89fd0263..11b71158 100644 --- a/vscode-patches/0007-fix-apply-style-only-on-standalone-editors.patch +++ b/vscode-patches/0007-fix-apply-style-only-on-standalone-editors.patch @@ -80,18 +80,18 @@ index 8196bcd7174..d466efb1777 100644 public static validateOptions(options: IEditorOptions): ValidatedEditorOptions { const result = new ValidatedEditorOptions(); diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts -index 6687e50593d..603d3ae12bd 100644 +index 174eea21c6a..28797d2feba 100644 --- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts -@@ -285,6 +285,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE +@@ -295,6 +295,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE this._configuration = this._register(this._createConfiguration(codeEditorWidgetOptions.isSimpleWidget || false, codeEditorWidgetOptions.contextMenuId ?? (codeEditorWidgetOptions.isSimpleWidget ? MenuId.SimpleEditorContext : MenuId.EditorContext), + codeEditorWidgetOptions.isStandaloneEditor || false, options, accessibilityService)); + this._domElement.style?.setProperty('--editor-font-size', this._configuration.options.get(EditorOption.fontSize) + 'px'); this._register(this._configuration.onDidChange((e) => { - this._onDidChangeConfiguration.fire(e); -@@ -393,8 +394,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE +@@ -407,8 +408,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE this._modelData?.view.writeScreenReaderContent(reason); } @@ -102,7 +102,7 @@ index 6687e50593d..603d3ae12bd 100644 } public getId(): string { -@@ -2053,6 +2054,12 @@ export interface ICodeEditorWidgetOptions { +@@ -2088,6 +2089,12 @@ export interface ICodeEditorWidgetOptions { */ isSimpleWidget?: boolean; diff --git a/vscode-patches/0008-fix-use-existing-method.patch b/vscode-patches/0008-fix-use-existing-method.patch index fe02e759..a2513610 100644 --- a/vscode-patches/0008-fix-use-existing-method.patch +++ b/vscode-patches/0008-fix-use-existing-method.patch @@ -8,10 +8,10 @@ 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 44e4b54d1b7..297656736cc 100644 +index 61aa37410e2..ebef484db46 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts -@@ -556,7 +556,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { +@@ -558,7 +558,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { // This might be a removal keybinding item in user settings => accept it result[resultLen++] = new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, isDefault, null, false); } else { diff --git a/vscode-patches/0009-refactor-split-code.patch b/vscode-patches/0009-refactor-split-code.patch index c543658d..2563f571 100644 --- a/vscode-patches/0009-refactor-split-code.patch +++ b/vscode-patches/0009-refactor-split-code.patch @@ -9,10 +9,10 @@ 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 297656736cc..b2c255d98da 100644 +index ebef484db46..b37e2b32894 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts -@@ -527,15 +527,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { +@@ -529,15 +529,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { }); } @@ -35,10 +35,10 @@ index 297656736cc..b2c255d98da 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 aa62f865df0..e19d172e7a9 100644 +index bb0fb4f2643..2af5fbeff0a 100644 --- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts -@@ -438,10 +438,14 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { +@@ -439,10 +439,14 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { this._onDidUpdateKeybindings.fire(); } diff --git a/vscode-patches/0010-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch b/vscode-patches/0010-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch index 9645c763..df61d0ae 100644 --- a/vscode-patches/0010-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch +++ b/vscode-patches/0010-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch @@ -9,10 +9,10 @@ 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 b2c255d98da..6ff655b013a 100644 +index b37e2b32894..3b05d4d2460 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts -@@ -88,8 +88,6 @@ import { DefaultConfiguration } from '../../../platform/configuration/common/con +@@ -89,8 +89,6 @@ import { DefaultConfiguration } from '../../../platform/configuration/common/con import { WorkspaceEdit } from '../../common/languages.js'; import { AccessibilitySignal, AccessibilityModality, IAccessibilitySignalService, Sound } from '../../../platform/accessibilitySignal/browser/accessibilitySignalService.js'; import { LogService } from '../../../platform/log/common/logService.js'; @@ -21,7 +21,7 @@ index b2c255d98da..6ff655b013a 100644 import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from '../../../platform/environment/common/environment.js'; import { mainWindow } from '../../../base/browser/window.js'; import { ResourceMap } from '../../../base/common/map.js'; -@@ -1227,16 +1225,6 @@ export namespace StandaloneServices { +@@ -1244,16 +1242,6 @@ export namespace StandaloneServices { } } diff --git a/vscode-patches/0011-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch b/vscode-patches/0011-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch index 11ed8084..c7f48a9e 100644 --- a/vscode-patches/0011-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch +++ b/vscode-patches/0011-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch @@ -77,7 +77,7 @@ index 3d83476e176..a80f0b9a7f2 100644 } } diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts -index 265b63c9ab6..eb889235f1a 100644 +index 3a1a2c0c388..1d2719e2fb7 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -79,7 +79,6 @@ import { IHistoryService } from '../../../services/history/common/history.js'; @@ -88,7 +88,7 @@ index 265b63c9ab6..eb889235f1a 100644 import type { IMarker, Terminal as XTermTerminal, IBufferLine } from '@xterm/xterm'; import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js'; import { terminalStrings } from '../common/terminalStrings.js'; -@@ -772,7 +771,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { +@@ -770,7 +769,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { return xtermConstructor; } xtermConstructor = Promises.withAsyncBody(async (resolve) => { @@ -198,7 +198,7 @@ index 157e314ba7d..5bd3ead3d33 100644 // Using the response directly only works if the server sets the MIME type 'application/wasm'. diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts -index d410a975a99..a2a4a9bbf77 100644 +index 6b5bc990d72..1f48cd89cae 100644 --- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts +++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts @@ -3,7 +3,6 @@ @@ -219,7 +219,7 @@ index d410a975a99..a2a4a9bbf77 100644 } diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts -index 0e9f18f3d10..ebe149c6047 100644 +index 75053189914..557d07b936e 100644 --- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts +++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts @@ -3,8 +3,8 @@ diff --git a/vscode-patches/0012-feat-export-some-classes-and-make-some-methods-acces.patch b/vscode-patches/0012-feat-export-some-classes-and-make-some-methods-acces.patch index 36398428..013028a3 100644 --- a/vscode-patches/0012-feat-export-some-classes-and-make-some-methods-acces.patch +++ b/vscode-patches/0012-feat-export-some-classes-and-make-some-methods-acces.patch @@ -19,6 +19,7 @@ Subject: [PATCH] feat: export some classes and make some methods accessible .../browser/chatStatus/chatStatusItemService.ts | 2 +- .../chatContentParts/chatTextEditContentPart.ts | 6 +++--- .../debug/browser/extensionHostDebugService.ts | 2 +- + .../browser/renameSymbolTrackerService.ts | 2 +- .../contrib/issue/browser/issueTroubleshoot.ts | 6 +++--- .../dialogs/browser/abstractFileDialogService.ts | 2 +- .../services/dialogs/browser/fileDialogService.ts | 4 ++-- @@ -40,7 +41,7 @@ Subject: [PATCH] feat: export some classes and make some methods accessible .../terminal/common/embedderTerminalService.ts | 2 +- .../common/remoteUserDataProfiles.ts | 2 +- .../userDataSync/common/userDataSyncUtil.ts | 2 +- - 36 files changed, 65 insertions(+), 61 deletions(-) + 37 files changed, 66 insertions(+), 62 deletions(-) diff --git a/src/vs/editor/contrib/editorState/browser/keybindingCancellation.ts b/src/vs/editor/contrib/editorState/browser/keybindingCancellation.ts index 94020ce96b9..de1e9af237e 100644 @@ -130,7 +131,7 @@ index fe9cffb401e..e7799461337 100644 export namespace PeekContext { export const inPeekEditor = new RawContextKey('inReferenceSearchEditor', true, nls.localize('inReferenceSearchEditor', "Whether the current code editor is embedded inside peek")); diff --git a/src/vs/platform/actionWidget/browser/actionWidget.ts b/src/vs/platform/actionWidget/browser/actionWidget.ts -index 5ab460e6790..2e037dca7ba 100644 +index 21b49245beb..495b1c9fdfc 100644 --- a/src/vs/platform/actionWidget/browser/actionWidget.ts +++ b/src/vs/platform/actionWidget/browser/actionWidget.ts @@ -43,7 +43,7 @@ export interface IActionWidgetService { @@ -169,7 +170,7 @@ index 921674ef18e..00b83a75fcb 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts -index b775ea6cf10..6bea97100b9 100644 +index 493471fe856..3a098814ba1 100644 --- a/src/vs/platform/files/common/fileService.ts +++ b/src/vs/platform/files/common/fileService.ts @@ -243,9 +243,9 @@ export class FileService extends Disposable implements IFileService { @@ -199,7 +200,7 @@ index 4da1f68eeb1..81de1362184 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index a6b87ac6aec..ff5708e1a86 100644 +index da337f0d06e..a60b399fcf1 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -50,7 +50,7 @@ import { CodeWindow, mainWindow } from '../../base/browser/window.js'; @@ -241,7 +242,7 @@ index a6b87ac6aec..ff5708e1a86 100644 readonly filesToDiff?: IPathToOpen[]; readonly filesToMerge?: IPathToOpen[]; diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index afe48b84b2e..baae338937f 100644 +index 10e2c3edace..91ba0f472a6 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -86,7 +86,7 @@ export class Workbench extends Layout { @@ -251,9 +252,9 @@ index afe48b84b2e..baae338937f 100644 - private registerErrorHandler(logService: ILogService): void { + protected registerErrorHandler(logService: ILogService): void { - // Listen on unhandled rejection events - // Note: intentionally not registered as disposable to handle -@@ -105,7 +105,7 @@ export class Workbench extends Layout { + // Increase stack trace limit for better errors stacks + if (!isFirefox) { +@@ -110,7 +110,7 @@ export class Workbench extends Layout { } private previousUnexpectedError: { message: string | undefined; time: number } = { message: undefined, time: 0 }; @@ -262,7 +263,7 @@ index afe48b84b2e..baae338937f 100644 const message = toErrorMessage(error, true); if (!message) { return; -@@ -184,7 +184,7 @@ export class Workbench extends Layout { +@@ -189,7 +189,7 @@ export class Workbench extends Layout { } } @@ -271,7 +272,7 @@ index afe48b84b2e..baae338937f 100644 // Layout Service serviceCollection.set(IWorkbenchLayoutService, this); -@@ -223,7 +223,7 @@ export class Workbench extends Layout { +@@ -228,7 +228,7 @@ export class Workbench extends Layout { return instantiationService; } @@ -280,7 +281,7 @@ index afe48b84b2e..baae338937f 100644 // Configuration changes this._register(configurationService.onDidChangeConfiguration(e => this.updateFontAliasing(e, configurationService))); -@@ -312,7 +312,7 @@ export class Workbench extends Layout { +@@ -317,7 +317,7 @@ export class Workbench extends Layout { } } @@ -289,7 +290,7 @@ index afe48b84b2e..baae338937f 100644 // ARIA & Signals setARIAContainer(this.mainContainer); -@@ -374,7 +374,7 @@ export class Workbench extends Layout { +@@ -379,7 +379,7 @@ export class Workbench extends Layout { return part; } @@ -298,7 +299,7 @@ index afe48b84b2e..baae338937f 100644 // Instantiate Notification components const notificationsCenter = this._register(instantiationService.createInstance(NotificationsCenter, this.mainContainer, notificationService.model)); -@@ -404,7 +404,7 @@ export class Workbench extends Layout { +@@ -409,7 +409,7 @@ export class Workbench extends Layout { }); } @@ -321,7 +322,7 @@ index b87135ccce6..dae96febb2b 100644 private readonly _entries = new Map(); diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts -index 959ef8b2347..a8977581578 100644 +index 4305cc54d72..d4d363592a2 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts @@ -32,9 +32,9 @@ import { IChatContentPart, IChatContentPartRenderContext } from './chatContentPa @@ -336,7 +337,7 @@ index 959ef8b2347..a8977581578 100644 _serviceBrand: undefined; createModel(response: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise>; } -@@ -133,7 +133,7 @@ export class ChatTextEditContentPart extends Disposable implements IChatContentP +@@ -124,7 +124,7 @@ export class ChatTextEditContentPart extends Disposable implements IChatContentP } } @@ -358,6 +359,19 @@ index 1e48c939054..1be394d7a9b 100644 private static readonly LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY = 'debug.lastExtensionDevelopmentWorkspace'; +diff --git a/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.ts b/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.ts +index 2ac90546d65..d7d382341f6 100644 +--- a/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.ts ++++ b/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.ts +@@ -211,7 +211,7 @@ class ModelSymbolRenameTracker extends Disposable { + } + } + +-class RenameSymbolTrackerService extends Disposable implements IRenameSymbolTrackerService { ++export class RenameSymbolTrackerService extends Disposable implements IRenameSymbolTrackerService { + public _serviceBrand: undefined; + + private readonly _modelTrackers = new Map(); diff --git a/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts b/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts index 5b019f38d09..24e9f6cceec 100644 --- a/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts @@ -384,7 +398,7 @@ index 5b019f38d09..24e9f6cceec 100644 readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts -index 20fb991dde8..c0a130ce28e 100644 +index bb082edfd8d..41cfefdb4b7 100644 --- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts @@ -54,7 +54,7 @@ export abstract class AbstractFileDialogService implements IFileDialogService { @@ -432,7 +446,7 @@ index 940a4e0ce46..881aebdeb5c 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts -index f79e5389edb..3c66b79c20a 100644 +index bb344df9567..e870a5c2886 100644 --- a/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts +++ b/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts @@ -9,7 +9,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta @@ -502,7 +516,7 @@ index a7b67f152e3..2e8f9e75f51 100644 readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts -index 597e065ddfc..26f98d97f25 100644 +index a95e4ae1b50..12c89a55c89 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -82,7 +82,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost @@ -515,10 +529,10 @@ index 597e065ddfc..26f98d97f25 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 b207618675d..590f0b91995 100644 +index a0e599cd4b4..e669ffb1841 100644 --- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts +++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts -@@ -99,9 +99,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx +@@ -100,9 +100,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx constructor( options: { hasLocalProcess: boolean; allowRemoteExtensionsInLocalWebWorker: boolean }, @@ -531,7 +545,7 @@ index b207618675d..590f0b91995 100644 @IInstantiationService protected readonly _instantiationService: IInstantiationService, @INotificationService protected readonly _notificationService: INotificationService, @IWorkbenchEnvironmentService protected readonly _environmentService: IWorkbenchEnvironmentService, -@@ -239,7 +239,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx +@@ -240,7 +240,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx //#region deltaExtensions @@ -540,7 +554,7 @@ index b207618675d..590f0b91995 100644 this._deltaExtensionsQueue.push(item); if (this._inHandleDeltaExtensions) { // Let the current item finish, the new one will be picked up -@@ -1372,7 +1372,7 @@ export interface IExtensionHostFactory { +@@ -1415,7 +1415,7 @@ export interface IExtensionHostFactory { createExtensionHost(runningLocations: ExtensionRunningLocationTracker, runningLocation: ExtensionRunningLocation, isInitialStart: boolean): IExtensionHost | null; } @@ -550,10 +564,10 @@ index b207618675d..590f0b91995 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 e19d172e7a9..cc2e76c3994 100644 +index 2af5fbeff0a..481d713f969 100644 --- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts -@@ -433,7 +433,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { +@@ -434,7 +434,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { return this.userKeybindings.keybindings.length; } diff --git a/vscode-patches/0013-fix-improve-extension-contribution-types.patch b/vscode-patches/0013-fix-improve-extension-contribution-types.patch index d8b2b9b5..d127590e 100644 --- a/vscode-patches/0013-fix-improve-extension-contribution-types.patch +++ b/vscode-patches/0013-fix-improve-extension-contribution-types.patch @@ -4,14 +4,14 @@ Date: Mon, 11 Mar 2024 17:38:30 +0100 Subject: [PATCH] fix: improve extension contribution types --- - .../platform/extensions/common/extensions.ts | 1441 ++++++++++++++++- + .../platform/extensions/common/extensions.ts | 1438 ++++++++++++++++- .../services/search/common/queryBuilder.ts | 8 +- .../themes/common/colorExtensionPoint.ts | 2 +- .../tokenClassificationExtensionPoint.ts | 1 + - 4 files changed, 1382 insertions(+), 70 deletions(-) + 4 files changed, 1379 insertions(+), 70 deletions(-) diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts -index 8961b9011b3..5736958c790 100644 +index 021ad016e02..a9eab9384cf 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts @@ -3,6 +3,7 @@ @@ -369,8 +369,10 @@ index 8961b9011b3..5736958c790 100644 + * Path of the tmTheme file. The path is relative to the extension folder and is typically './colorthemes/awesome-color-theme.json'. + */ + readonly path: string; -+} -+ + } + +-export interface ITheme { +- label: string; +export interface IIconTheme { + /** + * Id of the file icon theme as used in the user settings. @@ -384,10 +386,8 @@ index 8961b9011b3..5736958c790 100644 + * Path of the file icon theme definition file. The path is relative to the extension folder and is typically './fileicons/awesome-icon-theme.json'. + */ + readonly path: string; - } - --export interface ITheme { -- label: string; ++} ++ +export interface IProductTheme { + /** + * Id of the product icon theme as used in the user settings. @@ -646,6 +646,7 @@ index 8961b9011b3..5736958c790 100644 + * Human readable name of the notebook output renderer. + */ readonly displayName: string; +- readonly mimeTypes: string[]; + readonly dependencies?: string[]; + readonly optionalDependencies?: string[]; + /** @@ -655,7 +656,7 @@ index 8961b9011b3..5736958c790 100644 + /** + * Set of globs that the notebook is for. + */ - readonly mimeTypes: string[]; ++ readonly mimeTypes: string[]; + readonly entrypoint: string | { + readonly extends: string; + readonly path: string; @@ -669,7 +670,6 @@ index 8961b9011b3..5736958c790 100644 export interface ITranslation { - id: string; - path: string; --} + /** + * Id of VS Code or Extension for which this translation is contributed to. Id of VS Code is always `vscode` and of extension should be in format `publisherId.extensionName`. + */ @@ -678,7 +678,7 @@ index 8961b9011b3..5736958c790 100644 + * A relative path to a file containing translations for the language. + */ + readonly path: string; -+} + } export interface ILocalizationContribution { + /** @@ -1377,7 +1377,7 @@ index 8961b9011b3..5736958c790 100644 } export interface IChatParticipantContribution { -@@ -200,35 +1358,188 @@ export interface IMcpCollectionContribution { +@@ -206,31 +1364,106 @@ export interface IChatFileContribution { } export interface IExtensionContributions { @@ -1502,6 +1502,9 @@ index 8961b9011b3..5736958c790 100644 readonly debugVisualizers?: IDebugVisualizationContribution[]; + readonly chatParticipants?: ReadonlyArray; + readonly chatPromptFiles?: ReadonlyArray; + readonly chatInstructions?: ReadonlyArray; +@@ -239,6 +1472,81 @@ export interface IExtensionContributions { readonly languageModelTools?: ReadonlyArray; readonly languageModelToolSets?: ReadonlyArray; readonly mcpServerDefinitionProviders?: ReadonlyArray; @@ -1577,20 +1580,17 @@ index 8961b9011b3..5736958c790 100644 + * A list of languages that participate with the HTML language server. + */ + readonly htmlLanguageParticipants?: IHtmlLanguageParticipant[]; -+ readonly html?: { -+ customData?: string[]; -+ }; + readonly css?: { -+ customData?: string[]; -+ }; ++ path: string; ++ }[]; } export interface IExtensionCapabilities { diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts -index 68487ac7bf6..27dc4f72918 100644 +index e2beb5012b6..c0dacc7dc83 100644 --- a/src/vs/workbench/services/search/common/queryBuilder.ts +++ b/src/vs/workbench/services/search/common/queryBuilder.ts -@@ -613,10 +613,10 @@ export class QueryBuilder { +@@ -615,10 +615,10 @@ export class QueryBuilder { folderName: includeFolderName ? folderName : undefined, excludePattern: excludePatternRet, fileEncoding: folderConfig.files && folderConfig.files.encoding, @@ -1602,9 +1602,9 @@ index 68487ac7bf6..27dc4f72918 100644 + disregardGlobalIgnoreFiles: typeof options.disregardGlobalIgnoreFiles === 'boolean' ? options.disregardGlobalIgnoreFiles : !folderConfig.search?.useGlobalIgnoreFiles, + disregardParentIgnoreFiles: typeof options.disregardParentIgnoreFiles === 'boolean' ? options.disregardParentIgnoreFiles : !folderConfig.search?.useParentIgnoreFiles, + ignoreSymlinks: typeof options.ignoreSymlinks === 'boolean' ? options.ignoreSymlinks : !folderConfig.search?.followSymlinks, + ignoreGlobCase: options.ignoreGlobCase, }; } - } diff --git a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts index 889c61bb08c..b392cc8614f 100644 --- a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts diff --git a/vscode-patches/0018-cleanup-remove-non-ESM-compatible-code.patch b/vscode-patches/0018-cleanup-remove-non-ESM-compatible-code.patch index da7dc47f..98b540de 100644 --- a/vscode-patches/0018-cleanup-remove-non-ESM-compatible-code.patch +++ b/vscode-patches/0018-cleanup-remove-non-ESM-compatible-code.patch @@ -8,7 +8,7 @@ Subject: [PATCH] cleanup: remove non-ESM compatible code 1 file changed, 18 deletions(-) diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts -index db779d8fd3f..fabd08cfe13 100644 +index bb0fb8eec64..4c45507aa82 100644 --- a/src/vs/workbench/api/node/extensionHostProcess.ts +++ b/src/vs/workbench/api/node/extensionHostProcess.ts @@ -73,24 +73,6 @@ const args = minimist(process.argv.slice(2), { diff --git a/vscode-patches/0020-refactor-split-some-modules-to-be-able-to-import-the.patch b/vscode-patches/0020-refactor-split-some-modules-to-be-able-to-import-the.patch index 1a4de0ec..0d0b0fb1 100644 --- a/vscode-patches/0020-refactor-split-some-modules-to-be-able-to-import-the.patch +++ b/vscode-patches/0020-refactor-split-some-modules-to-be-able-to-import-the.patch @@ -567,7 +567,7 @@ index c8fc8aa2dd2..1ea10370c97 100644 handler: (accessor, resource: URI | object) => { diff --git a/src/vs/workbench/contrib/files/browser/files.contribution._configuration.ts b/src/vs/workbench/contrib/files/browser/files.contribution._configuration.ts new file mode 100644 -index 00000000000..69cf99eaeb5 +index 00000000000..e9173033499 --- /dev/null +++ b/src/vs/workbench/contrib/files/browser/files.contribution._configuration.ts @@ -0,0 +1,297 @@ @@ -710,7 +710,7 @@ index 00000000000..69cf99eaeb5 + '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."), ++ 'description': nls.localize('trimTrailingWhitespaceInRegexAndStrings', "When enabled, trailing whitespace will be removed from multiline strings and regexes 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': { @@ -1299,7 +1299,7 @@ index 00000000000..8064ddc028c + } +}); diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts -index 87030a89665..269fb34cadb 100644 +index 53918c80b78..269fb34cadb 100644 --- a/src/vs/workbench/contrib/files/browser/files.contribution.ts +++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts @@ -3,673 +3,7 @@ @@ -1546,7 +1546,7 @@ index 87030a89665..269fb34cadb 100644 - '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."), +- 'description': nls.localize('trimTrailingWhitespaceInRegexAndStrings', "When enabled, trailing whitespace will be removed from multiline strings and regexes 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': { diff --git a/vscode-patches/0023-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch b/vscode-patches/0023-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch index 21cf9e60..9c64dc0c 100644 --- a/vscode-patches/0023-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch +++ b/vscode-patches/0023-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch @@ -10,7 +10,7 @@ to be able to register the file before 1 file changed, 60 insertions(+), 48 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index 8574e038520..f12584a3137 100644 +index 23ea0f7354a..c890ef2216a 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -3,77 +3,89 @@ diff --git a/vscode-patches/0024-cleanup-remove-some-checks-and-warnings.patch b/vscode-patches/0024-cleanup-remove-some-checks-and-warnings.patch index 187e1a51..0436de10 100644 --- a/vscode-patches/0024-cleanup-remove-some-checks-and-warnings.patch +++ b/vscode-patches/0024-cleanup-remove-some-checks-and-warnings.patch @@ -26,7 +26,7 @@ index 2ae1ee4bfa3..431c298404a 100644 } diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 7585cf01c22..b4a16a03b59 100644 +index 2824da9bb28..e7c70789526 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -495,11 +495,6 @@ export class WebviewElement extends Disposable implements IWebviewElement, Webvi @@ -72,7 +72,7 @@ index 6e201931269..15b221bafb8 100644 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 26f98d97f25..af52ee0f93a 100644 +index 12c89a55c89..a98eba9ef40 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -117,8 +117,6 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost diff --git a/vscode-patches/0026-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch b/vscode-patches/0026-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch index 8dece6ec..7561dba8 100644 --- a/vscode-patches/0026-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch +++ b/vscode-patches/0026-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch @@ -10,7 +10,7 @@ Subject: [PATCH] fix: mark process supported as soon as there is a registered 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts -index 1ced4b60cb1..276ad985b00 100644 +index eb64d646a64..3a5cb1f685a 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -3,7 +3,7 @@ @@ -22,7 +22,7 @@ index 1ced4b60cb1..276ad985b00 100644 import { IProcessEnvironment, OperatingSystem } from '../../../base/common/platform.js'; import { URI, UriComponents } from '../../../base/common/uri.js'; import { createDecorator } from '../../instantiation/common/instantiation.js'; -@@ -1177,12 +1177,27 @@ export const TerminalExtensions = { +@@ -1178,12 +1178,27 @@ export const TerminalExtensions = { Backend: 'workbench.contributions.terminal.processBackend' }; @@ -50,7 +50,7 @@ index 1ced4b60cb1..276ad985b00 100644 /** * Registers a terminal backend for a remote authority. */ -@@ -1199,21 +1214,20 @@ class TerminalBackendRegistry implements ITerminalBackendRegistry { +@@ -1200,21 +1215,20 @@ class TerminalBackendRegistry implements ITerminalBackendRegistry { get backends(): ReadonlyMap { return this._backends; } diff --git a/vscode-patches/0027-fix-use-asBrowserUri-to-get-iframe-src.patch b/vscode-patches/0027-fix-use-asBrowserUri-to-get-iframe-src.patch index e725aca5..b9a7dbc8 100644 --- a/vscode-patches/0027-fix-use-asBrowserUri-to-get-iframe-src.patch +++ b/vscode-patches/0027-fix-use-asBrowserUri-to-get-iframe-src.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: use asBrowserUri to get iframe src 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index b4a16a03b59..f42132c7a38 100644 +index e7c70789526..87714cfbeec 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -13,8 +13,8 @@ import { streamToBuffer, VSBufferReadableStream } from '../../../../base/common/ diff --git a/vscode-patches/0028-feat-add-some-parameter-to-webview-iframes.patch b/vscode-patches/0028-feat-add-some-parameter-to-webview-iframes.patch index 94117892..410e98a0 100644 --- a/vscode-patches/0028-feat-add-some-parameter-to-webview-iframes.patch +++ b/vscode-patches/0028-feat-add-some-parameter-to-webview-iframes.patch @@ -8,7 +8,7 @@ Subject: [PATCH] feat: add some parameter to webview iframes 1 file changed, 3 insertions(+) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index f42132c7a38..f31b97b7089 100644 +index 87714cfbeec..32ade0b6580 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -444,6 +444,9 @@ export class WebviewElement extends Disposable implements IWebviewElement, Webvi diff --git a/vscode-patches/0034-cleanup-remove-code-that-we-will-run-ourselves.patch b/vscode-patches/0034-cleanup-remove-code-that-we-will-run-ourselves.patch index 2bf63325..07ff38ce 100644 --- a/vscode-patches/0034-cleanup-remove-code-that-we-will-run-ourselves.patch +++ b/vscode-patches/0034-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, 20 deletions(-) diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index baae338937f..fbff9375f73 100644 +index 91ba0f472a6..7796aae8a15 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -10,10 +10,7 @@ import { RunOnceScheduler, timeout } from '../../base/common/async.js'; @@ -40,7 +40,7 @@ index baae338937f..fbff9375f73 100644 import { AccessibilityProgressSignalScheduler } from '../../platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.js'; import { setProgressAccessibilitySignalScheduler } from '../../base/browser/ui/progressbar/progressAccessibilitySignal.js'; import { AccessibleViewRegistry } from '../../platform/accessibility/browser/accessibleViewRegistry.js'; -@@ -137,7 +130,6 @@ export class Workbench extends Layout { +@@ -142,7 +135,6 @@ export class Workbench extends Layout { const storageService = accessor.get(IStorageService); const configurationService = accessor.get(IConfigurationService); const hostService = accessor.get(IHostService); @@ -48,7 +48,7 @@ index baae338937f..fbff9375f73 100644 const dialogService = accessor.get(IDialogService); const notificationService = accessor.get(INotificationService) as NotificationService; const markdownRendererService = accessor.get(IMarkdownRendererService); -@@ -145,21 +137,9 @@ export class Workbench extends Layout { +@@ -150,21 +142,9 @@ export class Workbench extends Layout { // Set code block renderer for markdown rendering markdownRendererService.setDefaultCodeBlockRenderer(instantiationService.createInstance(EditorMarkdownCodeBlockRenderer)); diff --git a/vscode-patches/0036-feat-add-a-way-to-detect-if-localization-were-alread.patch b/vscode-patches/0036-feat-add-a-way-to-detect-if-localization-were-alread.patch index c1658b7c..0d0ee8d8 100644 --- a/vscode-patches/0036-feat-add-a-way-to-detect-if-localization-were-alread.patch +++ b/vscode-patches/0036-feat-add-a-way-to-detect-if-localization-were-alread.patch @@ -8,10 +8,10 @@ Subject: [PATCH] feat: add a way to detect if localization were already used 1 file changed, 7 insertions(+) diff --git a/src/vs/nls.ts b/src/vs/nls.ts -index e9183ad7d32..9d97f0bae1b 100644 +index 51644b01193..77b0e5d3f9b 100644 --- a/src/vs/nls.ts +++ b/src/vs/nls.ts -@@ -48,6 +48,12 @@ function _format(message: string, args: (string | number | boolean | undefined | +@@ -51,6 +51,12 @@ function _format(message: string, args: (string | number | boolean | undefined | return result; } @@ -24,7 +24,7 @@ index e9183ad7d32..9d97f0bae1b 100644 /** * Marks a string to be localized. Returns the localized string. * -@@ -92,6 +98,7 @@ export function localize(data: ILocalizeInfo | string /* | number when built */, +@@ -95,6 +101,7 @@ export function localize(data: ILocalizeInfo | string /* | number when built */, * depending on the target context. */ function lookupMessage(index: number, fallback: string | null): string { diff --git a/vscode-patches/0037-fix-move-action-from-service-file-to-contribution.patch b/vscode-patches/0037-fix-move-action-from-service-file-to-contribution.patch index 8995fc05..67c239e5 100644 --- a/vscode-patches/0037-fix-move-action-from-service-file-to-contribution.patch +++ b/vscode-patches/0037-fix-move-action-from-service-file-to-contribution.patch @@ -11,13 +11,13 @@ Subject: [PATCH] fix: move action from service file to contribution create mode 100644 src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService._contribution.ts diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts -index b63e894b1ea..85766da7eb3 100644 +index 2b50e71fab8..254a7412591 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts -@@ -31,6 +31,7 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg - import { DisposableStore } from '../../../../base/common/lifecycle.js'; - import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js'; +@@ -34,6 +34,7 @@ import { AccessibleViewRegistry } from '../../../../platform/accessibility/brows import { GettingStartedAccessibleView } from './gettingStartedAccessibleView.js'; + import { AgentSessionsWelcomePage } from '../../welcomeAgentSessions/browser/agentSessionsWelcome.js'; + import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js'; +import './gettingStartedService._contribution.js'; export * as icons from './gettingStartedIcons.js'; @@ -84,7 +84,7 @@ index 00000000000..827c6eac860 + } +}); diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts -index d672ea7b95e..88e31019260 100644 +index 2ae37f9fd8f..fe57a94034f 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -3,11 +3,10 @@ @@ -109,7 +109,7 @@ index d672ea7b95e..88e31019260 100644 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; import { checkGlobFileExists } from '../../../services/extensions/common/workspaceContains.js'; import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; -@@ -723,49 +722,4 @@ const convertRelativeMediaPathsToWebviewURIs = (basePath: URI, path: string | { +@@ -724,49 +723,4 @@ const convertRelativeMediaPathsToWebviewURIs = (basePath: URI, path: string | { } }; diff --git a/vscode-patches/0038-refactor-split-workbench-contribution.patch b/vscode-patches/0038-refactor-split-workbench-contribution.patch index 7e49299f..d7982448 100644 --- a/vscode-patches/0038-refactor-split-workbench-contribution.patch +++ b/vscode-patches/0038-refactor-split-workbench-contribution.patch @@ -4,42 +4,51 @@ Date: Tue, 16 Apr 2024 15:06:48 +0200 Subject: [PATCH] refactor: split workbench contribution --- - .../api/browser/extensionHost.contribution.ts | 29 ------------------- - .../api/browser/statusBarExtensionPoint.ts | 16 +++++++++- - .../common/jsonValidationExtensionPoint.ts | 15 ++++++++++ - .../languageConfigurationExtensionPoint.ts | 15 ++++++++++ - .../themes/common/colorExtensionPoint.ts | 15 ++++++++++ - .../themes/common/iconExtensionPoint.ts | 15 ++++++++++ - .../tokenClassificationExtensionPoint.ts | 12 ++++++++ + .../api/browser/extensionHost.contribution.ts | 36 ++++--------------- + .../api/browser/statusBarExtensionPoint.ts | 16 ++++++++- + .../common/jsonValidationExtensionPoint.ts | 15 ++++++++ + .../languageConfigurationExtensionPoint.ts | 15 ++++++++ + .../themes/browser/cssExtensionPoint.ts | 15 ++++++++ + .../themes/common/colorExtensionPoint.ts | 15 ++++++++ + .../themes/common/iconExtensionPoint.ts | 15 ++++++++ + .../tokenClassificationExtensionPoint.ts | 12 +++++++ src/vs/workbench/workbench.common.main.ts | 6 ++++ - 8 files changed, 93 insertions(+), 30 deletions(-) + 9 files changed, 115 insertions(+), 30 deletions(-) diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts -index 31f148f2024..1548e678c0b 100644 +index bfb284d9511..4e64e56391d 100644 --- a/src/vs/workbench/api/browser/extensionHost.contribution.ts +++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts -@@ -3,17 +3,6 @@ +@@ -3,17 +3,15 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js'; -import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; -- --// --- other interested parties + + // --- other interested parties -import { JSONValidationExtensionPoint } from '../common/jsonValidationExtensionPoint.js'; -import { ColorExtensionPoint } from '../../services/themes/common/colorExtensionPoint.js'; -import { IconExtensionPoint } from '../../services/themes/common/iconExtensionPoint.js'; -import { TokenClassificationExtensionPoints } from '../../services/themes/common/tokenClassificationExtensionPoint.js'; -import { LanguageConfigurationFileHandler } from '../../contrib/codeEditor/common/languageConfigurationExtensionPoint.js'; -import { StatusBarItemsExtensionPoint } from './statusBarExtensionPoint.js'; -- +-import { CSSExtensionPoint } from '../../services/themes/browser/cssExtensionPoint.js'; ++import '../common/jsonValidationExtensionPoint.js'; ++import '../../services/themes/common/colorExtensionPoint.js'; ++import '../../services/themes/common/iconExtensionPoint.js'; ++import '../../services/themes/common/tokenClassificationExtensionPoint.js'; ++import '../../contrib/codeEditor/common/languageConfigurationExtensionPoint.js'; ++import './statusBarExtensionPoint.js'; ++import '../../services/themes/browser/cssExtensionPoint.js'; + // --- mainThread participants import './mainThreadLocalization.js'; - import './mainThreadBulkEdits.js'; -@@ -96,21 +85,3 @@ import './mainThreadChatOutputRenderer.js'; +@@ -96,23 +94,3 @@ import './mainThreadChatStatus.js'; + import './mainThreadChatOutputRenderer.js'; import './mainThreadChatSessions.js'; import './mainThreadDataChannels.js'; - +- -export class ExtensionPoints implements IWorkbenchContribution { - - static readonly ID = 'workbench.contrib.extensionPoints'; @@ -54,6 +63,7 @@ index 31f148f2024..1548e678c0b 100644 - this.instantiationService.createInstance(TokenClassificationExtensionPoints); - this.instantiationService.createInstance(LanguageConfigurationFileHandler); - this.instantiationService.createInstance(StatusBarItemsExtensionPoint); +- this.instantiationService.createInstance(CSSExtensionPoint); - } -} - @@ -156,6 +166,36 @@ index 9b12b00eb96..fb720cb8c0c 100644 +} + +registerWorkbenchContribution2(LanguageConfigurationWorkbenchContribution.ID, LanguageConfigurationWorkbenchContribution, WorkbenchPhase.BlockStartup); +diff --git a/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts b/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts +index cdeca23bd2d..098f1357e6f 100644 +--- a/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts ++++ b/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts +@@ -16,6 +16,8 @@ import { createLinkElement } from '../../../../base/browser/dom.js'; + import { IWorkbenchThemeService } from '../common/workbenchThemeService.js'; + import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; + import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; ++import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; + + interface ICSSExtensionPoint { + path: string; +@@ -326,3 +328,16 @@ export class CSSExtensionPoint { + this.disposables.dispose(); + } + } ++ ++class TokenClassificationExtensionPointWorkbenchContribution implements IWorkbenchContribution { ++ ++ static readonly ID = 'workbench.contrib.cssExtensionPoint'; ++ ++ constructor( ++ @IInstantiationService private readonly instantiationService: IInstantiationService ++ ) { ++ this.instantiationService.createInstance(CSSExtensionPoint); ++ } ++} ++ ++registerWorkbenchContribution2(TokenClassificationExtensionPointWorkbenchContribution.ID, TokenClassificationExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts index b392cc8614f..bc4df0624f8 100644 --- a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts @@ -246,7 +286,7 @@ index d78e65afc3f..56bd057fb3e 100644 + +registerWorkbenchContribution2(TokenClassificationExtensionPointWorkbenchContribution.ID, TokenClassificationExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts -index e7c16a7de53..f5c09592125 100644 +index 928085d2f93..aa238ed1a4f 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -35,6 +35,12 @@ import './browser/actions/widgetNavigationCommands.js'; diff --git a/vscode-patches/0041-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch b/vscode-patches/0041-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch index d12ce00d..f72a8e26 100644 --- a/vscode-patches/0041-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch +++ b/vscode-patches/0041-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch @@ -5,71 +5,32 @@ Subject: [PATCH] fix: do not export stuff from web workbench or the typescript language service is trying to import from it --- - .../workbench/workbench.web.main.internal.ts | 61 +------------------ - 1 file changed, 1 insertion(+), 60 deletions(-) + .../workbench/workbench.web.main.internal.ts | 32 ++----------------- + 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts -index 40dcb51abe6..14a634a0af8 100644 +index b5a0cff14c6..93eb4edbdac 100644 --- a/src/vs/workbench/workbench.web.main.internal.ts +++ b/src/vs/workbench/workbench.web.main.internal.ts -@@ -79,7 +79,6 @@ import { IExtensionTipsService } from '../platform/extensionManagement/common/ex - import { ExtensionTipsService } from '../platform/extensionManagement/common/extensionTipsService.js'; - import { IWorkbenchExtensionManagementService } from './services/extensionManagement/common/extensionManagement.js'; - import { ExtensionManagementService } from './services/extensionManagement/common/extensionManagementService.js'; --import { LogLevel } from '../platform/log/common/log.js'; - import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from '../platform/userDataSync/common/userDataSyncMachines.js'; - import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataAutoSyncService, IUserDataSyncLocalStoreService, IUserDataSyncResourceProviderService } from '../platform/userDataSync/common/userDataSync.js'; - import { UserDataSyncStoreService } from '../platform/userDataSync/common/userDataSyncStoreService.js'; -@@ -185,69 +184,11 @@ import './contrib/processExplorer/browser/processExplorer.web.contribution.js'; +@@ -11,36 +11,10 @@ // // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ++import { create } from './browser/web.factory.js'; + import './workbench.web.main.js'; -import { create, commands, env, window, workspace, logger } from './browser/web.factory.js'; -import { Menu } from './browser/web.api.js'; -import { URI } from '../base/common/uri.js'; -import { Event, Emitter } from '../base/common/event.js'; -import { Disposable } from '../base/common/lifecycle.js'; -import { GroupOrientation } from './services/editor/common/editorGroupsService.js'; -+import { create } from './browser/web.factory.js'; - import { UserDataSyncResourceProviderService } from '../platform/userDataSync/common/userDataSyncResourceProvider.js'; -import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from '../platform/remote/common/remoteAuthorityResolver.js'; -- --// TODO@esm remove me once we stop supporting our web-esm-bridge --// eslint-disable-next-line local/code-no-any-casts --if ((globalThis as any).__VSCODE_WEB_ESM_PROMISE) { -- const exports = { -- -- // Factory -- create: create, -- -- // Basic Types -- URI: URI, -- Event: Event, -- Emitter: Emitter, -- Disposable: Disposable, -- // GroupOrientation, -- LogLevel: LogLevel, -- RemoteAuthorityResolverError: RemoteAuthorityResolverError, -- RemoteAuthorityResolverErrorCode: RemoteAuthorityResolverErrorCode, -- -- // Facade API -- env: env, -- window: window, -- workspace: workspace, -- commands: commands, -- logger: logger, -- Menu: Menu -- }; -- // eslint-disable-next-line local/code-no-any-casts -- (globalThis as any).__VSCODE_WEB_ESM_PROMISE(exports); -- // eslint-disable-next-line local/code-no-any-casts -- delete (globalThis as any).__VSCODE_WEB_ESM_PROMISE; --} +-import { LogLevel } from '../platform/log/common/log.js'; export { - - // Factory - create, +- create, - - // Basic Types - URI, @@ -88,6 +49,6 @@ index 40dcb51abe6..14a634a0af8 100644 - commands, - logger, - Menu ++ create }; - - //#endregion ++ diff --git a/vscode-patches/0044-refactor-split-code-to-be-able-to-import-only-requir.patch b/vscode-patches/0044-refactor-split-code-to-be-able-to-import-only-requir.patch index 775bf07e..a13994d3 100644 --- a/vscode-patches/0044-refactor-split-code-to-be-able-to-import-only-requir.patch +++ b/vscode-patches/0044-refactor-split-code-to-be-able-to-import-only-requir.patch @@ -337,7 +337,7 @@ index 37eac451a86..c6d27314835 100644 interface IExtensionCacheData { diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts -index 6bea97100b9..4c9aee6799a 100644 +index 3a098814ba1..13af9475cdd 100644 --- a/src/vs/platform/files/common/fileService.ts +++ b/src/vs/platform/files/common/fileService.ts @@ -23,6 +23,64 @@ import { readFileIntoStream } from './io.js'; @@ -405,7 +405,7 @@ index 6bea97100b9..4c9aee6799a 100644 export class FileService extends Disposable implements IFileService { declare readonly _serviceBrand: undefined; -@@ -976,53 +1034,8 @@ export class FileService extends Disposable implements IFileService { +@@ -981,53 +1039,8 @@ export class FileService extends Disposable implements IFileService { } private async mkdirp(provider: IFileSystemProvider, directory: URI): Promise { @@ -460,7 +460,7 @@ index 6bea97100b9..4c9aee6799a 100644 } async canDelete(resource: URI, options?: Partial): Promise { -@@ -1475,11 +1488,7 @@ export class FileService extends Disposable implements IFileService { +@@ -1480,11 +1493,7 @@ export class FileService extends Disposable implements IFileService { } private resourceForError(resource: URI): string { diff --git a/vscode-patches/0047-fix-stop-expecting-a-git-context.patch b/vscode-patches/0047-fix-stop-expecting-a-git-context.patch index 5a60ae24..555167f5 100644 --- a/vscode-patches/0047-fix-stop-expecting-a-git-context.patch +++ b/vscode-patches/0047-fix-stop-expecting-a-git-context.patch @@ -8,11 +8,11 @@ Subject: [PATCH] fix: stop expecting a git context 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/npm/postinstall.ts b/build/npm/postinstall.ts -index 3e260853a53..e0370c4f2c7 100644 +index b6a934f74b3..9a20e65d782 100644 --- a/build/npm/postinstall.ts +++ b/build/npm/postinstall.ts -@@ -182,5 +182,5 @@ for (const dir of dirs) { - npmInstall(dir, opts); +@@ -216,5 +216,5 @@ for (const dir of dirs) { + npmInstall(dir, { env }); } -child_process.execSync('git config pull.rebase merges'); diff --git a/vscode-patches/0048-fix-extract-constants-into-separate-module.patch b/vscode-patches/0048-fix-extract-constants-into-separate-module.patch index 2e922bdb..25a2f5f2 100644 --- a/vscode-patches/0048-fix-extract-constants-into-separate-module.patch +++ b/vscode-patches/0048-fix-extract-constants-into-separate-module.patch @@ -17,20 +17,22 @@ so that only the constant is pulled from the root instead of the whole module gr create mode 100644 src/vs/workbench/contrib/chat/browser/widget/input/editor/chatDynamicVariablesConstant.ts diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -index 1714bfacab9..b87f234ca14 100644 +index 9d81f730ba1..4069119c604 100644 --- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts +++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -@@ -24,8 +24,8 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in +@@ -24,10 +24,10 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in import { ILogService } from '../../../platform/log/common/log.js'; import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js'; import { IChatWidgetService } from '../../contrib/chat/browser/chat.js'; -import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/attachments/chatDynamicVariables.js'; import { IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/participants/chatAgents.js'; + import { IPromptFileContext, IPromptsService } from '../../contrib/chat/common/promptSyntax/service/promptsService.js'; + import { isValidPromptType } from '../../contrib/chat/common/promptSyntax/promptTypes.js'; +import { IAddDynamicVariableContext } from '../../contrib/chat/browser/attachments/chatDynamicVariables.js'; - import { ICustomAgentQueryOptions, IPromptsService } from '../../contrib/chat/common/promptSyntax/service/promptsService.js'; - import { IChatEditingService, IChatRelatedFileProviderMetadata } from '../../contrib/chat/common/editing/chatEditingService.js'; import { IChatModel } from '../../contrib/chat/common/model/chatModel.js'; -@@ -39,6 +39,7 @@ import { IExtensionService } from '../../services/extensions/common/extensions.j + import { ChatRequestAgentPart } from '../../contrib/chat/common/requestParser/chatParserTypes.js'; + import { ChatRequestParser } from '../../contrib/chat/common/requestParser/chatRequestParser.js'; +@@ -40,6 +40,7 @@ import { IExtensionService } from '../../services/extensions/common/extensions.j import { Dto } from '../../services/extensions/common/proxyIdentifier.js'; import { ExtHostChatAgentsShape2, ExtHostContext, IChatNotebookEditDto, IChatParticipantMetadata, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from '../common/extHost.protocol.js'; import { NotebookDto } from './mainThreadNotebookDto.js'; @@ -38,7 +40,7 @@ index 1714bfacab9..b87f234ca14 100644 interface AgentData { dispose: () => void; -@@ -392,7 +393,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA +@@ -413,7 +414,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA kind: CompletionItemKind.Text, detail: v.detail, documentation: v.documentation, @@ -132,12 +134,12 @@ index e05b71bd72c..af8fcba33d5 100644 import { ChatAgentLocation } from '../../chat/common/constants.js'; diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts -index 7d451a4cf68..ff4b17bf9ac 100644 +index 8d449a07b3e..32caa44c218 100644 --- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts +++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts -@@ -53,7 +53,7 @@ import { stripIcons } from '../../../../base/common/iconLabels.js'; - import { Lazy } from '../../../../base/common/lazy.js'; +@@ -54,7 +54,7 @@ import { Lazy } from '../../../../base/common/lazy.js'; import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js'; + import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js'; import { Registry } from '../../../../platform/registry/common/platform.js'; -import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js'; +import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatConstants.js'; diff --git a/vscode-patches/0049-fix-store-activeChatController-in-another-module.patch b/vscode-patches/0049-fix-store-activeChatController-in-another-module.patch index 08a8e977..d27f86b2 100644 --- a/vscode-patches/0049-fix-store-activeChatController-in-another-module.patch +++ b/vscode-patches/0049-fix-store-activeChatController-in-another-module.patch @@ -33,18 +33,18 @@ index 734ac7e62a6..8dc5b8133db 100644 const menuActions = menuService.getMenuActions(MENU_TERMINAL_CHAT_WIDGET_STATUS, contextKeyService); for (const action of menuActions) { diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts -index 897e9d8c88d..dda9a2c6c66 100644 +index 02255c5d8aa..2f93ed3fbf4 100644 --- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts +++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts -@@ -32,6 +32,7 @@ import { IPreferencesService, IOpenSettingsOptions } from '../../../../services/ - import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js'; +@@ -34,6 +34,7 @@ import { ConfigurationTarget } from '../../../../../platform/configuration/commo import { TerminalChatAgentToolsSettingId } from '../../chatAgentTools/common/terminalChatAgentToolsConfiguration.js'; import { IMarkdownString } from '../../../../../base/common/htmlContent.js'; + import { AbstractInlineChatAction } from '../../../inlineChat/browser/inlineChatActions.js'; +import { activeChatController } from './terminalChatControllerHolder.js'; registerActiveXtermAction({ id: TerminalChatCommandId.Start, -@@ -60,7 +61,7 @@ registerActiveXtermAction({ +@@ -62,7 +63,7 @@ registerActiveXtermAction({ return; } @@ -53,7 +53,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 if (!contr) { return; } -@@ -110,7 +111,7 @@ registerActiveXtermAction({ +@@ -112,7 +113,7 @@ registerActiveXtermAction({ if (isDetachedTerminalInstance(activeInstance)) { return; } @@ -62,7 +62,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 contr?.terminalChatWidget?.clear(); } }); -@@ -143,7 +144,7 @@ registerActiveXtermAction({ +@@ -145,7 +146,7 @@ registerActiveXtermAction({ if (isDetachedTerminalInstance(activeInstance)) { return; } @@ -71,7 +71,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 contr?.terminalChatWidget?.acceptCommand(true); } }); -@@ -175,7 +176,7 @@ registerActiveXtermAction({ +@@ -177,7 +178,7 @@ registerActiveXtermAction({ if (isDetachedTerminalInstance(activeInstance)) { return; } @@ -80,7 +80,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 contr?.terminalChatWidget?.acceptCommand(true); } }); -@@ -209,7 +210,7 @@ registerActiveXtermAction({ +@@ -211,7 +212,7 @@ registerActiveXtermAction({ if (isDetachedTerminalInstance(activeInstance)) { return; } @@ -89,7 +89,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 contr?.terminalChatWidget?.acceptCommand(false); } }); -@@ -241,7 +242,7 @@ registerActiveXtermAction({ +@@ -243,7 +244,7 @@ registerActiveXtermAction({ if (isDetachedTerminalInstance(activeInstance)) { return; } @@ -98,7 +98,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 contr?.terminalChatWidget?.acceptCommand(false); } }); -@@ -271,7 +272,7 @@ registerActiveXtermAction({ +@@ -273,7 +274,7 @@ registerActiveXtermAction({ run: async (_xterm, _accessor, activeInstance) => { const chatService = _accessor.get(IChatService); const chatWidgetService = _accessor.get(IChatWidgetService); @@ -107,7 +107,7 @@ index 897e9d8c88d..dda9a2c6c66 100644 const model = contr?.terminalChatWidget?.inlineChatWidget.chatWidget.viewModel?.model; if (!model) { return; -@@ -311,7 +312,7 @@ registerActiveXtermAction({ +@@ -313,7 +314,7 @@ registerActiveXtermAction({ if (isDetachedTerminalInstance(activeInstance)) { return; } diff --git a/vscode-patches/0052-refactor-use-URL-syntax-prevent-importing-amdX-at-al.patch b/vscode-patches/0052-refactor-use-URL-syntax-prevent-importing-amdX-at-al.patch index 14495ab4..24d312b2 100644 --- a/vscode-patches/0052-refactor-use-URL-syntax-prevent-importing-amdX-at-al.patch +++ b/vscode-patches/0052-refactor-use-URL-syntax-prevent-importing-amdX-at-al.patch @@ -65,7 +65,7 @@ index 9f8b2fdc9d3..387c010c6ea 100644 const worker = this._worker = this._webWorkerService.createWorkerClient( new WebWorkerDescriptor({ diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts -index ebe149c6047..3004780c531 100644 +index 557d07b936e..b7a2a90122f 100644 --- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts +++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts @@ -4,7 +4,7 @@ diff --git a/vscode-patches/0053-feat-support-configuring-worker-options.patch b/vscode-patches/0053-feat-support-configuring-worker-options.patch index b8fccbcb..b118c021 100644 --- a/vscode-patches/0053-feat-support-configuring-worker-options.patch +++ b/vscode-patches/0053-feat-support-configuring-worker-options.patch @@ -58,10 +58,10 @@ index b6e9ec09fff..9da1be69d7c 100644 globalAPI?: boolean; diff --git a/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts b/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts -index 9e60c93dfde..d4eae033ab1 100644 +index 1ff3fb838d9..6400775c42d 100644 --- a/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts +++ b/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts -@@ -42,4 +42,10 @@ export class StandaloneWebWorkerService extends WebWorkerService { +@@ -48,4 +48,10 @@ Ensure your bundler properly bundles modules referenced by "new URL(${examplePat const urlStr = url.toString(); return urlStr; } @@ -73,7 +73,7 @@ index 9e60c93dfde..d4eae033ab1 100644 + } } diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts -index bdd5231f202..48f9f66f550 100644 +index 22641b4e01a..c0c631a0928 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -24,12 +24,16 @@ declare namespace monaco { @@ -107,7 +107,7 @@ index fd5150435af..e8d736fa762 100644 + getWorkerOptions(descriptor: WebWorkerDescriptor): WorkerOptions | undefined; } diff --git a/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts b/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts -index 376e45857db..9741c1973ff 100644 +index 99238ddfbb5..f87c1f1819b 100644 --- a/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts +++ b/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts @@ -32,9 +32,10 @@ export class WebWorkerService implements IWebWorkerService { @@ -116,14 +116,14 @@ index 376e45857db..9741c1973ff 100644 const workerRunnerUrl = this.getWorkerUrl(descriptor); + const workerRunnerOptions: WorkerOptions = { name: descriptor.label, type: 'module', ...this.getWorkerOptions(descriptor) }; -- const workerUrlWithNls = getWorkerBootstrapUrl(descriptor.label, workerRunnerUrl); +- const workerUrlWithNls = getWorkerBootstrapUrl(descriptor.label, workerRunnerUrl, this._getWorkerLoadingFailedErrorMessage(descriptor)); - const worker = new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrlWithNls) as unknown as string : workerUrlWithNls, { name: descriptor.label, type: 'module' }); -+ const workerUrlWithNls = getWorkerBootstrapUrl(descriptor.label, workerRunnerUrl, workerRunnerOptions); ++ const workerUrlWithNls = getWorkerBootstrapUrl(descriptor.label, workerRunnerUrl, this._getWorkerLoadingFailedErrorMessage(descriptor), workerRunnerOptions); + const worker = new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrlWithNls) as unknown as string : workerUrlWithNls, workerRunnerOptions); return whenESMWorkerReady(worker); } -@@ -46,6 +47,10 @@ export class WebWorkerService implements IWebWorkerService { +@@ -50,6 +51,10 @@ export class WebWorkerService implements IWebWorkerService { const urlStr = uri.toString(true); return urlStr; } @@ -134,24 +134,24 @@ index 376e45857db..9741c1973ff 100644 } const ttPolicy = ((): ReturnType => { -@@ -71,7 +76,7 @@ export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Work +@@ -75,7 +80,7 @@ export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Work return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { ...options, type: 'module' }); } --function getWorkerBootstrapUrl(label: string, workerScriptUrl: string): string { -+function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerOptions: WorkerOptions): string { +-function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerLoadingFailedErrorMessage: string | undefined): string { ++function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerLoadingFailedErrorMessage: string | undefined, workerOptions: WorkerOptions): string { if (/^((http:)|(https:)|(file:))/.test(workerScriptUrl) && workerScriptUrl.substring(0, globalThis.origin.length) !== globalThis.origin) { // this is the cross-origin case // i.e. the webpage is running at a different origin than where the scripts are loaded from -@@ -101,7 +106,7 @@ function getWorkerBootstrapUrl(label: string, workerScriptUrl: string): string { - `globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(globalThis._VSCODE_FILE_ROOT)};`, - `const ttPolicy = globalThis.trustedTypes?.createPolicy('defaultWorkerFactory', { createScriptURL: value => value });`, +@@ -107,7 +112,7 @@ function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerLoa `globalThis.workerttPolicy = ttPolicy;`, + + workerLoadingFailedErrorMessage ? 'try {' : '', - `await import(ttPolicy?.createScriptURL(${JSON.stringify(workerScriptUrl)}) ?? ${JSON.stringify(workerScriptUrl)});`, + `${workerOptions.type === 'module' ? 'await import' : 'importScripts'}(ttPolicy?.createScriptURL(${JSON.stringify(workerScriptUrl)}) ?? ${JSON.stringify(workerScriptUrl)});`, + workerLoadingFailedErrorMessage ? `} catch (err) { console.error(${JSON.stringify(workerLoadingFailedErrorMessage)}, err); throw err; }` : '', + `globalThis.postMessage({ type: 'vscode-worker-ready' });`, - `/*${label}*/` - ]).join('')], { type: 'application/javascript' }); diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts index 58429f40954..742bedab023 100644 --- a/src/vs/workbench/services/extensions/browser/extensionService.ts @@ -171,7 +171,7 @@ index 58429f40954..742bedab023 100644 case ExtensionHostKind.Remote: { const remoteAgentConnection = this._remoteAgentService.getConnection(); diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts -index af52ee0f93a..e390743b942 100644 +index a98eba9ef40..9800b22f722 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -195,6 +195,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost diff --git a/vscode-patches/0054-fix-always-set-parent-origin.patch b/vscode-patches/0054-fix-always-set-parent-origin.patch index 358ee631..4af758cc 100644 --- a/vscode-patches/0054-fix-always-set-parent-origin.patch +++ b/vscode-patches/0054-fix-always-set-parent-origin.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: always set parent origin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts -index e390743b942..8923f60df04 100644 +index 9800b22f722..36d56e3a1b1 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -88,6 +88,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost diff --git a/vscode-patches/0057-fix-break-cyclic-dependency.patch b/vscode-patches/0057-fix-break-cyclic-dependency.patch index 04bb9dbc..9163b181 100644 --- a/vscode-patches/0057-fix-break-cyclic-dependency.patch +++ b/vscode-patches/0057-fix-break-cyclic-dependency.patch @@ -12,7 +12,7 @@ Subject: [PATCH] fix: break cyclic dependency create mode 100644 src/vs/workbench/contrib/tasks/common/constants.ts diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts -index 73cd4c58597..d0fb13e5fe5 100644 +index 19a537dd101..9e91aa13e1e 100644 --- a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts +++ b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts @@ -20,7 +20,7 @@ import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatus diff --git a/vscode-patches/0058-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch b/vscode-patches/0058-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch index aa2a8ba1..1f64c97b 100644 --- a/vscode-patches/0058-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch +++ b/vscode-patches/0058-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: ignore @vscode/tree-sitter-wasm until MS fixes it 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/gulpfile.editor.ts b/build/gulpfile.editor.ts -index 447b76fa16c..2593f626646 100644 +index 338c678b7de..4322e06aec5 100644 --- a/build/gulpfile.editor.ts +++ b/build/gulpfile.editor.ts -@@ -55,7 +55,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { +@@ -63,7 +63,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { 'vs/base/common/marked/marked.js', ], shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers diff --git a/vscode-patches/0059-feat-add-new-task-that-only-export-editor-types.patch b/vscode-patches/0059-feat-add-new-task-that-only-export-editor-types.patch index fad3ed88..0a9e8315 100644 --- a/vscode-patches/0059-feat-add-new-task-that-only-export-editor-types.patch +++ b/vscode-patches/0059-feat-add-new-task-that-only-export-editor-types.patch @@ -8,10 +8,10 @@ Subject: [PATCH] feat: add new task that only export editor types 1 file changed, 4 insertions(+) diff --git a/build/gulpfile.editor.ts b/build/gulpfile.editor.ts -index 2593f626646..b109d522d3e 100644 +index 4322e06aec5..9ca6678964f 100644 --- a/build/gulpfile.editor.ts +++ b/build/gulpfile.editor.ts -@@ -216,6 +216,10 @@ gulp.task('editor-distro', +@@ -224,6 +224,10 @@ gulp.task('editor-distro', ) ); diff --git a/vscode-patches/0061-feat-support-shadow-dom.patch b/vscode-patches/0061-feat-support-shadow-dom.patch index 35cca0f1..840d9d0d 100644 --- a/vscode-patches/0061-feat-support-shadow-dom.patch +++ b/vscode-patches/0061-feat-support-shadow-dom.patch @@ -24,7 +24,7 @@ Subject: [PATCH] feat: support shadow dom .../contentWidgets/contentWidgets.ts | 2 +- .../hover/browser/contentHoverController.ts | 3 +- .../hover/browser/contentHoverWidget.ts | 2 +- - .../actionWidget/browser/actionList.ts | 2 +- + .../actionWidget/browser/actionList.ts | 5 +- .../clipboard/browser/clipboardService.ts | 4 +- .../contextkey/browser/contextKeyService.ts | 26 ++++---- src/vs/platform/hover/browser/hoverWidget.ts | 2 +- @@ -49,13 +49,13 @@ Subject: [PATCH] feat: support shadow dom .../browser/walkThroughPart.ts | 6 +- .../suggest/browser/simpleSuggestWidget.ts | 4 +- .../themes/browser/workbenchThemeService.ts | 2 +- - 45 files changed, 184 insertions(+), 99 deletions(-) + 45 files changed, 187 insertions(+), 99 deletions(-) diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts -index 0e792265805..60a773236eb 100644 +index df985c36c16..41fba15d553 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts -@@ -165,6 +165,39 @@ export function addDisposableListener(node: EventTarget, type: string, handler: +@@ -257,6 +257,39 @@ export function addDisposableListener(node: EventTarget, type: string, handler: return new DomListener(node, type, handler, useCaptureOrOptions); } @@ -95,7 +95,7 @@ index 0e792265805..60a773236eb 100644 export interface IAddStandardDisposableListenerSignature { (node: HTMLElement | Element | Document, type: 'click', handler: (event: IMouseEvent) => void, useCapture?: boolean): IDisposable; (node: HTMLElement | Element | Document, type: 'mousedown', handler: (event: IMouseEvent) => void, useCapture?: boolean): IDisposable; -@@ -619,8 +652,7 @@ export function getTopLeftOffset(element: HTMLElement): IDomPosition { +@@ -762,8 +795,7 @@ export function getTopLeftOffset(element: HTMLElement): IDomPosition { while ( (element = element.parentNode) !== null @@ -105,7 +105,7 @@ index 0e792265805..60a773236eb 100644 ) { top -= element.scrollTop; const c = isShadowRoot(element) ? null : getComputedStyle(element); -@@ -722,7 +754,7 @@ export function getDomNodeZoomLevel(domNode: HTMLElement): number { +@@ -865,7 +897,7 @@ export function getDomNodeZoomLevel(domNode: HTMLElement): number { } testElement = testElement.parentElement; @@ -114,7 +114,7 @@ index 0e792265805..60a773236eb 100644 return zoom; } -@@ -800,7 +832,7 @@ function getParentFlowToElement(node: HTMLElement): HTMLElement | null { +@@ -943,7 +975,7 @@ function getParentFlowToElement(node: HTMLElement): HTMLElement | null { const flowToParentId = node.dataset[parentFlowToDataKey]; if (typeof flowToParentId === 'string') { // eslint-disable-next-line no-restricted-syntax @@ -123,7 +123,7 @@ index 0e792265805..60a773236eb 100644 } return null; } -@@ -883,8 +915,8 @@ export function getShadowRoot(domNode: Node): ShadowRoot | null { +@@ -1026,8 +1058,8 @@ export function getShadowRoot(domNode: Node): ShadowRoot | null { * based on document focus. Falls back to the main * window if no window has focus. */ @@ -134,7 +134,7 @@ index 0e792265805..60a773236eb 100644 while (result?.shadowRoot) { result = result.shadowRoot.activeElement; -@@ -893,6 +925,14 @@ export function getActiveElement(): Element | null { +@@ -1036,6 +1068,14 @@ export function getActiveElement(): Element | null { return result; } @@ -149,7 +149,7 @@ index 0e792265805..60a773236eb 100644 /** * Returns true if the focused window active element matches * the provided element. Falls back to the main window if no -@@ -1044,6 +1084,11 @@ export function isHTMLDivElement(e: unknown): e is HTMLDivElement { +@@ -1198,6 +1238,11 @@ export function isHTMLDivElement(e: unknown): e is HTMLDivElement { return e instanceof HTMLDivElement || e instanceof getWindow(e as Node).HTMLDivElement; } @@ -161,7 +161,7 @@ index 0e792265805..60a773236eb 100644 export function isSVGElement(e: unknown): e is SVGElement { // eslint-disable-next-line no-restricted-syntax return e instanceof SVGElement || e instanceof getWindow(e as Node).SVGElement; -@@ -1189,7 +1234,7 @@ class FocusTracker extends Disposable implements IFocusTracker { +@@ -1343,7 +1388,7 @@ class FocusTracker extends Disposable implements IFocusTracker { private static hasFocusWithin(element: HTMLElement | Window): boolean { if (isHTMLElement(element)) { const shadowRoot = getShadowRoot(element); @@ -170,7 +170,7 @@ index 0e792265805..60a773236eb 100644 return isAncestor(activeElement, element); } else { const window = element; -@@ -1409,7 +1454,7 @@ export function removeTabIndexAndUpdateFocus(node: HTMLElement): void { +@@ -1563,7 +1608,7 @@ export function removeTabIndexAndUpdateFocus(node: HTMLElement): void { // standard DOM behavior is to move focus to the element. We // typically never want that, rather put focus to the closest element // in the hierarchy of the parent DOM nodes. @@ -180,10 +180,10 @@ index 0e792265805..60a773236eb 100644 parentFocusable?.focus(); } diff --git a/src/vs/base/browser/domStylesheets.ts b/src/vs/base/browser/domStylesheets.ts -index 1e34173680e..0782c211144 100644 +index c338502d541..3da2ba1f9dd 100644 --- a/src/vs/base/browser/domStylesheets.ts +++ b/src/vs/base/browser/domStylesheets.ts -@@ -47,6 +47,14 @@ class WrappedStyleElement { +@@ -39,6 +39,14 @@ class WrappedStyleElement extends Disposable { } } @@ -198,7 +198,7 @@ index 1e34173680e..0782c211144 100644 export function createStyleSheet(container: HTMLElement = mainWindow.document.head, beforeAppend?: (style: HTMLStyleElement) => void, disposableStore?: DisposableStore): HTMLStyleElement { const style = document.createElement('style'); style.type = 'text/css'; -@@ -72,7 +80,12 @@ export function createStyleSheet(container: HTMLElement = mainWindow.document.he +@@ -64,7 +72,12 @@ export function createStyleSheet(container: HTMLElement = mainWindow.document.he continue; // main window is already tracked } @@ -212,7 +212,7 @@ index 1e34173680e..0782c211144 100644 disposableStore?.add(cloneDisposable); } } -@@ -84,17 +97,17 @@ export function cloneGlobalStylesheets(targetWindow: Window): IDisposable { +@@ -76,17 +89,17 @@ export function cloneGlobalStylesheets(targetWindow: Window): IDisposable { const disposables = new DisposableStore(); for (const [globalStylesheet, clonedGlobalStylesheets] of globalStylesheets) { @@ -271,10 +271,10 @@ index 6b675d06535..672eeabd7b6 100644 this.ctrlKey = e.ctrlKey; this.shiftKey = e.shiftKey; diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts -index 2da6a90f283..c605560c870 100644 +index 44c3c080e24..b56e1cf334e 100644 --- a/src/vs/base/browser/ui/contextview/contextview.ts +++ b/src/vs/base/browser/ui/contextview/contextview.ts -@@ -381,7 +381,7 @@ export class ContextView extends Disposable { +@@ -383,7 +383,7 @@ export class ContextView extends Disposable { private onDOMEvent(e: UIEvent, onCapture: boolean): void { if (this.delegate) { if (this.delegate.onDOMEvent) { @@ -337,7 +337,7 @@ index 39ce04a13a8..06cdc96e51d 100644 const dragContainer = getDragImageContainer(container); diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts -index 2518cf4250d..26b9df209a4 100644 +index 80f9fea1f87..39eef0473c9 100644 --- a/src/vs/base/browser/ui/findinput/findInput.ts +++ b/src/vs/base/browser/ui/findinput/findInput.ts @@ -20,6 +20,7 @@ import * as nls from '../../../../nls.js'; @@ -348,7 +348,7 @@ index 2518cf4250d..26b9df209a4 100644 export interface IFindInputOptions { -@@ -175,7 +176,7 @@ export class FindInput extends Widget { +@@ -177,7 +178,7 @@ export class FindInput extends Widget { const indexes = [this.caseSensitive.domNode, this.wholeWords.domNode, this.regex.domNode]; this.onkeydown(this.domNode, (event: IKeyboardEvent) => { if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Escape)) { @@ -379,10 +379,10 @@ index 10c5b47b653..6dd9e205c71 100644 let newIndex: number = -1; if (event.equals(KeyCode.RightArrow)) { diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts -index 3438890dd23..998bb4ccf6b 100644 +index 9b55cd2ec68..a7606504872 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts -@@ -173,7 +173,7 @@ export class InputBox extends Widget { +@@ -174,7 +174,7 @@ export class InputBox extends Widget { const onSelectionChange = this._register(new DomEmitter(container.ownerDocument, 'selectionchange')); const onAnchoredSelectionChange = Event.filter(onSelectionChange.event, () => { @@ -548,18 +548,18 @@ index 8256f6b487c..6bc03be79e1 100644 return element.getAttribute(attr); } diff --git a/src/vs/editor/browser/view/viewPart.ts b/src/vs/editor/browser/view/viewPart.ts -index a23bcb11b59..d750b8f2f03 100644 +index 1009c8e7ca0..bf02d491fd3 100644 --- a/src/vs/editor/browser/view/viewPart.ts +++ b/src/vs/editor/browser/view/viewPart.ts -@@ -7,6 +7,7 @@ import { FastDomNode } from '../../../base/browser/fastDomNode.js'; - import { RenderingContext, RestrictedRenderingContext } from './renderingContext.js'; +@@ -8,6 +8,7 @@ import { RenderingContext, RestrictedRenderingContext } from './renderingContext import { ViewContext } from '../../common/viewModel/viewContext.js'; import { ViewEventHandler } from '../../common/viewEventHandler.js'; + import { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js'; +import { getRootContainer } from '../../../base/browser/dom.js'; export abstract class ViewPart extends ViewEventHandler { -@@ -59,7 +60,7 @@ export class PartFingerprints { +@@ -63,7 +64,7 @@ export class PartFingerprints { const result: PartFingerprint[] = []; let resultLen = 0; @@ -569,7 +569,7 @@ index a23bcb11b59..d750b8f2f03 100644 break; } diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts -index 6653405c375..4681a470db4 100644 +index 1f43f7834f0..550be23f481 100644 --- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts +++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts @@ -453,7 +453,7 @@ class Widget { @@ -582,7 +582,7 @@ index 6653405c375..4681a470db4 100644 // return null; } diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts -index 8d7421d9906..72b2a1de61d 100644 +index ba0e7d0b161..5a4426465a5 100644 --- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts +++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts @@ -24,6 +24,7 @@ import { Emitter } from '../../../../base/common/event.js'; @@ -616,18 +616,22 @@ index c5226cb273f..08f5ace9b37 100644 this._configurationService.getValue('accessibility.verbosity.hover') === true && this._accessibilityService.isScreenReaderOptimized(), this._keybindingService.lookupKeybinding('editor.action.accessibleView')?.getAriaLabel() ?? '' diff --git a/src/vs/platform/actionWidget/browser/actionList.ts b/src/vs/platform/actionWidget/browser/actionList.ts -index 7d48eaa295e..a9f5fa8b0e6 100644 +index 3c12b59418e..b8d48462193 100644 --- a/src/vs/platform/actionWidget/browser/actionList.ts +++ b/src/vs/platform/actionWidget/browser/actionList.ts -@@ -332,7 +332,7 @@ export class ActionList extends Disposable { - // For finding width dynamically (not using resize observer) - const itemWidths: number[] = this._allMenuItems.map((_, index): number => { - // eslint-disable-next-line no-restricted-syntax -- const element = this.domNode.ownerDocument.getElementById(this._list.getElementID(index)); -+ const element = (this.domNode.getRootNode() as Document | ShadowRoot).getElementById(this._list.getElementID(index)); - if (element) { - element.style.width = 'auto'; - const width = element.getBoundingClientRect().width; +@@ -460,8 +460,11 @@ export class ActionList extends Disposable { + } + + private _getRowElement(index: number): HTMLElement | null { ++ if (this.domNode.isConnected) { ++ return null; ++ } + // eslint-disable-next-line no-restricted-syntax +- return this.domNode.ownerDocument.getElementById(this._list.getElementID(index)); ++ return (this.domNode.getRootNode() as Document | ShadowRoot).getElementById(this._list.getElementID(index)); + } + + private _showHoverForElement(element: IActionListItem, index: number): void { diff --git a/src/vs/platform/clipboard/browser/clipboardService.ts b/src/vs/platform/clipboard/browser/clipboardService.ts index 6e0a6e018d0..358aa682cda 100644 --- a/src/vs/platform/clipboard/browser/clipboardService.ts @@ -721,10 +725,10 @@ index df8da89a047..0f9fca69091 100644 } diff --git a/src/vs/platform/hover/browser/hoverWidget.ts b/src/vs/platform/hover/browser/hoverWidget.ts -index f897c073bdb..2cd1ed79b7f 100644 +index 41c8723608a..96297b1ddb8 100644 --- a/src/vs/platform/hover/browser/hoverWidget.ts +++ b/src/vs/platform/hover/browser/hoverWidget.ts -@@ -316,7 +316,7 @@ export class HoverWidget extends Widget implements IHoverWidget { +@@ -326,7 +326,7 @@ export class HoverWidget extends Widget implements IHoverWidget { public render(container: HTMLElement): void { container.appendChild(this._hoverContainer); @@ -734,7 +738,7 @@ index f897c073bdb..2cd1ed79b7f 100644 if (accessibleViewHint) { diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts -index 1fda3db0826..1fd3c6f6976 100644 +index 91f52f5d2c5..ca0140e4fb3 100644 --- a/src/vs/workbench/browser/actions/developerActions.ts +++ b/src/vs/workbench/browser/actions/developerActions.ts @@ -78,7 +78,7 @@ class InspectContextKeysAction extends Action2 { @@ -756,7 +760,7 @@ index 1fda3db0826..1fd3c6f6976 100644 dispose(disposables); diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index ff5708e1a86..5213358c5de 100644 +index a60b399fcf1..c622d53ae07 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -47,6 +47,7 @@ import { AuxiliaryBarPart } from './parts/auxiliarybar/auxiliaryBarPart.js'; @@ -767,7 +771,7 @@ index ff5708e1a86..5213358c5de 100644 //#region Layout Implementation -@@ -302,6 +303,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi +@@ -303,6 +304,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi private readonly layoutOptions?: { resetLayout: boolean } ) { super(); @@ -799,7 +803,7 @@ index a2344eaf8f2..69f87e30afa 100644 } diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index fbff9375f73..5a53b5423a4 100644 +index 7796aae8a15..1c304a11a9e 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -77,6 +77,9 @@ export class Workbench extends Layout { @@ -812,7 +816,7 @@ index fbff9375f73..5a53b5423a4 100644 } protected registerErrorHandler(logService: ILogService): void { -@@ -337,9 +340,6 @@ export class Workbench extends Layout { +@@ -342,9 +345,6 @@ export class Workbench extends Layout { // Notification Handlers this.createNotificationsHandlers(instantiationService, notificationService); @@ -823,10 +827,10 @@ index fbff9375f73..5a53b5423a4 100644 private createPart(id: string, role: string, classes: string[]): HTMLElement { diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts -index dd0f182a952..e7e7180bf44 100644 +index bcf805169da..2447a3ba087 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts -@@ -2095,7 +2095,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge +@@ -2349,7 +2349,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge attachments.unshift(toolbar); @@ -836,7 +840,7 @@ index dd0f182a952..e7e7180bf44 100644 let newIndex = currentIndex; diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts -index 7fbfacc1959..a688ea28618 100644 +index a4a00dfa7ea..eb13a68974f 100644 --- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts @@ -74,6 +74,7 @@ import { IContextKey, IContextKeyService } from '../../../../../platform/context @@ -847,7 +851,7 @@ index 7fbfacc1959..a688ea28618 100644 export class ExplorerDelegate implements IListVirtualDelegate { -@@ -1158,11 +1159,12 @@ export class FilesRenderer implements ICompressibleTreeRenderer { @@ -1047,7 +1051,7 @@ index 986b02a3bfd..66b6c4a10d8 100644 if (classList && classList.contains('monaco-list') && classList.contains('settings-editor-tree')) { this._currentFocusContext = SettingsFocusContext.SettingTree; this.settingRowFocused.set(true); -@@ -1623,7 +1623,7 @@ export class SettingsEditor2 extends EditorPane { +@@ -1709,7 +1709,7 @@ export class SettingsEditor2 extends EditorPane { private getActiveControlInSettingsTree(): HTMLElement | null { const element = this.settingsTree.getHTMLElement(); @@ -1056,7 +1060,7 @@ index 986b02a3bfd..66b6c4a10d8 100644 return (activeElement && DOM.isAncestorOfActiveElement(element)) ? activeElement : null; -@@ -1688,7 +1688,7 @@ export class SettingsEditor2 extends EditorPane { +@@ -1774,7 +1774,7 @@ export class SettingsEditor2 extends EditorPane { } private contextViewFocused(): boolean { @@ -1066,7 +1070,7 @@ index 986b02a3bfd..66b6c4a10d8 100644 private refreshSingleElement(element: SettingsTreeSettingElement): void { diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts -index 1e6a52f9e04..5d62a732a26 100644 +index 7a3dd584458..b58e3170ff1 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts @@ -590,7 +590,7 @@ export class TerminalTabbedView extends Disposable { @@ -1092,7 +1096,7 @@ index 9a745727415..32b87509ab3 100644 const listener = this._register(Event.once(this._terminalService.onDidChangeConnectionState)(() => { // Only focus the terminal if the activeElement has not changed since focus() was called diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index f31b97b7089..73579fe797e 100644 +index 32ade0b6580..60d01c4415c 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -4,7 +4,7 @@ @@ -1114,7 +1118,7 @@ index f31b97b7089..73579fe797e 100644 // looks like https://github.com/microsoft/vscode/issues/132641 // where the focus is actually not in the `