diff --git a/package-lock.json b/package-lock.json index a42d434a..e6bf0ba3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,29 +12,29 @@ "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", "@parcel/watcher": "2.1.0", - "@rollup/pluginutils": "^5.1.0", + "@rollup/pluginutils": "^5.1.2", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.23.0", + "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-clipboard": "0.2.0-beta.39", - "@xterm/addon-image": "0.9.0-beta.56", - "@xterm/addon-search": "0.16.0-beta.56", - "@xterm/addon-serialize": "0.14.0-beta.56", - "@xterm/addon-unicode11": "0.9.0-beta.56", - "@xterm/addon-webgl": "0.19.0-beta.56", - "@xterm/headless": "5.6.0-beta.56", - "@xterm/xterm": "5.6.0-beta.56", + "@xterm/addon-clipboard": "^0.2.0-beta.47", + "@xterm/addon-image": "^0.9.0-beta.64", + "@xterm/addon-search": "^0.16.0-beta.64", + "@xterm/addon-serialize": "^0.14.0-beta.64", + "@xterm/addon-unicode11": "^0.9.0-beta.64", + "@xterm/addon-webgl": "^0.19.0-beta.64", + "@xterm/headless": "^5.6.0-beta.64", + "@xterm/xterm": "^5.6.0-beta.64", "cookie": "^0.4.0", "css-url-parser": "^1.1.4", "jschardet": "3.1.3", "kerberos": "2.1.1", "keytar": "^7.9.0", "marked": "~14.0.0", - "memfs": "^4.11.1", + "memfs": "^4.12.0", "mime-types": "^2.1.35", "node-pty": "1.1.0-beta21", "vscode-oniguruma": "1.7.0", @@ -44,26 +44,26 @@ "yazl": "^2.4.3" }, "devDependencies": { - "@babel/core": "^7.25.2", + "@babel/core": "^7.25.7", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.24.7", - "@babel/preset-env": "^7.25.4", - "@babel/preset-typescript": "^7.24.7", + "@babel/plugin-proposal-decorators": "^7.25.7", + "@babel/preset-env": "^7.25.7", + "@babel/preset-typescript": "^7.25.7", "@codingame/commitlint-config-codingame": "^1.1.1", "@codingame/eslint-config": "^1.2.1", "@codingame/semantic-release-config-github": "^1.0.0", "@codingame/tsconfig": "^1.1.1", "@commitlint/cli": "^19.5.0", - "@rollup/plugin-commonjs": "^26.0.1", - "@rollup/plugin-dynamic-import-vars": "^2.1.2", + "@rollup/plugin-commonjs": "^28.0.0", + "@rollup/plugin-dynamic-import-vars": "^2.1.3", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-replace": "^5.0.7", - "@rollup/plugin-typescript": "^11.1.6", + "@rollup/plugin-node-resolve": "^15.3.0", + "@rollup/plugin-replace": "^6.0.1", + "@rollup/plugin-typescript": "^12.1.0", "@types/mime-types": "^2.1.4", "@types/node": "18.19.8", "@types/semver": "^7.5.8", - "@types/vscode": "~1.93.0", + "@types/vscode": "~1.94.0", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.33", "@types/yauzl": "^2.10.3", @@ -85,7 +85,7 @@ "pascal-case": "^3.1.2", "patch-package": "^8.0.0", "recast": "^0.23.9", - "rollup": "^4.21.3", + "rollup": "^4.24.0", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.1.1", "rollup-plugin-styles": "^4.0.0", @@ -97,7 +97,7 @@ "typescript": "^5.6.2", "vscode-semver": "npm:semver@=5.5.0", "yargs": "^17.7.2", - "zx": "^8.1.6" + "zx": "^8.1.9" } }, "node_modules/@ampproject/remapping": { @@ -114,12 +114,12 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", + "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", "dev": true, "dependencies": { - "@babel/highlight": "^7.24.7", + "@babel/highlight": "^7.25.7", "picocolors": "^1.0.0" }, "engines": { @@ -127,30 +127,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", - "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.7.tgz", + "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", - "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz", + "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.0", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-module-transforms": "^7.25.2", - "@babel/helpers": "^7.25.0", - "@babel/parser": "^7.25.0", - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.2", - "@babel/types": "^7.25.2", + "@babel/code-frame": "^7.25.7", + "@babel/generator": "^7.25.7", + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helpers": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/template": "^7.25.7", + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -175,54 +175,54 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", - "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", + "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", "dev": true, "dependencies": { - "@babel/types": "^7.25.6", + "@babel/types": "^7.25.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", "dev": true, "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", - "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz", + "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", - "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", + "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", + "@babel/compat-data": "^7.25.7", + "@babel/helper-validator-option": "^7.25.7", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -240,17 +240,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", - "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz", + "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-member-expression-to-functions": "^7.25.7", + "@babel/helper-optimise-call-expression": "^7.25.7", + "@babel/helper-replace-supers": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", + "@babel/traverse": "^7.25.7", "semver": "^6.3.1" }, "engines": { @@ -270,13 +270,13 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", - "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz", + "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", + "@babel/helper-annotate-as-pure": "^7.25.7", + "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, "engines": { @@ -312,41 +312,41 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", - "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz", + "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", + "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", - "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", + "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.2" + "@babel/helper-module-imports": "^7.25.7", + "@babel/helper-simple-access": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -356,35 +356,35 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", - "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz", + "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==", "dev": true, "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", - "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", + "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", - "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz", + "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-wrap-function": "^7.25.0", - "@babel/traverse": "^7.25.0" + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-wrap-function": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -394,14 +394,14 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", - "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz", + "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==", "dev": true, "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-member-expression-to-functions": "^7.25.7", + "@babel/helper-optimise-call-expression": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -411,92 +411,92 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", + "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", - "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz", + "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", + "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", + "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", - "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz", + "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==", "dev": true, "dependencies": { - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/template": "^7.25.7", + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz", + "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", "dev": true, "dependencies": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" + "@babel/template": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", + "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-validator-identifier": "^7.25.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -506,12 +506,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz", + "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==", "dev": true, "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.25.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -521,13 +521,13 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", - "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.7.tgz", + "integrity": "sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.3" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -537,12 +537,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", - "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.7.tgz", + "integrity": "sha512-GDDWeVLNxRIkQTnJn2pDOM1pkCgYdSqPeT1a9vh9yIqu2uzzgw1zcqEb+IJOhy+dTBMlNdThrDIksr2o09qrrQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -552,12 +552,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", - "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz", + "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -567,14 +567,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", - "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz", + "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", + "@babel/plugin-transform-optional-chaining": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -584,13 +584,13 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", - "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz", + "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -617,14 +617,14 @@ } }, "node_modules/@babel/plugin-proposal-decorators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz", - "integrity": "sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.7.tgz", + "integrity": "sha512-q1mqqqH0e1lhmsEQHV5U8OmdueBC2y0RFr2oUzZoFRtN3MvPmt2fsFRcNQAoGLTSNdHBFUYGnlgcRFhkBbKjPw==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-decorators": "^7.24.7" + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/plugin-syntax-decorators": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -685,12 +685,12 @@ } }, "node_modules/@babel/plugin-syntax-decorators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz", - "integrity": "sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.7.tgz", + "integrity": "sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -724,12 +724,12 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", - "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz", + "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -739,12 +739,12 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", - "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz", + "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -778,12 +778,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", - "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz", + "integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -895,12 +895,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz", - "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz", + "integrity": "sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -926,12 +926,12 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", - "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz", + "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -941,15 +941,15 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz", - "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.7.tgz", + "integrity": "sha512-4B6OhTrwYKHYYgcwErvZjbmH9X5TxQBsaBHdzEIB4l71gR5jh/tuHGlb9in47udL2+wVUcOz5XXhhfhVJwEpEg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-remap-async-to-generator": "^7.25.0", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-remap-async-to-generator": "^7.25.7", "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/traverse": "^7.25.4" + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -959,14 +959,14 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", - "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.7.tgz", + "integrity": "sha512-ZUCjAavsh5CESCmi/xCpX1qcCaAglzs/7tmuvoFnJgA1dM7gQplsguljoTg+Ru8WENpX89cQyAtWoaE0I3X3Pg==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-remap-async-to-generator": "^7.24.7" + "@babel/helper-module-imports": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-remap-async-to-generator": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -976,12 +976,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", - "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz", + "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -991,12 +991,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", - "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz", + "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1006,13 +1006,13 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", - "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz", + "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1022,13 +1022,13 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", - "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.7.tgz", + "integrity": "sha512-rvUUtoVlkDWtDWxGAiiQj0aNktTPn3eFynBcMC2IhsXweehwgdI9ODe+XjWw515kEmv22sSOTp/rxIRuTiB7zg==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, "engines": { @@ -1039,16 +1039,16 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", - "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz", + "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-replace-supers": "^7.25.7", + "@babel/traverse": "^7.25.7", "globals": "^11.1.0" }, "engines": { @@ -1059,13 +1059,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", - "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz", + "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/template": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/template": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1075,12 +1075,12 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", - "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz", + "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1090,13 +1090,13 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", - "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz", + "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1106,12 +1106,12 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", - "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz", + "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1121,13 +1121,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", - "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.7.tgz", + "integrity": "sha512-HvS6JF66xSS5rNKXLqkk7L9c/jZ/cdIVIcoPVrnl8IsVpLggTjXs8OWekbLHs/VtYDDh5WXnQyeE3PPUGm22MA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1137,12 +1137,12 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", - "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.7.tgz", + "integrity": "sha512-UvcLuual4h7/GfylKm2IAA3aph9rwvAM2XBA0uPKU3lca+Maai4jBjjEVUS568ld6kJcgbouuumCBhMd/Yz17w==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { @@ -1153,13 +1153,13 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", - "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz", + "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1169,12 +1169,12 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", - "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.7.tgz", + "integrity": "sha512-h3MDAP5l34NQkkNulsTNyjdaR+OiB0Im67VU//sFupouP8Q6m9Spy7l66DcaAQxtmCqGdanPByLsnwFttxKISQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, "engines": { @@ -1185,13 +1185,13 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", - "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz", + "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1201,14 +1201,14 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", - "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz", + "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.1" + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1218,12 +1218,12 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", - "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.7.tgz", + "integrity": "sha512-Ot43PrL9TEAiCe8C/2erAjXMeVSnE/BLEx6eyrKLNFCCw5jvhTHKyHxdI1pA0kz5njZRYAnMO2KObGqOCRDYSA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-json-strings": "^7.8.3" }, "engines": { @@ -1234,12 +1234,12 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", - "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz", + "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1249,12 +1249,12 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", - "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.7.tgz", + "integrity": "sha512-iImzbA55BjiovLyG2bggWS+V+OLkaBorNvc/yJoeeDQGztknRnDdYfp2d/UPmunZYEnZi6Lg8QcTmNMHOB0lGA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "engines": { @@ -1265,12 +1265,12 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", - "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz", + "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1280,13 +1280,13 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", - "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz", + "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1296,14 +1296,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", - "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz", + "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-simple-access": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-simple-access": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1313,15 +1313,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", - "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz", + "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1331,13 +1331,13 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", - "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz", + "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1347,13 +1347,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", - "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz", + "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1363,12 +1363,12 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", - "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz", + "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1378,12 +1378,12 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", - "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.7.tgz", + "integrity": "sha512-FbuJ63/4LEL32mIxrxwYaqjJxpbzxPVQj5a+Ebrc8JICV6YX8nE53jY+K0RZT3um56GoNWgkS2BQ/uLGTjtwfw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" }, "engines": { @@ -1394,12 +1394,12 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", - "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.7.tgz", + "integrity": "sha512-8CbutzSSh4hmD+jJHIA8vdTNk15kAzOnFLVVgBSMGr28rt85ouT01/rezMecks9pkU939wDInImwCKv4ahU4IA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-numeric-separator": "^7.10.4" }, "engines": { @@ -1410,15 +1410,15 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", - "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.7.tgz", + "integrity": "sha512-1JdVKPhD7Y5PvgfFy0Mv2brdrolzpzSoUq2pr6xsR+m+3viGGeHEokFKsCgOkbeFOQxfB1Vt2F0cPJLRpFI4Zg==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.7" + "@babel/plugin-transform-parameters": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1428,13 +1428,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", - "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz", + "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-replace-supers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1444,12 +1444,12 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", - "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.7.tgz", + "integrity": "sha512-m9obYBA39mDPN7lJzD5WkGGb0GO54PPLXsbcnj1Hyeu8mSRz7Gb4b1A6zxNX32ZuUySDK4G6it8SDFWD1nCnqg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" }, "engines": { @@ -1460,13 +1460,13 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", - "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.7.tgz", + "integrity": "sha512-h39agClImgPWg4H8mYVAbD1qP9vClFbEjqoJmt87Zen8pjqK8FTPUwrOXAvqu5soytwxrLMd2fx2KSCp2CHcNg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", "@babel/plugin-syntax-optional-chaining": "^7.8.3" }, "engines": { @@ -1477,12 +1477,12 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz", + "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1492,13 +1492,13 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", - "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz", + "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1508,14 +1508,14 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", - "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.7.tgz", + "integrity": "sha512-LzA5ESzBy7tqj00Yjey9yWfs3FKy4EmJyKOSWld144OxkTji81WWnUT8nkLUn+imN/zHL8ZQlOu/MTUAhHaX3g==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, "engines": { @@ -1526,12 +1526,12 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", - "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz", + "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1541,12 +1541,12 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", - "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz", + "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "regenerator-transform": "^0.15.2" }, "engines": { @@ -1557,12 +1557,12 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", - "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz", + "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1572,12 +1572,12 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz", + "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1587,13 +1587,13 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", - "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz", + "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1603,12 +1603,12 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", - "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz", + "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1618,12 +1618,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", - "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz", + "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1633,12 +1633,12 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", - "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz", + "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1648,16 +1648,16 @@ } }, "node_modules/@babel/plugin-transform-typescript": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz", - "integrity": "sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.7.tgz", + "integrity": "sha512-VKlgy2vBzj8AmEzunocMun2fF06bsSWV+FvVXohtL6FGve/+L217qhHxRTVGHEDO/YR8IANcjzgJsd04J8ge5Q==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-typescript": "^7.24.7" + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", + "@babel/plugin-syntax-typescript": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1667,12 +1667,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", - "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz", + "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1682,13 +1682,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", - "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz", + "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1698,13 +1698,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", - "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz", + "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1714,13 +1714,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", - "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz", + "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1730,28 +1730,28 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz", - "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.25.4", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-option": "^7.24.8", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.7.tgz", + "integrity": "sha512-Gibz4OUdyNqqLj+7OAvBZxOD7CklCtMA5/j0JgUEwOnaRULsPDXmic2iKxL2DX2vQduPR5wH2hjZas/Vr/Oc0g==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.25.7", + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-validator-option": "^7.25.7", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.7", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.7", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.7", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.7", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.7", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.24.7", - "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-assertions": "^7.25.7", + "@babel/plugin-syntax-import-attributes": "^7.25.7", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", @@ -1763,60 +1763,60 @@ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.24.7", - "@babel/plugin-transform-async-generator-functions": "^7.25.4", - "@babel/plugin-transform-async-to-generator": "^7.24.7", - "@babel/plugin-transform-block-scoped-functions": "^7.24.7", - "@babel/plugin-transform-block-scoping": "^7.25.0", - "@babel/plugin-transform-class-properties": "^7.25.4", - "@babel/plugin-transform-class-static-block": "^7.24.7", - "@babel/plugin-transform-classes": "^7.25.4", - "@babel/plugin-transform-computed-properties": "^7.24.7", - "@babel/plugin-transform-destructuring": "^7.24.8", - "@babel/plugin-transform-dotall-regex": "^7.24.7", - "@babel/plugin-transform-duplicate-keys": "^7.24.7", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0", - "@babel/plugin-transform-dynamic-import": "^7.24.7", - "@babel/plugin-transform-exponentiation-operator": "^7.24.7", - "@babel/plugin-transform-export-namespace-from": "^7.24.7", - "@babel/plugin-transform-for-of": "^7.24.7", - "@babel/plugin-transform-function-name": "^7.25.1", - "@babel/plugin-transform-json-strings": "^7.24.7", - "@babel/plugin-transform-literals": "^7.25.2", - "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", - "@babel/plugin-transform-member-expression-literals": "^7.24.7", - "@babel/plugin-transform-modules-amd": "^7.24.7", - "@babel/plugin-transform-modules-commonjs": "^7.24.8", - "@babel/plugin-transform-modules-systemjs": "^7.25.0", - "@babel/plugin-transform-modules-umd": "^7.24.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", - "@babel/plugin-transform-new-target": "^7.24.7", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", - "@babel/plugin-transform-numeric-separator": "^7.24.7", - "@babel/plugin-transform-object-rest-spread": "^7.24.7", - "@babel/plugin-transform-object-super": "^7.24.7", - "@babel/plugin-transform-optional-catch-binding": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.8", - "@babel/plugin-transform-parameters": "^7.24.7", - "@babel/plugin-transform-private-methods": "^7.25.4", - "@babel/plugin-transform-private-property-in-object": "^7.24.7", - "@babel/plugin-transform-property-literals": "^7.24.7", - "@babel/plugin-transform-regenerator": "^7.24.7", - "@babel/plugin-transform-reserved-words": "^7.24.7", - "@babel/plugin-transform-shorthand-properties": "^7.24.7", - "@babel/plugin-transform-spread": "^7.24.7", - "@babel/plugin-transform-sticky-regex": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/plugin-transform-typeof-symbol": "^7.24.8", - "@babel/plugin-transform-unicode-escapes": "^7.24.7", - "@babel/plugin-transform-unicode-property-regex": "^7.24.7", - "@babel/plugin-transform-unicode-regex": "^7.24.7", - "@babel/plugin-transform-unicode-sets-regex": "^7.25.4", + "@babel/plugin-transform-arrow-functions": "^7.25.7", + "@babel/plugin-transform-async-generator-functions": "^7.25.7", + "@babel/plugin-transform-async-to-generator": "^7.25.7", + "@babel/plugin-transform-block-scoped-functions": "^7.25.7", + "@babel/plugin-transform-block-scoping": "^7.25.7", + "@babel/plugin-transform-class-properties": "^7.25.7", + "@babel/plugin-transform-class-static-block": "^7.25.7", + "@babel/plugin-transform-classes": "^7.25.7", + "@babel/plugin-transform-computed-properties": "^7.25.7", + "@babel/plugin-transform-destructuring": "^7.25.7", + "@babel/plugin-transform-dotall-regex": "^7.25.7", + "@babel/plugin-transform-duplicate-keys": "^7.25.7", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.7", + "@babel/plugin-transform-dynamic-import": "^7.25.7", + "@babel/plugin-transform-exponentiation-operator": "^7.25.7", + "@babel/plugin-transform-export-namespace-from": "^7.25.7", + "@babel/plugin-transform-for-of": "^7.25.7", + "@babel/plugin-transform-function-name": "^7.25.7", + "@babel/plugin-transform-json-strings": "^7.25.7", + "@babel/plugin-transform-literals": "^7.25.7", + "@babel/plugin-transform-logical-assignment-operators": "^7.25.7", + "@babel/plugin-transform-member-expression-literals": "^7.25.7", + "@babel/plugin-transform-modules-amd": "^7.25.7", + "@babel/plugin-transform-modules-commonjs": "^7.25.7", + "@babel/plugin-transform-modules-systemjs": "^7.25.7", + "@babel/plugin-transform-modules-umd": "^7.25.7", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.7", + "@babel/plugin-transform-new-target": "^7.25.7", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.7", + "@babel/plugin-transform-numeric-separator": "^7.25.7", + "@babel/plugin-transform-object-rest-spread": "^7.25.7", + "@babel/plugin-transform-object-super": "^7.25.7", + "@babel/plugin-transform-optional-catch-binding": "^7.25.7", + "@babel/plugin-transform-optional-chaining": "^7.25.7", + "@babel/plugin-transform-parameters": "^7.25.7", + "@babel/plugin-transform-private-methods": "^7.25.7", + "@babel/plugin-transform-private-property-in-object": "^7.25.7", + "@babel/plugin-transform-property-literals": "^7.25.7", + "@babel/plugin-transform-regenerator": "^7.25.7", + "@babel/plugin-transform-reserved-words": "^7.25.7", + "@babel/plugin-transform-shorthand-properties": "^7.25.7", + "@babel/plugin-transform-spread": "^7.25.7", + "@babel/plugin-transform-sticky-regex": "^7.25.7", + "@babel/plugin-transform-template-literals": "^7.25.7", + "@babel/plugin-transform-typeof-symbol": "^7.25.7", + "@babel/plugin-transform-unicode-escapes": "^7.25.7", + "@babel/plugin-transform-unicode-property-regex": "^7.25.7", + "@babel/plugin-transform-unicode-regex": "^7.25.7", + "@babel/plugin-transform-unicode-sets-regex": "^7.25.7", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.10", "babel-plugin-polyfill-corejs3": "^0.10.6", "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.37.1", + "core-js-compat": "^3.38.1", "semver": "^6.3.1" }, "engines": { @@ -1850,16 +1850,16 @@ } }, "node_modules/@babel/preset-typescript": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz", - "integrity": "sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.25.7.tgz", + "integrity": "sha512-rkkpaXJZOFN45Fb+Gki0c+KMIglk4+zZXOoMJuyEK8y8Kkc8Jd3BDmP7qPsz0zQMJj+UD7EprF+AqAXcILnexw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-validator-option": "^7.24.7", - "@babel/plugin-syntax-jsx": "^7.24.7", - "@babel/plugin-transform-modules-commonjs": "^7.24.7", - "@babel/plugin-transform-typescript": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-validator-option": "^7.25.7", + "@babel/plugin-syntax-jsx": "^7.25.7", + "@babel/plugin-transform-modules-commonjs": "^7.25.7", + "@babel/plugin-transform-typescript": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1868,16 +1868,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true - }, "node_modules/@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -1887,30 +1881,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", + "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", - "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", + "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.6", - "@babel/parser": "^7.25.6", - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6", + "@babel/code-frame": "^7.25.7", + "@babel/generator": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/template": "^7.25.7", + "@babel/types": "^7.25.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1919,13 +1913,13 @@ } }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz", + "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-string-parser": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2475,50 +2469,6 @@ "deprecated": "Use @eslint/object-schema instead", "dev": true }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", @@ -2858,16 +2808,6 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@pnpm/config.env-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", @@ -2910,17 +2850,18 @@ } }, "node_modules/@rollup/plugin-commonjs": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.1.tgz", - "integrity": "sha512-UnsKoZK6/aGIH6AdkptXhNvhaqftcjq3zZdT+LY5Ftms6JR06nADcDsYp5hTU9E2lbJUEOhdlY5J4DNTneM+jQ==", + "version": "28.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.0.tgz", + "integrity": "sha512-BJcu+a+Mpq476DMXG+hevgPSl56bkUoi88dKT8t3RyUp8kGuOh+2bU8Gs7zXDlu+fyZggnJ+iOBGrb/O1SorYg==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.0.1", "commondir": "^1.0.1", "estree-walker": "^2.0.2", - "glob": "^10.4.1", + "fdir": "^6.1.1", "is-reference": "1.2.1", - "magic-string": "^0.30.3" + "magic-string": "^0.30.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=16.0.0 || 14 >= 14.17" @@ -2934,10 +2875,22 @@ } } }, + "node_modules/@rollup/plugin-commonjs/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/@rollup/plugin-dynamic-import-vars": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-dynamic-import-vars/-/plugin-dynamic-import-vars-2.1.2.tgz", - "integrity": "sha512-4lr2oXxs9hcxtGGaK8s0i9evfjzDrAs7ngw28TqruWKTEm0+U4Eljb+F6HXGYdFv8xRojQlrQwV7M/yxeh3yzQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-dynamic-import-vars/-/plugin-dynamic-import-vars-2.1.3.tgz", + "integrity": "sha512-9ZuItXkvbx0NUeEO0TMIYY7KAK/c7biumCTVrk6nwW81om7apA3/yju6JUm1pFMWmF/bZbyrom20NupRZWk9Wg==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.0.1", @@ -2979,15 +2932,14 @@ } }, "node_modules/@rollup/plugin-node-resolve": { - "version": "15.2.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz", - "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==", + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz", + "integrity": "sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.0.1", "@types/resolve": "1.20.2", "deepmerge": "^4.2.2", - "is-builtin-module": "^3.2.1", "is-module": "^1.0.0", "resolve": "^1.22.1" }, @@ -3004,9 +2956,9 @@ } }, "node_modules/@rollup/plugin-replace": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.7.tgz", - "integrity": "sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.1.tgz", + "integrity": "sha512-2sPh9b73dj5IxuMmDAsQWVFT7mR+yoHweBaXG2W/R8vQ+IWZlnaI7BR7J6EguVQUp1hd8Z7XuozpDjEKQAAC2Q==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.0.1", @@ -3025,9 +2977,9 @@ } }, "node_modules/@rollup/plugin-typescript": { - "version": "11.1.6", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz", - "integrity": "sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.0.tgz", + "integrity": "sha512-Kzs8KGJofe7cfTRODsnG1jNGxSvU8gVoNNd7Z/QaY25AYwe2LSSUpx/kPxqF38NYkpR8de3m51r9uwJpDlz6dg==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.1.0", @@ -3051,9 +3003,9 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", - "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.2.tgz", + "integrity": "sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", @@ -3071,10 +3023,21 @@ } } }, + "node_modules/@rollup/pluginutils/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.3.tgz", - "integrity": "sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz", + "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==", "cpu": [ "arm" ], @@ -3085,9 +3048,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.3.tgz", - "integrity": "sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz", + "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==", "cpu": [ "arm64" ], @@ -3098,9 +3061,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.3.tgz", - "integrity": "sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz", + "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==", "cpu": [ "arm64" ], @@ -3111,9 +3074,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.3.tgz", - "integrity": "sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz", + "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==", "cpu": [ "x64" ], @@ -3124,9 +3087,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.3.tgz", - "integrity": "sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz", + "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==", "cpu": [ "arm" ], @@ -3137,9 +3100,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.3.tgz", - "integrity": "sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz", + "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==", "cpu": [ "arm" ], @@ -3150,9 +3113,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.3.tgz", - "integrity": "sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz", + "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==", "cpu": [ "arm64" ], @@ -3163,9 +3126,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.3.tgz", - "integrity": "sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz", + "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==", "cpu": [ "arm64" ], @@ -3176,9 +3139,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.3.tgz", - "integrity": "sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz", + "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==", "cpu": [ "ppc64" ], @@ -3189,9 +3152,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.3.tgz", - "integrity": "sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz", + "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==", "cpu": [ "riscv64" ], @@ -3202,9 +3165,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.3.tgz", - "integrity": "sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz", + "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==", "cpu": [ "s390x" ], @@ -3215,9 +3178,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.3.tgz", - "integrity": "sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz", + "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==", "cpu": [ "x64" ], @@ -3228,9 +3191,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.3.tgz", - "integrity": "sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz", + "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==", "cpu": [ "x64" ], @@ -3241,9 +3204,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.3.tgz", - "integrity": "sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz", + "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==", "cpu": [ "arm64" ], @@ -3254,9 +3217,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.3.tgz", - "integrity": "sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz", + "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==", "cpu": [ "ia32" ], @@ -3267,9 +3230,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.3.tgz", - "integrity": "sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz", + "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==", "cpu": [ "x64" ], @@ -3514,9 +3477,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==" }, "node_modules/@types/fs-extra": { "version": "8.1.5", @@ -3599,9 +3562,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.93.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.93.0.tgz", - "integrity": "sha512-kUK6jAHSR5zY8ps42xuW89NLcBpw1kOabah7yv38J8MyiYuOHxLQBi0e7zeXbQgVefDy/mZZetqEFC+Fl5eIEQ==", + "version": "1.94.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.94.0.tgz", + "integrity": "sha512-UyQOIUT0pb14XSqJskYnRwD2aG0QrPVefIfrW1djR+/J4KeFQ0i1+hjZoaAmeNf3Z2jleK+R2hv+EboG/m8ruw==", "dev": true }, "node_modules/@types/vscode-semver": { @@ -3861,9 +3824,9 @@ "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==" }, "node_modules/@vscode/proxy-agent": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.23.0.tgz", - "integrity": "sha512-6lgxRrzURdWwBkk6TaB0+EYYjIWQXxry6GlVO0toBN8amIyVd3I7hLPKU9Xf+SOrLIrbdU0CLkmTOBHpPJLf/g==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz", + "integrity": "sha512-TQrv456pbrjmD6G+iOoXE1Mflm+8Ic/Kny4QU7ioiYe2+0HisvqzJM/CUa3Am5SWrNjMbntTHISjgmSaSlorrA==", "dependencies": { "@tootallnate/once": "^3.0.0", "agent-base": "^7.0.1", @@ -4007,65 +3970,65 @@ } }, "node_modules/@xterm/addon-clipboard": { - "version": "0.2.0-beta.39", - "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.39.tgz", - "integrity": "sha512-PeJZP69FHg2p1NJKLGyqUITahvEexqwYoQAgYheu4d9UBhIdP6D/KWGT8DVAEPeeulXhcr2UXgYWMVQAooTvrw==", + "version": "0.2.0-beta.49", + "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.49.tgz", + "integrity": "sha512-rjYGvWOdv4chQ0J8r25iR1nAv9F2LGAy0VMUaz4jGAXPHC5JvLZdtN5Se+Hv6rNHGHS4FjiAZF2fJRY6YtQgAg==", "dependencies": { "js-base64": "^3.7.5" }, "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.56" + "@xterm/xterm": "^5.6.0-beta.66" } }, "node_modules/@xterm/addon-image": { - "version": "0.9.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.56.tgz", - "integrity": "sha512-kwE4ZDlPxXsBk4mnQoqMvSwu9aKQclniIybs90t0L2qGPLcI8/7Akm1i9aXbu8eZF2hoLEPfLC3CZPda+4ioOA==", + "version": "0.9.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.66.tgz", + "integrity": "sha512-BFpdJiIs3LnirhZwVAzadS9H/vgjhZEixCFxjY7B864hZZs6BrY4peFo2N33l59RHhuDd5pq6m9daTTd9k76/g==", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.56" + "@xterm/xterm": "^5.6.0-beta.66" } }, "node_modules/@xterm/addon-search": { - "version": "0.16.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.56.tgz", - "integrity": "sha512-f8aoldPGssse1UR2N3f94fRUc7K3eulb+F80MFhim4rP+shX3QO9QdEZtwr+JaPEujjnuBM5tQKQDuRQtbwuMQ==", + "version": "0.16.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.66.tgz", + "integrity": "sha512-L1eDMOEa34/UGk+3arW6toDa3szz9afGqr51x9arnP5hqtDwEE5m9pYyBaDjO4OQy8I/gNqRT3BVwIZySrA88g==", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.56" + "@xterm/xterm": "^5.6.0-beta.66" } }, "node_modules/@xterm/addon-serialize": { - "version": "0.14.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.56.tgz", - "integrity": "sha512-VGAYJXFfXuY1Ze8CliT28DoYI74s8fdTI9919C0sgWwtzfAa7W43jJ56g0oKVEM0wO20wfdESapwpQ7enMzrHQ==", + "version": "0.14.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.66.tgz", + "integrity": "sha512-t/hwjeosl0JljMR83hNY3BmwEj82AcMxXXWKzwa7B3C464EMY/UJS8VcJIJ1OMXzEHNMTrsRBOrI8PYbDDfETw==", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.56" + "@xterm/xterm": "^5.6.0-beta.66" } }, "node_modules/@xterm/addon-unicode11": { - "version": "0.9.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.56.tgz", - "integrity": "sha512-oWa8xLWMDKgJboqOT57PaNAWYz+2INW5aUc24E0Nzv+gKXVy+8lRoqy50m3DhsOb1YtDaPVloqvambKBaXSing==", + "version": "0.9.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.66.tgz", + "integrity": "sha512-yaOw8kzW8lB40j5aU+vKN5kSm7UXOr6jXMWbCRDSn0yjk+3rXzihPZRH4jVDgdN2x1ASsiNvpBtnM443speOLw==", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.56" + "@xterm/xterm": "^5.6.0-beta.66" } }, "node_modules/@xterm/addon-webgl": { - "version": "0.19.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.56.tgz", - "integrity": "sha512-aYNRENPJBb1uoV7QifEwCnbjCXmQD5yQmuxNJab3bOZ68aCSGC/EKc4/4Ov0klkXi8ceF4ZnbNiqAX3jw5L1jg==", + "version": "0.19.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.66.tgz", + "integrity": "sha512-HVLxYbZ5GbH6DSB7/gVfTraCXOLyO1YU1WOj7CuEvwaosZugb/TIm6AJWfWMMU72brVFg3qGuXlCzuldZTnboA==", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.56" + "@xterm/xterm": "^5.6.0-beta.66" } }, "node_modules/@xterm/headless": { - "version": "5.6.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.56.tgz", - "integrity": "sha512-aQOCzFDn/yqdATwf+ho1q5Hu2MzQwnXHgcsVx/qwUit/URKgbp1QyOQom88nzprP6D/59tiSeX+tqUS1HPqwMw==" + "version": "5.6.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.66.tgz", + "integrity": "sha512-7d1fO6kdzcqjthZ1U+rVJiapJ/BuwoVv5qgvSE2ytzhjNAkLSWozqRKo+31ycwNLmP1a+QE4273IJ+wrHIBRng==" }, "node_modules/@xterm/xterm": { - "version": "5.6.0-beta.56", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.56.tgz", - "integrity": "sha512-gtLrCQNkF1LikB21Bj9JYiBrrXMMvPEZkOIiA7MlXoSd7T7v+GYPumrODB2SBuhPdZ8N66z2rbUOfSRzxGwMtA==" + "version": "5.6.0-beta.66", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.66.tgz", + "integrity": "sha512-hmvS0e4sa6xBmeKIwxZE+RDTKpeLqJ3VSOlMUzvi5utV3xa7gwt5M60eRlSn+0qi8cRMuUCTvJhDFW1pP62+lw==" }, "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", @@ -4526,9 +4489,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", + "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", "dev": true, "funding": [ { @@ -4545,8 +4508,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", + "caniuse-lite": "^1.0.30001663", + "electron-to-chromium": "^1.5.28", "node-releases": "^2.0.18", "update-browserslist-db": "^1.1.0" }, @@ -4588,18 +4551,6 @@ "node": "*" } }, - "node_modules/builtin-modules": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", - "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/call-bind": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", @@ -4641,9 +4592,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001660", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", - "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", + "version": "1.0.30001667", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz", + "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==", "dev": true, "funding": [ { @@ -5763,22 +5714,10 @@ "readable-stream": "^2.0.2" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, "node_modules/electron-to-chromium": { - "version": "1.5.24", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.24.tgz", - "integrity": "sha512-0x0wLCmpdKFCi9ulhvYZebgcPmHTkFVUfU2wzDykadkslKwT4oAmDTHEKLnlrDsMGZe4B+ksn8quZfZjYsBetA==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "1.5.32", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz", + "integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==", "dev": true }, "node_modules/emojilib": { @@ -6801,6 +6740,20 @@ "pend": "~1.2.0" } }, + "node_modules/fdir": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.0.tgz", + "integrity": "sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==", + "dev": true, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, "node_modules/figures": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz", @@ -6936,22 +6889,6 @@ "is-callable": "^1.1.3" } }, - "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -7172,26 +7109,6 @@ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" }, - "node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -7720,21 +7637,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-builtin-module": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", - "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", - "dev": true, - "dependencies": { - "builtin-modules": "^3.3.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -8088,21 +7990,6 @@ "node": "^18.17 || >=20.6.1" } }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/java-properties": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz", @@ -8181,15 +8068,15 @@ } }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -8586,9 +8473,9 @@ "dev": true }, "node_modules/memfs": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.11.1.tgz", - "integrity": "sha512-LZcMTBAgqUUKNXZagcZxvXXfgF1bHX7Y7nQ0QyEiNbRJgE29GhgPd8Yna1VQcLlPiHt/5RFJMWYN9Uv/VPNvjQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz", + "integrity": "sha512-74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA==", "dependencies": { "@jsonjoy.com/json-pack": "^1.0.3", "@jsonjoy.com/util": "^1.3.0", @@ -8642,6 +8529,17 @@ "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz", @@ -8722,15 +8620,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -11797,12 +11686,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", - "dev": true - }, "node_modules/param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", @@ -12105,28 +11988,6 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -12157,11 +12018,14 @@ "dev": true }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "optional": true, + "peer": true, "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -13088,15 +12952,15 @@ } }, "node_modules/regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz", + "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==", "dev": true, "dependencies": { - "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", + "regenerate-unicode-properties": "^10.2.0", + "regjsgen": "^0.8.0", + "regjsparser": "^0.11.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -13131,27 +12995,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", + "dev": true + }, "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz", + "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==", "dev": true, "dependencies": { - "jsesc": "~0.5.0" + "jsesc": "~3.0.2" }, "bin": { "regjsparser": "bin/parser" } }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -13275,12 +13136,12 @@ } }, "node_modules/rollup": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.3.tgz", - "integrity": "sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz", + "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==", "devOptional": true, "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -13290,22 +13151,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.21.3", - "@rollup/rollup-android-arm64": "4.21.3", - "@rollup/rollup-darwin-arm64": "4.21.3", - "@rollup/rollup-darwin-x64": "4.21.3", - "@rollup/rollup-linux-arm-gnueabihf": "4.21.3", - "@rollup/rollup-linux-arm-musleabihf": "4.21.3", - "@rollup/rollup-linux-arm64-gnu": "4.21.3", - "@rollup/rollup-linux-arm64-musl": "4.21.3", - "@rollup/rollup-linux-powerpc64le-gnu": "4.21.3", - "@rollup/rollup-linux-riscv64-gnu": "4.21.3", - "@rollup/rollup-linux-s390x-gnu": "4.21.3", - "@rollup/rollup-linux-x64-gnu": "4.21.3", - "@rollup/rollup-linux-x64-musl": "4.21.3", - "@rollup/rollup-win32-arm64-msvc": "4.21.3", - "@rollup/rollup-win32-ia32-msvc": "4.21.3", - "@rollup/rollup-win32-x64-msvc": "4.21.3", + "@rollup/rollup-android-arm-eabi": "4.24.0", + "@rollup/rollup-android-arm64": "4.24.0", + "@rollup/rollup-darwin-arm64": "4.24.0", + "@rollup/rollup-darwin-x64": "4.24.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.0", + "@rollup/rollup-linux-arm-musleabihf": "4.24.0", + "@rollup/rollup-linux-arm64-gnu": "4.24.0", + "@rollup/rollup-linux-arm64-musl": "4.24.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0", + "@rollup/rollup-linux-riscv64-gnu": "4.24.0", + "@rollup/rollup-linux-s390x-gnu": "4.24.0", + "@rollup/rollup-linux-x64-gnu": "4.24.0", + "@rollup/rollup-linux-x64-musl": "4.24.0", + "@rollup/rollup-win32-arm64-msvc": "4.24.0", + "@rollup/rollup-win32-ia32-msvc": "4.24.0", + "@rollup/rollup-win32-x64-msvc": "4.24.0", "fsevents": "~2.3.2" } }, @@ -13525,6 +13386,18 @@ "node": ">=12" } }, + "node_modules/rollup-plugin-styles/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/rollup-plugin-styles/node_modules/yaml": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", @@ -14285,71 +14158,6 @@ "safe-buffer": "~5.1.0" } }, - "node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/string.prototype.trim": { "version": "1.2.9", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", @@ -14411,19 +14219,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -15315,133 +15110,6 @@ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", "dev": true }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -15584,9 +15252,9 @@ } }, "node_modules/zx": { - "version": "8.1.7", - "resolved": "https://registry.npmjs.org/zx/-/zx-8.1.7.tgz", - "integrity": "sha512-vPXetXOnlJ6a6bGSCIN1iaxjK2QZbOqwyOfMhFzqUpKF1aHPGQvQXu8ijwDQMe4lUMyk1Mo0qpIhrNzYXES6nw==", + "version": "8.1.9", + "resolved": "https://registry.npmjs.org/zx/-/zx-8.1.9.tgz", + "integrity": "sha512-UHuLHphHmsBYKkAchkSrEN4nzDyagafqC9HUxtc1J7eopaScW6H9dsLJ1lmkAntnLtDTGoM8fa+jrJrXiIfKFA==", "dev": true, "bin": { "zx": "build/cli.js" diff --git a/package.json b/package.json index f1ca60c9..62d5aab6 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, "config": { "vscode": { - "version": "1.93.1", - "ref": "1.93.1", - "commit": "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40" + "version": "1.94.0", + "ref": "1.94.0", + "commit": "d78a74bcdfad14d5d3b1b782f87255d802b57511" }, "monaco": { "ref": "v0.52.0", @@ -41,26 +41,26 @@ } }, "devDependencies": { - "@babel/core": "^7.25.2", + "@babel/core": "^7.25.7", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.24.7", - "@babel/preset-env": "^7.25.4", - "@babel/preset-typescript": "^7.24.7", + "@babel/plugin-proposal-decorators": "^7.25.7", + "@babel/preset-env": "^7.25.7", + "@babel/preset-typescript": "^7.25.7", "@codingame/commitlint-config-codingame": "^1.1.1", "@codingame/eslint-config": "^1.2.1", "@codingame/semantic-release-config-github": "^1.0.0", "@codingame/tsconfig": "^1.1.1", "@commitlint/cli": "^19.5.0", - "@rollup/plugin-commonjs": "^26.0.1", - "@rollup/plugin-dynamic-import-vars": "^2.1.2", + "@rollup/plugin-commonjs": "^28.0.0", + "@rollup/plugin-dynamic-import-vars": "^2.1.3", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-replace": "^5.0.7", - "@rollup/plugin-typescript": "^11.1.6", + "@rollup/plugin-node-resolve": "^15.3.0", + "@rollup/plugin-replace": "^6.0.1", + "@rollup/plugin-typescript": "^12.1.0", "@types/mime-types": "^2.1.4", "@types/node": "18.19.8", "@types/semver": "^7.5.8", - "@types/vscode": "~1.93.0", + "@types/vscode": "~1.94.0", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.33", "@types/yauzl": "^2.10.3", @@ -82,7 +82,7 @@ "pascal-case": "^3.1.2", "patch-package": "^8.0.0", "recast": "^0.23.9", - "rollup": "^4.21.3", + "rollup": "^4.24.0", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.1.1", "rollup-plugin-styles": "^4.0.0", @@ -94,35 +94,36 @@ "typescript": "^5.6.2", "vscode-semver": "npm:semver@=5.5.0", "yargs": "^17.7.2", - "zx": "^8.1.6" + "zx": "^8.1.9" }, "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", "@parcel/watcher": "2.1.0", - "@rollup/pluginutils": "^5.1.0", + "@rollup/pluginutils": "^5.1.2", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.23.0", + "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", + "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-clipboard": "0.2.0-beta.39", - "@xterm/addon-image": "0.9.0-beta.56", - "@xterm/addon-search": "0.16.0-beta.56", - "@xterm/addon-serialize": "0.14.0-beta.56", - "@xterm/addon-unicode11": "0.9.0-beta.56", - "@xterm/addon-webgl": "0.19.0-beta.56", - "@xterm/headless": "5.6.0-beta.56", - "@xterm/xterm": "5.6.0-beta.56", + "@xterm/addon-clipboard": "^0.2.0-beta.47", + "@xterm/addon-image": "^0.9.0-beta.64", + "@xterm/addon-search": "^0.16.0-beta.64", + "@xterm/addon-serialize": "^0.14.0-beta.64", + "@xterm/addon-unicode11": "^0.9.0-beta.64", + "@xterm/addon-webgl": "^0.19.0-beta.64", + "@xterm/headless": "^5.6.0-beta.64", + "@xterm/xterm": "^5.6.0-beta.64", "cookie": "^0.4.0", "css-url-parser": "^1.1.4", "jschardet": "3.1.3", "kerberos": "2.1.1", "keytar": "^7.9.0", "marked": "~14.0.0", - "memfs": "^4.11.1", + "memfs": "^4.12.0", "mime-types": "^2.1.35", "node-pty": "1.1.0-beta21", "vscode-oniguruma": "1.7.0", diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index 733d82fc..82f44d97 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -324,6 +324,9 @@ function transformVSCodeCode (id: string, code: string) { } function resolveVscode (importee: string, importer?: string) { + if (importee.endsWith('.js')) { + importee = importee.slice(0, -3) + } if (importer != null && importee.startsWith('.')) { importee = nodePath.resolve(nodePath.dirname(importer), importee) } diff --git a/src/extension.api.ts b/src/extension.api.ts index 45115feb..6fe35830 100644 --- a/src/extension.api.ts +++ b/src/extension.api.ts @@ -315,7 +315,8 @@ const api: typeof vscode = { InlineEditTriggerKind: extHostTypes.InlineEditTriggerKind, ExcludeSettingOptions: searchExtTypes.ExcludeSettingOptions, TextSearchContextNew: searchExtTypes.TextSearchContextNew, - TextSearchMatchNew: searchExtTypes.TextSearchMatchNew + TextSearchMatchNew: searchExtTypes.TextSearchMatchNew, + ChatResponseCodeblockUriPart: extHostTypes.ChatResponseCodeblockUriPart } // @ts-ignore 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 3bb3e948..69b6fba9 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -226,6 +226,11 @@ import { IIntegrityService } from 'vs/workbench/services/integrity/common/integr import { IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity' import { ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService.service' import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service' +import { PortsEnablement } from 'vs/workbench/services/remote/common/remoteExplorerService' +import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service' +import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service' +import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service' +import { ITreeSitterTokenizationFeature } from 'vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service' import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n' import { unsupported } from './tools' @@ -969,9 +974,10 @@ registerSingleton(IExtensionHostDebugService, class ExtensionHostDebugService im }, InstantiationType.Eager) registerSingleton(IViewsService, class ViewsService implements IViewsService { + _serviceBrand: undefined + isViewContainerActive = () => false getFocusedViewName = unsupported onDidChangeFocusedView = Event.None - _serviceBrand: undefined onDidChangeViewContainerVisibility = Event.None isViewContainerVisible = () => false openViewContainer = unsupported @@ -1106,6 +1112,7 @@ registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, class MonacoSearchService implements ISearchService { _serviceBrand: undefined constructor (@IModelService private modelService: IModelService) {} + getAIName = async () => undefined aiTextSearch = unsupported textSearchSplitSyncAsync = unsupported @@ -1166,6 +1173,11 @@ registerSingleton(ITimerService, class TimerService implements ITimerService { registerSingleton(IExtensionsWorkbenchService, class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { _serviceBrand: undefined + updateAutoUpdateForAllExtensions = unsupported + openSearch = unsupported + getExtensionRuntimeStatus = () => undefined + onDidChangeExtensionsNotification = Event.None + getExtensionsNotification = () => undefined shouldRequireConsentToUpdate = async () => undefined updateAutoUpdateValue = unsupported getResourceExtensions = unsupported @@ -2315,6 +2327,9 @@ registerSingleton(IAccessibleViewInformationService, class AccessibleViewInforma registerSingleton(IWorkbenchExtensionManagementService, class WorkbenchExtensionManagementService implements IWorkbenchExtensionManagementService { _serviceBrand: undefined + onProfileAwareDidInstallExtensions = Event.None + onProfileAwareDidUninstallExtension = Event.None + onProfileAwareDidUpdateExtensionMetadata = Event.None uninstallExtensions = unsupported resetPinnedStateForAllUserExtensions = unsupported getInstalledWorkspaceExtensionLocations = () => [] @@ -2435,6 +2450,7 @@ registerSingleton(IExtensionUrlHandler, class ExtensionUrlHandler implements IEx registerSingleton(ICommentService, class CommentService implements ICommentService { _serviceBrand: undefined + lastActiveCommentcontroller = undefined get commentsModel () { return unsupported() @@ -2605,7 +2621,7 @@ registerSingleton(IRemoteExplorerService, class RemoteExplorerService implements restore = unsupported enablePortsFeatures = unsupported onEnabledPortsFeatures = Event.None - portsFeaturesEnabled = false + portsFeaturesEnabled = PortsEnablement.Disabled namedProcesses = new Map() }, InstantiationType.Delayed) @@ -2640,6 +2656,10 @@ registerSingleton(IAuthenticationAccessService, class AuthenticationAccessServic registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensionsService implements IAuthenticationExtensionsService { _serviceBrand: undefined + onDidChangeAccountPreference = Event.None + getAccountPreference = () => undefined + updateAccountPreference = unsupported + removeAccountPreference = unsupported updateSessionPreference = unsupported getSessionPreference = () => undefined removeSessionPreference = unsupported @@ -2650,6 +2670,8 @@ registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensio registerSingleton(IAuthenticationUsageService, class AuthenticationUsageService implements IAuthenticationUsageService { _serviceBrand: undefined + initializeExtensionUsageCache = unsupported + extensionUsesAuth = async () => false readAccountUsages = unsupported removeAccountUsage = unsupported addAccountUsage = unsupported @@ -2744,6 +2766,10 @@ registerSingleton(IWorkbenchIssueService, class WorkbenchIssueService implements registerSingleton(ISCMViewService, class SCMViewService implements ISCMViewService { _serviceBrand: undefined + get activeRepository () { + return unsupported() + } + get menus () { return unsupported() } @@ -3200,6 +3226,7 @@ registerSingleton(IUserDataSyncUtilService, class UserDataSyncUtilService implem registerSingleton(IUserDataProfileManagementService, class UserDataProfileManagementService implements IUserDataProfileManagementService { _serviceBrand: undefined + getDefaultProfileToUse = unsupported createProfile = unsupported createAndEnterProfile = unsupported createAndEnterTransientProfile = unsupported @@ -3371,3 +3398,27 @@ registerSingleton(IIssueFormService, class IssueFormService implements IIssueFor sendReporterMenu = unsupported closeReporter = unsupported }, InstantiationType.Delayed) + +registerSingleton(ICodeMapperService, class CodeMapperService implements ICodeMapperService { + _serviceBrand: undefined + registerCodeMapperProvider = unsupported + mapCode = async () => undefined +}, InstantiationType.Delayed) + +registerSingleton(IChatEditingService, class ChatEditingService implements IChatEditingService { + _serviceBrand: undefined + onDidCreateEditingSession = Event.None + currentEditingSession = null + startOrContinueEditingSession = unsupported +}, InstantiationType.Delayed) + +registerSingleton(IActionViewItemService, class ActionViewItemService implements IActionViewItemService { + _serviceBrand: undefined + onDidChange = Event.None + register = unsupported + lookUp = () => undefined +}, InstantiationType.Delayed) + +registerSingleton(ITreeSitterTokenizationFeature, class TreeSitterTokenizationFeature implements ITreeSitterTokenizationFeature { + _serviceBrand: undefined +}, InstantiationType.Delayed) diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index 3ad67577..1ab7cd9e 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -27,7 +27,10 @@ import 'vs/workbench/contrib/chat/browser/chat.contribution' import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution' import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service' import { LanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService' - +import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service' +import { CodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService' +import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service' +import { ChatEditingService } from 'vs/workbench/contrib/chat/browser/chatEditingService' export default function getServiceOverride (): IEditorOverrideServices { return { [IChatService.toString()]: new SyncDescriptor(ChatService, [], true), @@ -44,6 +47,8 @@ export default function getServiceOverride (): IEditorOverrideServices { [IChatCodeBlockContextProviderService.toString()]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true), [ILanguageModelStatsService.toString()]: new SyncDescriptor(LanguageModelStatsService, [], true), [IChatAgentNameService.toString()]: new SyncDescriptor(ChatAgentNameService, [], true), - [ILanguageModelToolsService.toString()]: new SyncDescriptor(LanguageModelToolsService, [], true) + [ILanguageModelToolsService.toString()]: new SyncDescriptor(LanguageModelToolsService, [], true), + [ICodeMapperService.toString()]: new SyncDescriptor(CodeMapperService, [], true), + [IChatEditingService.toString()]: new SyncDescriptor(ChatEditingService, [], true) } } diff --git a/src/service-override/viewCommon.ts b/src/service-override/viewCommon.ts index 81c5ab12..993ded89 100644 --- a/src/service-override/viewCommon.ts +++ b/src/service-override/viewCommon.ts @@ -38,6 +38,8 @@ import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPa import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService' import { CustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService' import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService.service' +import { ActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService' +import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service' import getBulkEditServiceOverride from './bulkEdit' import { changeUrlDomain } from './tools/url' import { registerAssets } from '../assets' @@ -101,7 +103,8 @@ function getServiceOverride (_webviewIframeAlternateDomains?: string): IEditorOv [IProgressService.toString()]: new SyncDescriptor(ProgressService, [], true), [IAuxiliaryWindowService.toString()]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true), [IEditorPaneService.toString()]: new SyncDescriptor(EditorPaneService, [], true), - [ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true) + [ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true), + [IActionViewItemService.toString()]: new SyncDescriptor(ActionViewItemService, [], true) } } diff --git a/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch b/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch index a2632582..e1d36806 100644 --- a/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch +++ b/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: allow importing vscode-oniguruma 1 file changed, 1 insertion(+) diff --git a/.eslintrc.json b/.eslintrc.json -index 1deaf02985b..889ddcd4d3d 100644 +index 879d547f9b5..6282847cafb 100644 --- a/.eslintrc.json +++ b/.eslintrc.json -@@ -673,6 +673,7 @@ +@@ -731,6 +731,7 @@ "v8-inspect-profiler", "vscode-regexpp", "vscode-textmate", diff --git a/vscode-paches/0002-fix-fix-editor-api-types.patch b/vscode-paches/0002-fix-fix-editor-api-types.patch index a384a50a..01f54aec 100644 --- a/vscode-paches/0002-fix-fix-editor-api-types.patch +++ b/vscode-paches/0002-fix-fix-editor-api-types.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: fix editor api types 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js -index 088748b8356..324514d04b5 100644 +index 0d55982a8aa..debdf037393 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js -@@ -277,7 +277,16 @@ function toExternalDTS(contents) { +@@ -239,7 +239,16 @@ function toExternalDTS(contents) { } if (line.indexOf('declare let MonacoEnvironment') === 0) { diff --git a/vscode-paches/0004-cleanup-remove-amd-build-to-speed-up-editor-build.patch b/vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch similarity index 75% rename from vscode-paches/0004-cleanup-remove-amd-build-to-speed-up-editor-build.patch rename to vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch index 34d1524a..87dc1cae 100644 --- a/vscode-paches/0004-cleanup-remove-amd-build-to-speed-up-editor-build.patch +++ b/vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch @@ -4,14 +4,14 @@ Date: Mon, 11 Mar 2024 16:44:07 +0100 Subject: [PATCH] cleanup: remove amd build to speed up editor build --- - build/gulpfile.editor.js | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) + build/gulpfile.editor.js | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js -index 324514d04b5..0cc0fd8b806 100644 +index debdf037393..a5951d21d34 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js -@@ -413,17 +413,10 @@ gulp.task('editor-distro', +@@ -375,16 +375,9 @@ gulp.task('editor-distro', util.rimraf('out-editor-min') ), extractEditorSrcTask, @@ -24,12 +24,10 @@ index 324514d04b5..0cc0fd8b806 100644 - task.series( - createESMSourcesAndResourcesTask, - compileEditorESMTask, -- appendJSToESMImportsTask - ) + task.series( + createESMSourcesAndResourcesTask, + compileEditorESMTask, -+ appendJSToESMImportsTask ), finalEditorResourcesTask ) diff --git a/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch b/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch deleted file mode 100644 index b058973d..00000000 --- a/vscode-paches/0003-fix-fix-some-build-process-edge-cases.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Mon, 11 Mar 2024 16:42:35 +0100 -Subject: [PATCH] fix: fix some build process edge cases - ---- - build/lib/standalone.js | 7 +++++++ - build/lib/standalone.ts | 7 +++++++ - 2 files changed, 14 insertions(+) - -diff --git a/build/lib/standalone.js b/build/lib/standalone.js -index 78030842569..2e2b716dcb7 100644 ---- a/build/lib/standalone.js -+++ b/build/lib/standalone.js -@@ -147,6 +147,9 @@ function createESMSourcesAndResources2(options) { - const info = ts.preProcessFile(fileContents); - for (let i = info.importedFiles.length - 1; i >= 0; i--) { - const importedFilename = info.importedFiles[i].fileName; -+ if (!importedFilename.startsWith('vs/')) { -+ continue; -+ } - const pos = info.importedFiles[i].pos; - const end = info.importedFiles[i].end; - let importedFilepath; -@@ -169,6 +172,10 @@ function createESMSourcesAndResources2(options) { - else { - relativePath = path.relative(path.dirname(file), importedFilepath); - } -+ if (relativePath.endsWith('..')) { -+ // When a folder have the same name as a file -+ relativePath = relativePath + '/../' + path.basename(importedFilepath); -+ } - relativePath = relativePath.replace(/\\/g, '/'); - if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) { - relativePath = './' + relativePath; -diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts -index e1b9db65e12..b5f94e7836a 100644 ---- a/build/lib/standalone.ts -+++ b/build/lib/standalone.ts -@@ -177,6 +177,9 @@ export function createESMSourcesAndResources2(options: IOptions2): void { - - for (let i = info.importedFiles.length - 1; i >= 0; i--) { - const importedFilename = info.importedFiles[i].fileName; -+ if (!importedFilename.startsWith('vs/')) { -+ continue; -+ } - const pos = info.importedFiles[i].pos; - const end = info.importedFiles[i].end; - -@@ -198,6 +201,10 @@ export function createESMSourcesAndResources2(options: IOptions2): void { - } else { - relativePath = path.relative(path.dirname(file), importedFilepath); - } -+ if (relativePath.endsWith('..')) { -+ // When a folder have the same name as a file -+ relativePath = relativePath + '/../' + path.basename(importedFilepath); -+ } - relativePath = relativePath.replace(/\\/g, '/'); - if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) { - relativePath = './' + relativePath; diff --git a/vscode-paches/0005-feat-output-es2022.patch b/vscode-paches/0004-feat-output-es2022.patch similarity index 65% rename from vscode-paches/0005-feat-output-es2022.patch rename to vscode-paches/0004-feat-output-es2022.patch index ccfc9bc6..25e74c66 100644 --- a/vscode-paches/0005-feat-output-es2022.patch +++ b/vscode-paches/0004-feat-output-es2022.patch @@ -4,28 +4,26 @@ Date: Mon, 11 Mar 2024 16:44:35 +0100 Subject: [PATCH] feat: output es2022 --- - src/tsconfig.base.json | 3 ++- + src/tsconfig.base.json | 2 +- src/tsconfig.monaco.json | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json -index c0a2e174591..1d80c22afa3 100644 +index 9c7aacd4f11..9f6858a7801 100644 --- a/src/tsconfig.base.json +++ b/src/tsconfig.base.json -@@ -1,6 +1,7 @@ - { - "compilerOptions": { -- "module": "amd", -+ "esModuleInterop": true, -+ "module": "ES2020", - "moduleResolution": "node", - "experimentalDecorators": true, - "noImplicitReturns": true, +@@ -27,4 +27,4 @@ + ], + "allowSyntheticDefaultImports": true + } +-} +\ No newline at end of file ++} diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json -index bb4fd1ccc35..702c492934b 100644 +index 1e138cf9085..a2a07d7b7d3 100644 --- a/src/tsconfig.monaco.json +++ b/src/tsconfig.monaco.json -@@ -7,8 +7,8 @@ +@@ -8,8 +8,8 @@ "wicg-file-system-access" ], "paths": {}, diff --git a/vscode-paches/0006-fix-markdown-do-not-encode-i10l-location.patch b/vscode-paches/0005-fix-markdown-do-not-encode-i10l-location.patch similarity index 100% rename from vscode-paches/0006-fix-markdown-do-not-encode-i10l-location.patch rename to vscode-paches/0005-fix-markdown-do-not-encode-i10l-location.patch diff --git a/vscode-paches/0007-fix-typescript-handle-trailing-slash.patch b/vscode-paches/0006-fix-typescript-handle-trailing-slash.patch similarity index 100% rename from vscode-paches/0007-fix-typescript-handle-trailing-slash.patch rename to vscode-paches/0006-fix-typescript-handle-trailing-slash.patch diff --git a/vscode-paches/0008-fix-typescript-missing-default-value.patch b/vscode-paches/0007-fix-typescript-missing-default-value.patch similarity index 100% rename from vscode-paches/0008-fix-typescript-missing-default-value.patch rename to vscode-paches/0007-fix-typescript-missing-default-value.patch diff --git a/vscode-paches/0009-fix-typescript-handle-missing-case.patch b/vscode-paches/0008-fix-typescript-handle-missing-case.patch similarity index 100% rename from vscode-paches/0009-fix-typescript-handle-missing-case.patch rename to vscode-paches/0008-fix-typescript-handle-missing-case.patch diff --git a/vscode-paches/0010-feat-add-static-asset-url-mechanism.patch b/vscode-paches/0009-feat-add-static-asset-url-mechanism.patch similarity index 92% rename from vscode-paches/0010-feat-add-static-asset-url-mechanism.patch rename to vscode-paches/0009-feat-add-static-asset-url-mechanism.patch index 6f1a43d0..db8c4d2e 100644 --- a/vscode-paches/0010-feat-add-static-asset-url-mechanism.patch +++ b/vscode-paches/0009-feat-add-static-asset-url-mechanism.patch @@ -12,18 +12,18 @@ Subject: [PATCH] feat: add static asset url mechanism 5 files changed, 208 insertions(+), 69 deletions(-) diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts -index 99fabfb377f..e043e8e458d 100644 +index 7f141568abf..9eeda8b4633 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts -@@ -4,6 +4,8 @@ - *--------------------------------------------------------------------------------------------*/ +@@ -8,6 +8,8 @@ import * as platform from './platform.js'; + import { equalsIgnoreCase, startsWithIgnoreCase } from './strings.js'; + import { URI } from './uri.js'; + import * as paths from './path.js'; ++import { IDisposable, toDisposable } from './lifecycle.js'; ++import { ResourceMap } from './map.js'; + + export namespace Schemas { - import * as errors from 'vs/base/common/errors'; -+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -+import { ResourceMap } from 'vs/base/common/map'; - import * as platform from 'vs/base/common/platform'; - import { equalsIgnoreCase, startsWithIgnoreCase } from 'vs/base/common/strings'; - import { URI } from 'vs/base/common/uri'; @@ -248,6 +250,20 @@ export const VSCODE_AUTHORITY = 'vscode-app'; class FileAccessImpl { @@ -50,10 +50,10 @@ index 99fabfb377f..e043e8e458d 100644 */ asBrowserUri(resourcePath: AppResourcePath | ''): URI { - // ESM-comment-begin -- const uri = this.toUri(resourcePath, require); +- // const uri = this.toUri(resourcePath, require); - // ESM-comment-end - // ESM-uncomment-begin -- // const uri = this.toUri(resourcePath); +- const uri = this.toUri(resourcePath); - // ESM-uncomment-end + const uri = this.toUri(resourcePath, { toUrl: this.toUrl.bind(this) }); return this.uriToBrowserUri(uri); @@ -73,10 +73,10 @@ index 99fabfb377f..e043e8e458d 100644 */ asFileUri(resourcePath: AppResourcePath | ''): URI { - // ESM-comment-begin -- const uri = this.toUri(resourcePath, require); +- // const uri = this.toUri(resourcePath, require); - // ESM-comment-end - // ESM-uncomment-begin -- // const uri = this.toUri(resourcePath); +- const uri = this.toUri(resourcePath); - // ESM-uncomment-end + const uri = this.toUri(resourcePath, { toUrl: this.toUrl.bind(this) }); return this.uriToFileUri(uri); @@ -103,7 +103,7 @@ index 99fabfb377f..e043e8e458d 100644 export const FileAccess = new FileAccessImpl(); diff --git a/src/vs/workbench/api/browser/mainThreadExtensionService.ts b/src/vs/workbench/api/browser/mainThreadExtensionService.ts -index 7c4db0a5def..298e14f9b28 100644 +index faf19a0dce2..e83837db2db 100644 --- a/src/vs/workbench/api/browser/mainThreadExtensionService.ts +++ b/src/vs/workbench/api/browser/mainThreadExtensionService.ts @@ -187,6 +187,13 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha @@ -121,10 +121,10 @@ index 7c4db0a5def..298e14f9b28 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 6732f0ce931..d4ecabb0c26 100644 +index 4900f545fb4..15dc855752a 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts -@@ -1487,6 +1487,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { +@@ -1525,6 +1525,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { $onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void; $setPerformanceMarks(marks: performance.PerformanceMark[]): Promise; $asBrowserUri(uri: UriComponents): Promise; @@ -133,7 +133,7 @@ index 6732f0ce931..d4ecabb0c26 100644 export interface SCMProviderFeatures { diff --git a/src/vs/workbench/api/common/extensionHostMain.ts b/src/vs/workbench/api/common/extensionHostMain.ts -index 50c47ba98a8..2aa00be8fe4 100644 +index 6c93b88e428..065479ba269 100644 --- a/src/vs/workbench/api/common/extensionHostMain.ts +++ b/src/vs/workbench/api/common/extensionHostMain.ts @@ -189,6 +189,11 @@ export class ExtensionHostMain { @@ -149,15 +149,15 @@ index 50c47ba98a8..2aa00be8fe4 100644 this._extensionService.terminate(reason); } diff --git a/src/vs/workbench/api/worker/extensionHostWorker.ts b/src/vs/workbench/api/worker/extensionHostWorker.ts -index b98117318b7..9ba12208ff9 100644 +index d9953269acb..2180e982086 100644 --- a/src/vs/workbench/api/worker/extensionHostWorker.ts +++ b/src/vs/workbench/api/worker/extensionHostWorker.ts -@@ -15,7 +15,6 @@ import * as performance from 'vs/base/common/performance'; +@@ -15,7 +15,6 @@ import * as performance from '../../../base/common/performance.js'; - import 'vs/workbench/api/common/extHost.common.services'; - import 'vs/workbench/api/worker/extHost.worker.services'; --import { FileAccess } from 'vs/base/common/network'; - import { URI } from 'vs/base/common/uri'; + import '../common/extHost.common.services.js'; + import './extHost.worker.services.js'; +-import { FileAccess } from '../../../base/common/network.js'; + import { URI } from '../../../base/common/uri.js'; //#region --- Define, capture, and override some globals @@ -35,6 +34,7 @@ declare namespace self { diff --git a/vscode-paches/0011-fix-remove-ttf-url-search-parameter-breaking-import.patch b/vscode-paches/0010-fix-remove-ttf-url-search-parameter-breaking-import.patch similarity index 100% rename from vscode-paches/0011-fix-remove-ttf-url-search-parameter-breaking-import.patch rename to vscode-paches/0010-fix-remove-ttf-url-search-parameter-breaking-import.patch diff --git a/vscode-paches/0012-fix-apply-style-only-on-standalone-editors.patch b/vscode-paches/0011-fix-apply-style-only-on-standalone-editors.patch similarity index 94% rename from vscode-paches/0012-fix-apply-style-only-on-standalone-editors.patch rename to vscode-paches/0011-fix-apply-style-only-on-standalone-editors.patch index 5fc9b7c6..d9efeeb6 100644 --- a/vscode-paches/0012-fix-apply-style-only-on-standalone-editors.patch +++ b/vscode-paches/0011-fix-apply-style-only-on-standalone-editors.patch @@ -15,7 +15,7 @@ Subject: [PATCH] fix: apply style only on standalone editors 8 files changed, 45 insertions(+), 24 deletions(-) diff --git a/src/vs/editor/browser/config/editorConfiguration.ts b/src/vs/editor/browser/config/editorConfiguration.ts -index 4de800bd521..de9b4b9143c 100644 +index d65d85cfe25..5bdaf5cb061 100644 --- a/src/vs/editor/browser/config/editorConfiguration.ts +++ b/src/vs/editor/browser/config/editorConfiguration.ts @@ -45,6 +45,7 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat @@ -80,10 +80,10 @@ index 4de800bd521..de9b4b9143c 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 660e00eea1c..8c999f39c86 100644 +index 59f027dd434..91703a85ce8 100644 --- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts -@@ -270,6 +270,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE +@@ -273,6 +273,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), @@ -91,7 +91,7 @@ index 660e00eea1c..8c999f39c86 100644 options, accessibilityService)); this._register(this._configuration.onDidChange((e) => { this._onDidChangeConfiguration.fire(e); -@@ -378,8 +379,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE +@@ -381,8 +382,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE this._modelData?.view.writeScreenReaderContent(reason); } @@ -102,7 +102,7 @@ index 660e00eea1c..8c999f39c86 100644 } public getId(): string { -@@ -1955,6 +1956,12 @@ export interface ICodeEditorWidgetOptions { +@@ -1959,6 +1960,12 @@ export interface ICodeEditorWidgetOptions { */ isSimpleWidget?: boolean; @@ -116,10 +116,10 @@ index 660e00eea1c..8c999f39c86 100644 * Contributions to instantiate. * When provided, only the contributions included will be instantiated. diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts -index e22b0291dd0..097167b755a 100644 +index da2e28f1c44..41d9152f1e6 100644 --- a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts -@@ -52,6 +52,12 @@ import { DiffEditorViewModel, DiffMapping, DiffState } from './diffEditorViewMod +@@ -51,6 +51,12 @@ import { CSSStyle, ObservableElementSizeObserver, RefCounted, applyStyle, applyV export interface IDiffCodeEditorWidgetOptions { originalEditor?: ICodeEditorWidgetOptions; modifiedEditor?: ICodeEditorWidgetOptions; @@ -132,7 +132,7 @@ index e22b0291dd0..097167b755a 100644 } export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor { -@@ -111,6 +117,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor { +@@ -110,6 +116,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor { this._contextKeyService.createKey('isInDiffEditor', true); @@ -195,7 +195,7 @@ index 1fc85078f9e..c74aca00541 100644 outline-style: solid; outline-offset: -1px; diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts -index 3ccfa128dc2..9ee85e6804a 100644 +index 2b7abea38c1..15917f7df1b 100644 --- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts @@ -283,7 +283,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon @@ -217,10 +217,10 @@ index 3ccfa128dc2..9ee85e6804a 100644 instantiationService, codeEditorService, diff --git a/src/vs/editor/test/browser/config/testConfiguration.ts b/src/vs/editor/test/browser/config/testConfiguration.ts -index 4a2e87e6d48..d96690e36ee 100644 +index 3c1862c967d..2d565b57506 100644 --- a/src/vs/editor/test/browser/config/testConfiguration.ts +++ b/src/vs/editor/test/browser/config/testConfiguration.ts -@@ -14,7 +14,7 @@ import { MenuId } from 'vs/platform/actions/common/actions'; +@@ -14,7 +14,7 @@ import { MenuId } from '../../../../platform/actions/common/actions.js'; export class TestConfiguration extends EditorConfiguration { constructor(opts: Readonly) { @@ -230,7 +230,7 @@ index 4a2e87e6d48..d96690e36ee 100644 protected override _readEnvConfiguration(): IEnvConfiguration { diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts -index 5a79e483795..3f5d2e03cd8 100644 +index 72da1933953..c27b2879421 100644 --- a/src/vs/editor/test/browser/testCodeEditor.ts +++ b/src/vs/editor/test/browser/testCodeEditor.ts @@ -71,7 +71,7 @@ export interface ITestCodeEditor extends IActiveCodeEditor { @@ -243,10 +243,10 @@ index 5a79e483795..3f5d2e03cd8 100644 } protected override _createView(viewModel: ViewModel): [View, boolean] { diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts -index 1a2621a00c4..be7f7c085d9 100644 +index 9309d784fd7..77671aca0cc 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts -@@ -504,7 +504,7 @@ export class NotebookMultiCursorController extends Disposable implements INotebo +@@ -688,7 +688,7 @@ export class NotebookMultiCursorController extends Disposable implements INotebo private constructCellEditorOptions(cell: ICellViewModel): EditorConfiguration { const cellEditorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(cell.language), this.notebookEditor.notebookOptions, this.configurationService); const options = cellEditorOptions.getUpdatedValue(cell.internalMetadata, cell.uri); diff --git a/vscode-paches/0013-fix-use-existing-method.patch b/vscode-paches/0012-fix-use-existing-method.patch similarity index 97% rename from vscode-paches/0013-fix-use-existing-method.patch rename to vscode-paches/0012-fix-use-existing-method.patch index ed7d291d..eb6c298c 100644 --- a/vscode-paches/0013-fix-use-existing-method.patch +++ b/vscode-paches/0012-fix-use-existing-method.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: use existing method 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index e4f06ac453f..3b9815e86ec 100644 +index 085ca6352f2..e5c1e247082 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -559,7 +559,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { diff --git a/vscode-paches/0014-refactor-split-code.patch b/vscode-paches/0013-refactor-split-code.patch similarity index 97% rename from vscode-paches/0014-refactor-split-code.patch rename to vscode-paches/0013-refactor-split-code.patch index 9a1f6a15..017eb348 100644 --- a/vscode-paches/0014-refactor-split-code.patch +++ b/vscode-paches/0013-refactor-split-code.patch @@ -9,7 +9,7 @@ Subject: [PATCH] refactor: split code 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index 3b9815e86ec..c763e7ccd83 100644 +index e5c1e247082..260e404f3dd 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -530,15 +530,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { @@ -35,7 +35,7 @@ index 3b9815e86ec..c763e7ccd83 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 76b3fa79a5c..3c98bf9aec0 100644 +index 671f9552963..de6fc38cd0a 100644 --- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts @@ -428,10 +428,14 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { diff --git a/vscode-paches/0015-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch b/vscode-paches/0014-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch similarity index 64% rename from vscode-paches/0015-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch rename to vscode-paches/0014-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch index 66380dfc..015babb5 100644 --- a/vscode-paches/0015-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch +++ b/vscode-paches/0014-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch @@ -9,18 +9,18 @@ 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 c763e7ccd83..85b999bf4de 100644 +index 260e404f3dd..17f50fb819e 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -91,8 +91,6 @@ import { AccessibilitySignal, AccessibilityModality, IAccessibilitySignalService - import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures'; - import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry'; - import { LogService } from 'vs/platform/log/common/logService'; --import { getEditorFeatures } from 'vs/editor/common/editorFeatures'; --import { onUnexpectedError } from 'vs/base/common/errors'; - import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from 'vs/platform/environment/common/environment'; - import { mainWindow } from 'vs/base/browser/window'; - import { ResourceMap } from 'vs/base/common/map'; + import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js'; + import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js'; + import { LogService } from '../../../platform/log/common/logService.js'; +-import { getEditorFeatures } from '../../common/editorFeatures.js'; +-import { onUnexpectedError } from '../../../base/common/errors.js'; + import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from '../../../platform/environment/common/environment.js'; + import { mainWindow } from '../../../base/browser/window.js'; + import { ResourceMap } from '../../../base/common/map.js'; @@ -1229,16 +1227,6 @@ export module StandaloneServices { } } diff --git a/vscode-paches/0016-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch b/vscode-paches/0015-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch similarity index 59% rename from vscode-paches/0016-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch rename to vscode-paches/0015-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch index 47b1a8d7..53cfcaec 100644 --- a/vscode-paches/0016-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch +++ b/vscode-paches/0015-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch @@ -10,18 +10,18 @@ Subject: [PATCH] fix: replace amd imports by regular esm dynamic imports .../contrib/terminal/browser/terminalInstance.ts | 3 +-- .../terminal/browser/xterm/xtermTerminal.ts | 13 ++++++------- .../browser/terminalStickyScrollOverlay.ts | 5 ++--- - .../textMateWorkerTokenizerController.ts | 4 +--- - .../worker/textMateTokenizationWorker.worker.ts | 12 +++++------- - .../worker/textMateWorkerTokenizer.ts | 4 +--- - .../browser/textMateTokenizationFeatureImpl.ts | 15 ++++++++------- + .../textMateWorkerTokenizerController.ts | 3 +-- + .../worker/textMateTokenizationWorker.worker.ts | 5 ++--- + .../worker/textMateWorkerTokenizer.ts | 3 +-- + .../browser/textMateTokenizationFeatureImpl.ts | 6 +++--- .../services/textfile/common/encoding.ts | 14 ++++---------- - 11 files changed, 32 insertions(+), 66 deletions(-) + 11 files changed, 24 insertions(+), 56 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json -index 889ddcd4d3d..05e59fcf47a 100644 +index 6282847cafb..795a5b934e8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json -@@ -296,14 +296,6 @@ +@@ -301,14 +301,6 @@ "jsdoc/require-returns": "warn" } }, @@ -36,24 +36,24 @@ index 889ddcd4d3d..05e59fcf47a 100644 { "files": [ "src/**/{browser,electron-sandbox}/**/*.ts" -@@ -863,6 +855,7 @@ +@@ -933,6 +925,7 @@ }, // TODO@layers "tas-client-umd", // node module allowed even in /common/ "vscode-textmate", // node module allowed even in /common/ + "vscode-oniguruma", "@vscode/vscode-languagedetection", // node module allowed even in /common/ + "@vscode/tree-sitter-wasm", // type import { - "when": "hasBrowser", diff --git a/src/vs/platform/assignment/common/assignmentService.ts b/src/vs/platform/assignment/common/assignmentService.ts -index c573b727e0b..8c52126a590 100644 +index 413bd60f7ff..2e7fcb3d31c 100644 --- a/src/vs/platform/assignment/common/assignmentService.ts +++ b/src/vs/platform/assignment/common/assignmentService.ts -@@ -9,7 +9,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur - import { IProductService } from 'vs/platform/product/common/productService'; - import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils'; - import { AssignmentFilterProvider, ASSIGNMENT_REFETCH_INTERVAL, ASSIGNMENT_STORAGE_KEY, IAssignmentService, TargetPopulation } from 'vs/platform/assignment/common/assignment'; --import { importAMDNodeModule } from 'vs/amdX'; - import { IEnvironmentService } from 'vs/platform/environment/common/environment'; +@@ -9,7 +9,6 @@ import { IConfigurationService } from '../../configuration/common/configuration. + import { IProductService } from '../../product/common/productService.js'; + import { getTelemetryLevel } from '../../telemetry/common/telemetryUtils.js'; + import { AssignmentFilterProvider, ASSIGNMENT_REFETCH_INTERVAL, ASSIGNMENT_STORAGE_KEY, IAssignmentService, TargetPopulation } from './assignment.js'; +-import { importAMDNodeModule } from '../../../amdX.js'; + import { IEnvironmentService } from '../../environment/common/environment.js'; export abstract class BaseAssignmentService implements IAssignmentService { @@ -88,7 +87,7 @@ export abstract class BaseAssignmentService implements IAssignmentService { @@ -66,18 +66,18 @@ index c573b727e0b..8c52126a590 100644 telemetry: this.telemetry, storageKey: ASSIGNMENT_STORAGE_KEY, diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts -index 6585e563ba0..a4729fabe2e 100644 +index bddf9da2530..e25b981dc45 100644 --- a/src/vs/platform/telemetry/common/1dsAppender.ts +++ b/src/vs/platform/telemetry/common/1dsAppender.ts @@ -5,10 +5,8 @@ import type { IExtendedConfiguration, IExtendedTelemetryItem, ITelemetryItem, ITelemetryUnloadState } from '@microsoft/1ds-core-js'; import type { IChannelConfiguration, IXHROverride, PostChannel } from '@microsoft/1ds-post-js'; --import { importAMDNodeModule } from 'vs/amdX'; - import { onUnexpectedError } from 'vs/base/common/errors'; - import { mixin } from 'vs/base/common/objects'; --import { isWeb } from 'vs/base/common/platform'; - import { ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils'; +-import { importAMDNodeModule } from '../../../amdX.js'; + import { onUnexpectedError } from '../../../base/common/errors.js'; + import { mixin } from '../../../base/common/objects.js'; +-import { isWeb } from '../../../base/common/platform.js'; + import { ITelemetryAppender, validateTelemetryData } from './telemetryUtils.js'; // Interface type which is a subset of @microsoft/1ds-core-js AppInsightsCore. @@ -23,18 +21,8 @@ const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0'; @@ -85,15 +85,15 @@ index 6585e563ba0..a4729fabe2e 100644 async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise { - // ESM-comment-begin -- if (isWeb) { /* fix the import warning */ } -- const oneDs = await importAMDNodeModule('@microsoft/1ds-core-js', 'dist/ms.core.js'); -- const postPlugin = await importAMDNodeModule('@microsoft/1ds-post-js', 'dist/ms.post.js'); +- // if (isWeb) { /* fix the import warning */ } +- // const oneDs = await importAMDNodeModule('@microsoft/1ds-core-js', 'dist/ms.core.js'); +- // const postPlugin = await importAMDNodeModule('@microsoft/1ds-post-js', 'dist/ms.post.js'); - // ESM-comment-end - // ESM-uncomment-begin -- // // eslint-disable-next-line local/code-amd-node-module -- // const oneDs = isWeb ? await importAMDNodeModule('@microsoft/1ds-core-js', 'bundle/ms.core.min.js') : await import('@microsoft/1ds-core-js'); -- // // eslint-disable-next-line local/code-amd-node-module -- // const postPlugin = isWeb ? await importAMDNodeModule('@microsoft/1ds-post-js', 'bundle/ms.post.min.js'): await import('@microsoft/1ds-post-js'); +- // eslint-disable-next-line local/code-amd-node-module +- const oneDs = isWeb ? await importAMDNodeModule('@microsoft/1ds-core-js', 'bundle/ms.core.min.js') : await import('@microsoft/1ds-core-js'); +- // eslint-disable-next-line local/code-amd-node-module +- const postPlugin = isWeb ? await importAMDNodeModule('@microsoft/1ds-post-js', 'bundle/ms.post.min.js') : await import('@microsoft/1ds-post-js'); - // ESM-uncomment-end - + const oneDs = await import('@microsoft/1ds-core-js'); @@ -102,18 +102,18 @@ index 6585e563ba0..a4729fabe2e 100644 const collectorChannelPlugin: PostChannel = new postPlugin.PostChannel(); // Configure the app insights core to send to collector++ and disable logging of debug info diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts -index ff8607f6019..896f61d9359 100644 +index f90969a2c60..8242cac8810 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts -@@ -82,7 +82,6 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history'; - import { isHorizontal, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; - import { IPathService } from 'vs/workbench/services/path/common/pathService'; - import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; --import { importAMDNodeModule } from 'vs/amdX'; +@@ -82,7 +82,6 @@ import { IHistoryService } from '../../../services/history/common/history.js'; + import { isHorizontal, IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js'; + import { IPathService } from '../../../services/path/common/pathService.js'; + import { IPreferencesService } from '../../../services/preferences/common/preferences.js'; +-import { importAMDNodeModule } from '../../../../amdX.js'; import type { IMarker, Terminal as XTermTerminal } from '@xterm/xterm'; - import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands'; - import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings'; -@@ -727,7 +726,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { + import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js'; + import { terminalStrings } from '../common/terminalStrings.js'; +@@ -729,7 +728,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { return xtermConstructor; } xtermConstructor = Promises.withAsyncBody(async (resolve) => { @@ -123,18 +123,18 @@ index ff8607f6019..896f61d9359 100644 Terminal.strings.promptLabel = nls.localize('terminal.integrated.a11yPromptLabel', 'Terminal input'); Terminal.strings.tooMuchOutput = keybinding ? nls.localize('terminal.integrated.useAccessibleBuffer', 'Use the accessible buffer {0} to manually review output', keybinding.getLabel()) : nls.localize('terminal.integrated.useAccessibleBufferNoKb', 'Use the Terminal: Focus Accessible Buffer command to manually review output'); diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts -index 3f96c847469..5ba1425a49a 100644 +index c5bd84fa997..10bcb52ec64 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts -@@ -31,7 +31,6 @@ import { DecorationAddon } from 'vs/workbench/contrib/terminal/browser/xterm/dec - import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; - import { Emitter } from 'vs/base/common/event'; - import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; --import { importAMDNodeModule } from 'vs/amdX'; - import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; - import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey'; - import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; -@@ -744,42 +743,42 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach +@@ -31,7 +31,6 @@ import { DecorationAddon } from './decorationAddon.js'; + import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js'; + import { Emitter } from '../../../../../base/common/event.js'; + import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js'; +-import { importAMDNodeModule } from '../../../../../amdX.js'; + import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js'; + import { TerminalContextKeys } from '../../common/terminalContextKey.js'; + import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js'; +@@ -738,42 +737,42 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach protected async _getClipboardAddonConstructor(): Promise { if (!ClipboardAddon) { @@ -184,17 +184,17 @@ index 3f96c847469..5ba1425a49a 100644 return SerializeAddon; } diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts -index 92d0aeb48c4..d8ec5418112 100644 +index c85159b3b8b..139f18f535a 100644 --- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts +++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts @@ -6,7 +6,6 @@ import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize'; import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl'; import type { IBufferLine, IMarker, ITerminalOptions, ITheme, Terminal as RawXtermTerminal, Terminal as XTermTerminal } from '@xterm/xterm'; --import { importAMDNodeModule } from 'vs/amdX'; - import { $, addDisposableListener, addStandardDisposableListener, getWindow } from 'vs/base/browser/dom'; - import { memoize, throttle } from 'vs/base/common/decorators'; - import { Event } from 'vs/base/common/event'; +-import { importAMDNodeModule } from '../../../../../amdX.js'; + import { $, addDisposableListener, addStandardDisposableListener, getWindow } from '../../../../../base/browser/dom.js'; + import { memoize, throttle } from '../../../../../base/common/decorators.js'; + import { Event } from '../../../../../base/common/event.js'; @@ -484,12 +483,12 @@ export class TerminalStickyScrollOverlay extends Disposable { @memoize @@ -211,190 +211,113 @@ index 92d0aeb48c4..d8ec5418112 100644 } diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts -index 419a1320def..0f68e115b90 100644 +index fa0f874e7e8..81d64022868 100644 --- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts +++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { importAMDNodeModule } from 'vs/amdX'; - import { Disposable } from 'vs/base/common/lifecycle'; - import { IObservable, autorun, keepObserved } from 'vs/base/common/observable'; - import { Proxied } from 'vs/base/common/worker/simpleWorker'; -@@ -19,7 +18,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur - import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils'; - import { ArrayEdit, MonotonousIndexTransformer, SingleArrayEdit } from 'vs/workbench/services/textMate/browser/arrayOperation'; - import type { StateDeltas, TextMateTokenizationWorker } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'; --import type { applyStateStackDiff, StateStack } from 'vscode-textmate'; -+import { StateStack, applyStateStackDiff, INITIAL } from 'vscode-textmate'; - - export class TextMateWorkerTokenizerController extends Disposable { - private static _id = 0; -@@ -180,7 +179,6 @@ export class TextMateWorkerTokenizerController extends Disposable { +-import { importAMDNodeModule } from '../../../../../amdX.js'; + import { Disposable } from '../../../../../base/common/lifecycle.js'; + import { IObservable, autorun, keepObserved } from '../../../../../base/common/observable.js'; + import { Proxied } from '../../../../../base/common/worker/simpleWorker.js'; +@@ -180,7 +179,7 @@ export class TextMateWorkerTokenizerController extends Disposable { ); if (!this._applyStateStackDiffFn || !this._initialState) { - const { applyStateStackDiff, INITIAL } = await importAMDNodeModule('vscode-textmate', 'release/main.js'); ++ const { applyStateStackDiff, INITIAL } = await import('vscode-textmate'); this._applyStateStackDiffFn = applyStateStackDiff; this._initialState = INITIAL; } diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts -index 237f681f3bc..7ba45d41153 100644 +index 131ad88d91c..86e236adbac 100644 --- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts +++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts -@@ -8,11 +8,11 @@ import { LanguageId } from 'vs/editor/common/encodedTokenAttributes'; - import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel'; - import { ICreateGrammarResult, TMGrammarFactory } from 'vs/workbench/services/textMate/common/TMGrammarFactory'; - import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry'; --import type { IOnigLib, IRawTheme, StackDiff } from 'vscode-textmate'; - import { TextMateWorkerTokenizer } from './textMateWorkerTokenizer'; --import { importAMDNodeModule } from 'vs/amdX'; - import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker'; - import { TextMateWorkerHost } from './textMateWorkerHost'; -+import * as vscodeTextmate from 'vscode-textmate'; -+import * as vscodeOniguruma from 'vscode-oniguruma'; - - /** - * Defines the worker entry point. Must be exported and named `create`. -@@ -42,7 +42,7 @@ export interface IValidGrammarDefinitionDTO { - export interface StateDeltas { - startLineNumber: number; - // null means the state for that line did not change -- stateDeltas: (StackDiff | null)[]; -+ stateDeltas: (vscodeTextmate.StackDiff | null)[]; - } - - export class TextMateTokenizationWorker implements IRequestHandler { -@@ -75,8 +75,6 @@ export class TextMateTokenizationWorker implements IRequestHandler { +@@ -10,7 +10,6 @@ import { ICreateGrammarResult, TMGrammarFactory } from '../../../common/TMGramma + import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from '../../../common/TMScopeRegistry.js'; + import type { IOnigLib, IRawTheme, StackDiff } from 'vscode-textmate'; + import { TextMateWorkerTokenizer } from './textMateWorkerTokenizer.js'; +-import { importAMDNodeModule } from '../../../../../../amdX.js'; + import { IRequestHandler, IWorkerServer } from '../../../../../../base/common/worker/simpleWorker.js'; + import { TextMateWorkerHost } from './textMateWorkerHost.js'; + +@@ -75,8 +74,8 @@ export class TextMateTokenizationWorker implements IRequestHandler { } private async _loadTMGrammarFactory(grammarDefinitions: IValidGrammarDefinition[], onigurumaWASMUri: string): Promise { - const vscodeTextmate = await importAMDNodeModule('vscode-textmate', 'release/main.js'); - const vscodeOniguruma = await importAMDNodeModule('vscode-oniguruma', 'release/main.js'); ++ const vscodeTextmate = await import('vscode-textmate'); ++ const vscodeOniguruma = await import('vscode-oniguruma'); const response = await fetch(onigurumaWASMUri); // Using the response directly only works if the server sets the MIME type 'application/wasm'. -@@ -85,7 +83,7 @@ export class TextMateTokenizationWorker implements IRequestHandler { - const bytes = await response.arrayBuffer(); - await vscodeOniguruma.loadWASM(bytes); - -- const onigLib: Promise = Promise.resolve({ -+ const onigLib: Promise = Promise.resolve({ - createOnigScanner: (sources) => vscodeOniguruma.createOnigScanner(sources), - createOnigString: (str) => vscodeOniguruma.createOnigString(str) - }); -@@ -142,7 +140,7 @@ export class TextMateTokenizationWorker implements IRequestHandler { - } - } - -- public async $acceptTheme(theme: IRawTheme, colorMap: string[]): Promise { -+ public async $acceptTheme(theme: vscodeTextmate.IRawTheme, colorMap: string[]): Promise { - const grammarFactory = await this._grammarFactory; - grammarFactory?.setTheme(theme, colorMap); - } 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 112d76ec0d9..99b09749431 100644 +index f3945c5e8fa..72ffd7ccb06 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 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { importAMDNodeModule } from 'vs/amdX'; - import { RunOnceScheduler } from 'vs/base/common/async'; - import { observableValue } from 'vs/base/common/observable'; - import { setTimeout0 } from 'vs/base/common/platform'; -@@ -16,7 +15,7 @@ import { ContiguousMultilineTokensBuilder } from 'vs/editor/common/tokens/contig - import { LineTokens } from 'vs/editor/common/tokens/lineTokens'; - import { TextMateTokenizationSupport } from 'vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport'; - import { TokenizationSupportWithLineLimit } from 'vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit'; --import type { StackDiff, StateStack, diffStateStacksRefEq } from 'vscode-textmate'; -+import { StackDiff, StateStack, diffStateStacksRefEq } from 'vscode-textmate'; - import { ICreateGrammarResult } from 'vs/workbench/services/textMate/common/TMGrammarFactory'; - import { StateDeltas } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'; - import { Disposable } from 'vs/base/common/lifecycle'; -@@ -115,7 +114,6 @@ export class TextMateWorkerTokenizer extends MirrorTextModel { +-import { importAMDNodeModule } from '../../../../../../amdX.js'; + import { RunOnceScheduler } from '../../../../../../base/common/async.js'; + import { observableValue } from '../../../../../../base/common/observable.js'; + import { setTimeout0 } from '../../../../../../base/common/platform.js'; +@@ -115,7 +114,7 @@ export class TextMateWorkerTokenizer extends MirrorTextModel { } if (!this._diffStateStacksRefEqFn) { - const { diffStateStacksRefEq } = await importAMDNodeModule('vscode-textmate', 'release/main.js'); ++ const { diffStateStacksRefEq } = await import('vscode-textmate'); this._diffStateStacksRefEqFn = diffStateStacksRefEq; } diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts -index 734d72a998b..0daa52bbded 100644 +index f22a15bb599..e127415e11a 100644 --- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts +++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { importAMDNodeModule, resolveAmdNodeModulePath } from 'vs/amdX'; -+import { resolveAmdNodeModulePath } from 'vs/amdX'; - import { canASAR, isESM } from 'vs/base/common/amd'; - import * as dom from 'vs/base/browser/dom'; - import { equals as equalArray } from 'vs/base/common/arrays'; -@@ -38,7 +38,8 @@ import { TMGrammarFactory, missingTMGrammarErrorMessage } from 'vs/workbench/ser - import { ITMSyntaxExtensionPoint, grammarsExtPoint } from 'vs/workbench/services/textMate/common/TMGrammars'; - import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry'; - import { ITextMateThemingRule, IWorkbenchColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; --import type { IGrammar, IOnigLib, IRawTheme } from 'vscode-textmate'; -+import * as vscodeTextmate from 'vscode-textmate'; -+import * as vscodeOniguruma from 'vscode-oniguruma'; - - export class TextMateTokenizationFeature extends Disposable implements ITextMateTokenizationService { - private static reportTokenizationTimeCounter = { sync: 0, async: 0 }; -@@ -54,7 +55,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate - private _grammarDefinitions: IValidGrammarDefinition[] | null = null; - private _grammarFactory: TMGrammarFactory | null = null; - private readonly _tokenizersRegistrations = new DisposableStore(); -- private _currentTheme: IRawTheme | null = null; -+ private _currentTheme: vscodeTextmate.IRawTheme | null = null; - private _currentTokenColorMap: string[] | null = null; - private readonly _threadedBackgroundTokenizerFactory = this._instantiationService.createInstance( - ThreadedBackgroundTokenizerFactory, -@@ -246,8 +247,8 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate +-import { importAMDNodeModule, resolveAmdNodeModulePath } from '../../../../amdX.js'; ++import { resolveAmdNodeModulePath } from '../../../../amdX.js'; + import { canASAR, isESM } from '../../../../base/common/amd.js'; + import * as dom from '../../../../base/browser/dom.js'; + import { equals as equalArray } from '../../../../base/common/arrays.js'; +@@ -246,7 +246,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate return this._grammarFactory; } - const [vscodeTextmate, vscodeOniguruma] = await Promise.all([importAMDNodeModule('vscode-textmate', 'release/main.js'), this._getVSCodeOniguruma()]); -- const onigLib: Promise = Promise.resolve({ -+ const vscodeOniguruma = await this._getVSCodeOniguruma(); -+ const onigLib: Promise = Promise.resolve({ ++ const [vscodeTextmate, vscodeOniguruma] = await Promise.all([import('vscode-textmate'), this._getVSCodeOniguruma()]); + const onigLib: Promise = Promise.resolve({ createOnigScanner: (sources: string[]) => vscodeOniguruma.createOnigScanner(sources), createOnigString: (str: string) => vscodeOniguruma.createOnigString(str) - }); -@@ -340,7 +341,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate - } - } - -- public async createTokenizer(languageId: string): Promise { -+ public async createTokenizer(languageId: string): Promise { - if (!this._languageService.isRegisteredLanguageId(languageId)) { - return null; - } -@@ -357,7 +358,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate +@@ -357,7 +357,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate private _getVSCodeOniguruma(): Promise { if (!this._vscodeOniguruma) { this._vscodeOniguruma = (async () => { - const [vscodeOniguruma, wasm] = await Promise.all([importAMDNodeModule('vscode-oniguruma', 'release/main.js'), this._loadVSCodeOnigurumaWASM()]); -+ const wasm = await this._loadVSCodeOnigurumaWASM(); ++ const [vscodeOniguruma, wasm] = await Promise.all([import('vscode-oniguruma'), this._loadVSCodeOnigurumaWASM()]); await vscodeOniguruma.loadWASM({ data: wasm, print: (str: string) => { diff --git a/src/vs/workbench/services/textfile/common/encoding.ts b/src/vs/workbench/services/textfile/common/encoding.ts -index 537ec42d3dc..6be61851b33 100644 +index c6933952e65..647cb01f9c0 100644 --- a/src/vs/workbench/services/textfile/common/encoding.ts +++ b/src/vs/workbench/services/textfile/common/encoding.ts @@ -5,10 +5,8 @@ - import { Readable, ReadableStream, newWriteableStream, listenStream } from 'vs/base/common/stream'; - import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer'; --import { importAMDNodeModule } from 'vs/amdX'; - import { CancellationTokenSource } from 'vs/base/common/cancellation'; - import { coalesce } from 'vs/base/common/arrays'; --import { isESM } from 'vs/base/common/amd'; + import { Readable, ReadableStream, newWriteableStream, listenStream } from '../../../../base/common/stream.js'; + import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../base/common/buffer.js'; +-import { importAMDNodeModule } from '../../../../amdX.js'; + import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; + import { coalesce } from '../../../../base/common/arrays.js'; +-import { isESM } from '../../../../base/common/amd.js'; export const UTF8 = 'utf8'; export const UTF8_with_bom = 'utf8bom'; diff --git a/vscode-paches/0017-feat-export-some-classes-and-make-some-methods-acces.patch b/vscode-paches/0016-feat-export-some-classes-and-make-some-methods-acces.patch similarity index 87% rename from vscode-paches/0017-feat-export-some-classes-and-make-some-methods-acces.patch rename to vscode-paches/0016-feat-export-some-classes-and-make-some-methods-acces.patch index 05ed647c..f7c1cd3c 100644 --- a/vscode-paches/0017-feat-export-some-classes-and-make-some-methods-acces.patch +++ b/vscode-paches/0016-feat-export-some-classes-and-make-some-methods-acces.patch @@ -4,6 +4,7 @@ Date: Mon, 11 Mar 2024 17:32:31 +0100 Subject: [PATCH] feat: export some classes and make some methods accessible --- + .../actions/browser/actionViewItemService.ts | 2 +- .../browser/extensionResourceLoaderService.ts | 2 +- .../workbench/api/browser/statusBarExtensionPoint.ts | 2 +- src/vs/workbench/browser/layout.ts | 10 +++++----- @@ -29,15 +30,28 @@ Subject: [PATCH] feat: export some classes and make some methods accessible .../terminal/common/embedderTerminalService.ts | 2 +- .../userDataProfile/common/remoteUserDataProfiles.ts | 2 +- .../services/userDataSync/common/userDataSyncUtil.ts | 2 +- - 25 files changed, 43 insertions(+), 43 deletions(-) + 26 files changed, 44 insertions(+), 44 deletions(-) +diff --git a/src/vs/platform/actions/browser/actionViewItemService.ts b/src/vs/platform/actions/browser/actionViewItemService.ts +index fa5739eec65..07f413b305f 100644 +--- a/src/vs/platform/actions/browser/actionViewItemService.ts ++++ b/src/vs/platform/actions/browser/actionViewItemService.ts +@@ -38,7 +38,7 @@ export class NullActionViewItemService implements IActionViewItemService { + } + } + +-class ActionViewItemService implements IActionViewItemService { ++export class ActionViewItemService implements IActionViewItemService { + + declare _serviceBrand: undefined; + diff --git a/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts b/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts -index fdefc170db0..1d3bc4affc5 100644 +index 974a3061346..2dd39f783b0 100644 --- a/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts +++ b/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.ts -@@ -14,7 +14,7 @@ import { ILogService } from 'vs/platform/log/common/log'; - import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; - import { AbstractExtensionResourceLoaderService, IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader'; +@@ -14,7 +14,7 @@ import { ILogService } from '../../log/common/log.js'; + import { IConfigurationService } from '../../configuration/common/configuration.js'; + import { AbstractExtensionResourceLoaderService, IExtensionResourceLoaderService } from '../common/extensionResourceLoader.js'; -class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService { +export class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService { @@ -45,7 +59,7 @@ index fdefc170db0..1d3bc4affc5 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts -index 99dd3279fe8..b692381eaa2 100644 +index bae2812c5f3..022b7ff6e54 100644 --- a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts +++ b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts @@ -57,7 +57,7 @@ export interface IExtensionStatusBarItemService { @@ -58,10 +72,10 @@ index 99dd3279fe8..b692381eaa2 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index 4ca393d98c3..2753d08f437 100644 +index 7290a2f7076..2e07af10fae 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts -@@ -51,7 +51,7 @@ import { CodeWindow, mainWindow } from 'vs/base/browser/window'; +@@ -51,7 +51,7 @@ import { CodeWindow, mainWindow } from '../../base/browser/window.js'; //#region Layout Implementation @@ -100,7 +114,7 @@ index 4ca393d98c3..2753d08f437 100644 readonly filesToDiff?: IPathToOpen[]; readonly filesToMerge?: IPathToOpen[]; diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index 7c11f502ea5..5211f730099 100644 +index f081430e49f..46172e06143 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -82,7 +82,7 @@ export class Workbench extends Layout { @@ -158,12 +172,12 @@ index 7c11f502ea5..5211f730099 100644 // Ask each part to restore try { diff --git a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts -index 08449bd2cd7..f82ac191725 100644 +index 4cd6bb2b089..31330c7b15f 100644 --- a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts +++ b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts -@@ -19,7 +19,7 @@ import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/envir - import { IHostService } from 'vs/workbench/services/host/browser/host'; - import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; +@@ -19,7 +19,7 @@ import { IBrowserWorkbenchEnvironmentService } from '../../../services/environme + import { IHostService } from '../../../services/host/browser/host.js'; + import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js'; -class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient implements IExtensionHostDebugService { +export class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient implements IExtensionHostDebugService { @@ -171,12 +185,12 @@ index 08449bd2cd7..f82ac191725 100644 private static readonly LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY = 'debug.lastExtensionDevelopmentWorkspace'; diff --git a/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts b/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts -index f9f3104f8b3..8d3eb0c0e4e 100644 +index facb8ee9d9f..e3d80d62340 100644 --- a/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts +++ b/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.ts -@@ -30,9 +30,9 @@ import { URI } from 'vs/base/common/uri'; - import { RemoteNameContext } from 'vs/workbench/common/contextkeys'; - import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys'; +@@ -30,9 +30,9 @@ import { URI } from '../../../../base/common/uri.js'; + import { RemoteNameContext } from '../../../common/contextkeys.js'; + import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js'; -const ITroubleshootIssueService = createDecorator('ITroubleshootIssueService'); +export const ITroubleshootIssueService = createDecorator('ITroubleshootIssueService'); @@ -196,7 +210,7 @@ index f9f3104f8b3..8d3eb0c0e4e 100644 readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts -index 522b64a8cd6..b43c170bf2e 100644 +index 1302428ebdf..670089148d4 100644 --- a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts +++ b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts @@ -42,7 +42,7 @@ export interface IDefaultLogLevelsService { @@ -209,7 +223,7 @@ index 522b64a8cd6..b43c170bf2e 100644 _serviceBrand: undefined; diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts -index c6a2df09c76..88399f0d728 100644 +index c7e890fce1d..9c993aea259 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 { @@ -222,10 +236,10 @@ index c6a2df09c76..88399f0d728 100644 async defaultFilePath(schemeFilter = this.getSchemeFilterForWindow(), authorityFilter = this.getAuthorityFilterForWindow()): Promise { diff --git a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts -index de6a4ad8227..2b0ac26789f 100644 +index 70d9dc6f979..12f9e2b5ed7 100644 --- a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts -@@ -24,7 +24,7 @@ import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/em +@@ -24,7 +24,7 @@ import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/code export class FileDialogService extends AbstractFileDialogService implements IFileDialogService { @memoize @@ -244,7 +258,7 @@ index de6a4ad8227..2b0ac26789f 100644 } } diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts -index d339e68cfe8..201e6372cde 100644 +index 940a4e0ce46..881aebdeb5c 100644 --- a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts +++ b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts @@ -64,7 +64,7 @@ class BisectState { @@ -257,7 +271,7 @@ index d339e68cfe8..201e6372cde 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts b/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts -index 0e60b30cd13..a8fef74dbc4 100644 +index 4eeb0851a4d..29592880548 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts @@ -27,7 +27,7 @@ interface IExtensionFeatureState { @@ -270,7 +284,7 @@ index 0e60b30cd13..a8fef74dbc4 100644 private readonly _onDidChangeEnablement = this._register(new Emitter<{ extension: ExtensionIdentifier; featureId: string; enabled: boolean }>()); diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts -index 82347b71978..83bce6798aa 100644 +index 818514fdd22..b232937c792 100644 --- a/src/vs/workbench/services/extensions/browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/browser/extensionService.ts @@ -117,7 +117,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten @@ -301,7 +315,7 @@ index 82347b71978..83bce6798aa 100644 getInitData: async (): Promise => { if (isInitialStart) { diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts -index 696f8227e6e..48c0e3bc2d4 100644 +index ac3c7ed5006..94663c3cde9 100644 --- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts +++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts @@ -108,7 +108,7 @@ type ExtensionUrlReloadHandlerClassification = { @@ -314,7 +328,7 @@ index 696f8227e6e..48c0e3bc2d4 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 543e8cd2206..0c2e68dd1ec 100644 +index cecd70c21af..8141d1dfe02 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -78,7 +78,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost @@ -327,7 +341,7 @@ index 543e8cd2206..0c2e68dd1ec 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 df1b2733947..dace2286a1c 100644 +index 0479473dcaa..9fa2663f0e5 100644 --- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts +++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts @@ -95,9 +95,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx @@ -352,7 +366,7 @@ index df1b2733947..dace2286a1c 100644 this._deltaExtensionsQueue.push(item); if (this._inHandleDeltaExtensions) { // Let the current item finish, the new one will be picked up -@@ -1285,7 +1285,7 @@ export interface IExtensionHostFactory { +@@ -1289,7 +1289,7 @@ export interface IExtensionHostFactory { createExtensionHost(runningLocations: ExtensionRunningLocationTracker, runningLocation: ExtensionRunningLocation, isInitialStart: boolean): IExtensionHost | null; } @@ -362,7 +376,7 @@ index df1b2733947..dace2286a1c 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 3c98bf9aec0..3ab26183771 100644 +index de6fc38cd0a..320c2526b7a 100644 --- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts @@ -423,7 +423,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { @@ -375,7 +389,7 @@ index 3c98bf9aec0..3ab26183771 100644 this._onDidUpdateKeybindings.fire(); } diff --git a/src/vs/workbench/services/languageStatus/common/languageStatusService.ts b/src/vs/workbench/services/languageStatus/common/languageStatusService.ts -index e10d2a3ef1e..6dd88102a64 100644 +index 74bfa68e6a8..848e3846c1f 100644 --- a/src/vs/workbench/services/languageStatus/common/languageStatusService.ts +++ b/src/vs/workbench/services/languageStatus/common/languageStatusService.ts @@ -47,7 +47,7 @@ export interface ILanguageStatusService { @@ -388,10 +402,10 @@ index e10d2a3ef1e..6dd88102a64 100644 declare _serviceBrand: undefined; diff --git a/src/vs/workbench/services/localization/browser/localeService.ts b/src/vs/workbench/services/localization/browser/localeService.ts -index 07616fa0a2e..c77edccfe58 100644 +index 554ecb2bce9..63082ed6952 100644 --- a/src/vs/workbench/services/localization/browser/localeService.ts +++ b/src/vs/workbench/services/localization/browser/localeService.ts -@@ -132,7 +132,7 @@ export class WebLocaleService implements ILocaleService { +@@ -109,7 +109,7 @@ export class WebLocaleService implements ILocaleService { } } @@ -401,12 +415,12 @@ index 07616fa0a2e..c77edccfe58 100644 constructor( diff --git a/src/vs/workbench/services/outline/browser/outlineService.ts b/src/vs/workbench/services/outline/browser/outlineService.ts -index f4707432371..7c5cdde39cc 100644 +index e9077d5f226..fc31a3fab94 100644 --- a/src/vs/workbench/services/outline/browser/outlineService.ts +++ b/src/vs/workbench/services/outline/browser/outlineService.ts -@@ -11,7 +11,7 @@ import { IEditorPane } from 'vs/workbench/common/editor'; - import { IOutline, IOutlineCreator, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline'; - import { Event, Emitter } from 'vs/base/common/event'; +@@ -11,7 +11,7 @@ import { IEditorPane } from '../../../common/editor.js'; + import { IOutline, IOutlineCreator, IOutlineService, OutlineTarget } from './outline.js'; + import { Event, Emitter } from '../../../../base/common/event.js'; -class OutlineService implements IOutlineService { +export class OutlineService implements IOutlineService { @@ -414,10 +428,10 @@ index f4707432371..7c5cdde39cc 100644 declare _serviceBrand: undefined; diff --git a/src/vs/workbench/services/path/browser/pathService.ts b/src/vs/workbench/services/path/browser/pathService.ts -index 664884d60ba..2457dbaa576 100644 +index ac35093bc65..12cedea8f20 100644 --- a/src/vs/workbench/services/path/browser/pathService.ts +++ b/src/vs/workbench/services/path/browser/pathService.ts -@@ -28,7 +28,7 @@ export class BrowserPathService extends AbstractPathService { +@@ -27,7 +27,7 @@ export class BrowserPathService extends AbstractPathService { } } @@ -427,10 +441,10 @@ index 664884d60ba..2457dbaa576 100644 // In web we do not really have the concept of a "local" user home // but we still require it in many places as a fallback. As such, diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts -index be889244846..875a9072cf0 100644 +index cbf78719a20..2b6fb4c4f05 100644 --- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts +++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts -@@ -139,7 +139,7 @@ export interface IRemoteExplorerService { +@@ -145,7 +145,7 @@ export interface IRemoteExplorerService { readonly namedProcesses: Map; } @@ -440,12 +454,12 @@ index be889244846..875a9072cf0 100644 private _targetType: string[] = []; private readonly _onDidChangeTargetType: Emitter = new Emitter(); diff --git a/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts b/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts -index ce9954eb03d..477eceb0abd 100644 +index 0a54b54e489..85428cc7600 100644 --- a/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts +++ b/src/vs/workbench/services/remote/common/remoteExtensionsScanner.ts -@@ -18,7 +18,7 @@ import { IActiveLanguagePackService } from 'vs/workbench/services/localization/c - import { IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; - import { Mutable } from 'vs/base/common/types'; +@@ -18,7 +18,7 @@ import { IActiveLanguagePackService } from '../../localization/common/locale.js' + import { IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js'; + import { Mutable } from '../../../../base/common/types.js'; -class RemoteExtensionsScannerService implements IRemoteExtensionsScannerService { +export class RemoteExtensionsScannerService implements IRemoteExtensionsScannerService { @@ -453,7 +467,7 @@ index ce9954eb03d..477eceb0abd 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts -index 5e322af7a0f..07b4abdd636 100644 +index e976a8617ca..b855f41710f 100644 --- a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts +++ b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts @@ -52,7 +52,7 @@ export interface IEmbedderTerminalPty { @@ -466,7 +480,7 @@ index 5e322af7a0f..07b4abdd636 100644 private readonly _onDidCreateTerminal = new Emitter(); diff --git a/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts b/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts -index d3ef612836b..0d0fb8d2862 100644 +index 65ca63829ec..0dd7d367fdd 100644 --- a/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts +++ b/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts @@ -25,7 +25,7 @@ export interface IRemoteUserDataProfilesService { @@ -479,12 +493,12 @@ index d3ef612836b..0d0fb8d2862 100644 readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts -index cd7f253b913..cf07954716e 100644 +index dc5f8232d0e..1cec5236244 100644 --- a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts +++ b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts -@@ -12,7 +12,7 @@ import { URI } from 'vs/base/common/uri'; - import { ITextModelService } from 'vs/editor/common/services/resolverService'; - import { ITextResourcePropertiesService, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration'; +@@ -12,7 +12,7 @@ import { URI } from '../../../../base/common/uri.js'; + import { ITextModelService } from '../../../../editor/common/services/resolverService.js'; + import { ITextResourcePropertiesService, ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js'; -class UserDataSyncUtilService implements IUserDataSyncUtilService { +export class UserDataSyncUtilService implements IUserDataSyncUtilService { diff --git a/vscode-paches/0018-fix-improve-extension-contribution-types.patch b/vscode-paches/0017-fix-improve-extension-contribution-types.patch similarity index 99% rename from vscode-paches/0018-fix-improve-extension-contribution-types.patch rename to vscode-paches/0017-fix-improve-extension-contribution-types.patch index 227ddd57..9f8e1a76 100644 --- a/vscode-paches/0018-fix-improve-extension-contribution-types.patch +++ b/vscode-paches/0017-fix-improve-extension-contribution-types.patch @@ -11,17 +11,17 @@ Subject: [PATCH] fix: improve extension contribution types 4 files changed, 1432 insertions(+), 76 deletions(-) diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts -index 822260bdc2f..43dac321e5b 100644 +index 5973d4dcf12..d0cc0b03bcd 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts @@ -3,6 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -+import { IJSONSchema } from 'vs/base/common/jsonSchema'; - import Severity from 'vs/base/common/severity'; - import * as strings from 'vs/base/common/strings'; - import { URI } from 'vs/base/common/uri'; ++import { IJSONSchema } from '../../../base/common/jsonSchema.js'; + import Severity from '../../../base/common/severity.js'; + import * as strings from '../../../base/common/strings.js'; + import { URI } from '../../../base/common/uri.js'; @@ -16,118 +17,593 @@ export const BUILTIN_MANIFEST_CACHE_FILE = 'extensions.builtin.cache'; export const UNDEFINED_PUBLISHER = 'undefined_publisher'; @@ -1627,10 +1627,10 @@ index 822260bdc2f..43dac321e5b 100644 export interface IExtensionCapabilities { diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts -index 53b37e5f17d..1360c0dcf76 100644 +index 4b712c6be50..2d68500db7a 100644 --- a/src/vs/workbench/services/search/common/queryBuilder.ts +++ b/src/vs/workbench/services/search/common/queryBuilder.ts -@@ -604,10 +604,10 @@ export class QueryBuilder { +@@ -613,10 +613,10 @@ export class QueryBuilder { folderName: includeFolderName ? folderName : undefined, excludePattern: excludePatternRet, fileEncoding: folderConfig.files && folderConfig.files.encoding, @@ -1646,7 +1646,7 @@ index 53b37e5f17d..1360c0dcf76 100644 } } diff --git a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts -index 9a7bf4aa503..235e0ed2948 100644 +index 889c61bb08c..b392cc8614f 100644 --- a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts +++ b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts @@ -186,7 +186,7 @@ class ColorDataRenderer extends Disposable implements IExtensionFeatureTableRend @@ -1659,7 +1659,7 @@ index 9a7bf4aa503..235e0ed2948 100644 }); diff --git a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts -index 80f5ee077cb..49abd845677 100644 +index e10bf30175f..d78e65afc3f 100644 --- a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts +++ b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts @@ -69,6 +69,7 @@ const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint { diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts -index b83a462131d..5ce2ec7413b 100644 +index 6f3384ab89c..71c42330bd1 100644 --- a/src/vs/workbench/api/worker/extHostExtensionService.ts +++ b/src/vs/workbench/api/worker/extHostExtensionService.ts -@@ -12,6 +12,7 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions' - import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes'; - import { timeout } from 'vs/base/common/async'; - import { ExtHostConsoleForwarder } from 'vs/workbench/api/worker/extHostConsoleForwarder'; -+import { isWebWorker } from 'vs/base/common/platform'; +@@ -12,6 +12,7 @@ import { IExtensionDescription } from '../../../platform/extensions/common/exten + import { ExtensionRuntime } from '../common/extHostTypes.js'; + import { timeout } from '../../../base/common/async.js'; + import { ExtHostConsoleForwarder } from './extHostConsoleForwarder.js'; ++import { isWebWorker } from '../../../base/common/platform.js'; class WorkerRequireInterceptor extends RequireInterceptor { diff --git a/vscode-paches/0021-fix-override-log-services-even-in-main-thread.patch b/vscode-paches/0020-fix-override-log-services-even-in-main-thread.patch similarity index 50% rename from vscode-paches/0021-fix-override-log-services-even-in-main-thread.patch rename to vscode-paches/0020-fix-override-log-services-even-in-main-thread.patch index 240ba550..330a7571 100644 --- a/vscode-paches/0021-fix-override-log-services-even-in-main-thread.patch +++ b/vscode-paches/0020-fix-override-log-services-even-in-main-thread.patch @@ -4,21 +4,30 @@ Date: Mon, 11 Mar 2024 17:46:45 +0100 Subject: [PATCH] fix: override log services even in main thread --- - src/vs/workbench/api/common/extensionHostMain.ts | 5 +++++ + src/vs/workbench/api/common/extensionHostMain.ts | 7 ++++++- src/vs/workbench/api/worker/extHost.worker.services.ts | 4 ---- - 2 files changed, 5 insertions(+), 4 deletions(-) + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/api/common/extensionHostMain.ts b/src/vs/workbench/api/common/extensionHostMain.ts -index b06a1560fa6..ac932a43faa 100644 +index 3089e188325..41fa0fa3ca9 100644 --- a/src/vs/workbench/api/common/extensionHostMain.ts +++ b/src/vs/workbench/api/common/extensionHostMain.ts -@@ -24,6 +24,9 @@ import { IExtHostExtensionService, IHostUtils } from 'vs/workbench/api/common/ex - import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry'; - import { Mutable } from 'vs/base/common/types'; - import { isWebWorker } from 'vs/base/common/platform'; -+import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService'; -+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; -+import { ExtHostLoggerService } from 'vs/workbench/api/common/extHostLoggerService'; +@@ -12,7 +12,7 @@ import { MainContext, MainThreadConsoleShape } from './extHost.protocol.js'; + import { IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js'; + import { RPCProtocol } from '../../services/extensions/common/rpcProtocol.js'; + import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js'; +-import { ILogService } from '../../../platform/log/common/log.js'; ++import { ILoggerService, ILogService } from '../../../platform/log/common/log.js'; + import { getSingletonServiceDescriptors } from '../../../platform/instantiation/common/extensions.js'; + import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js'; + import { IExtHostInitDataService } from './extHostInitDataService.js'; +@@ -24,6 +24,9 @@ import { IExtHostExtensionService, IHostUtils } from './extHostExtensionService. + import { IExtHostTelemetry } from './extHostTelemetry.js'; + import { Mutable } from '../../../base/common/types.js'; + import { isWebWorker } from '../../../base/common/platform.js'; ++import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js'; ++import { ExtHostLoggerService } from './extHostLoggerService.js'; ++import { ExtHostLogService } from './extHostLogService.js'; export interface IExitFn { (code?: number): any; @@ -32,22 +41,22 @@ index b06a1560fa6..ac932a43faa 100644 const instaService: IInstantiationService = new InstantiationService(services, true); diff --git a/src/vs/workbench/api/worker/extHost.worker.services.ts b/src/vs/workbench/api/worker/extHost.worker.services.ts -index 20ec7e138a6..e284ed6752b 100644 +index 85c1a96bb94..229b893ea31 100644 --- a/src/vs/workbench/api/worker/extHost.worker.services.ts +++ b/src/vs/workbench/api/worker/extHost.worker.services.ts @@ -3,11 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; - import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; --import { ILogService } from 'vs/platform/log/common/log'; - import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService'; --import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService'; - import { ExtensionStoragePaths, IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths'; - import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensionService'; +-import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js'; + import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js'; +-import { ILogService } from '../../../platform/log/common/log.js'; + import { IExtHostExtensionService } from '../common/extHostExtensionService.js'; +-import { ExtHostLogService } from '../common/extHostLogService.js'; + import { ExtensionStoragePaths, IExtensionStoragePaths } from '../common/extHostStoragePaths.js'; + import { ExtHostExtensionService } from './extHostExtensionService.js'; -@@ -17,6 +14,5 @@ import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensio +@@ -17,6 +14,5 @@ import { ExtHostExtensionService } from './extHostExtensionService.js'; // ### ### // ######################################################################### diff --git a/vscode-paches/0022-feat-expose-extHostExtensionService.patch b/vscode-paches/0021-feat-expose-extHostExtensionService.patch similarity index 50% rename from vscode-paches/0022-feat-expose-extHostExtensionService.patch rename to vscode-paches/0021-feat-expose-extHostExtensionService.patch index 6e3a219a..12586f19 100644 --- a/vscode-paches/0022-feat-expose-extHostExtensionService.patch +++ b/vscode-paches/0021-feat-expose-extHostExtensionService.patch @@ -4,22 +4,13 @@ Date: Mon, 11 Mar 2024 17:47:22 +0100 Subject: [PATCH] feat: expose extHostExtensionService --- - src/vs/workbench/api/common/extensionHostMain.ts | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + src/vs/workbench/api/common/extensionHostMain.ts | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/src/vs/workbench/api/common/extensionHostMain.ts b/src/vs/workbench/api/common/extensionHostMain.ts -index ac932a43faa..134d9884b5d 100644 +index 41fa0fa3ca9..72f8b35a069 100644 --- a/src/vs/workbench/api/common/extensionHostMain.ts +++ b/src/vs/workbench/api/common/extensionHostMain.ts -@@ -12,7 +12,7 @@ import { MainContext, MainThreadConsoleShape } from 'vs/workbench/api/common/ext - import { IExtensionHostInitData } from 'vs/workbench/services/extensions/common/extensionHostProtocol'; - import { RPCProtocol } from 'vs/workbench/services/extensions/common/rpcProtocol'; - import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions'; --import { ILogService } from 'vs/platform/log/common/log'; -+import { ILogService, ILoggerService } from 'vs/platform/log/common/log'; - import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions'; - import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; - import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService'; @@ -208,6 +208,10 @@ export class ExtensionHostMain { this._extensionService.terminate(reason); } diff --git a/vscode-paches/0023-cleanup-remove-non-ESM-compatible-code.patch b/vscode-paches/0022-cleanup-remove-non-ESM-compatible-code.patch similarity index 70% rename from vscode-paches/0023-cleanup-remove-non-ESM-compatible-code.patch rename to vscode-paches/0022-cleanup-remove-non-ESM-compatible-code.patch index ad1721c2..72ea9b22 100644 --- a/vscode-paches/0023-cleanup-remove-non-ESM-compatible-code.patch +++ b/vscode-paches/0022-cleanup-remove-non-ESM-compatible-code.patch @@ -7,27 +7,27 @@ Subject: [PATCH] cleanup: remove non-ESM compatible code src/vs/base/common/worker/simpleWorker.ts | 41 +------------------ .../common/services/editorSimpleWorker.ts | 23 +---------- .../api/node/extensionHostProcess.ts | 18 -------- - .../webWorkerExtensionHostIframe.esm.html | 9 +--- - 4 files changed, 4 insertions(+), 87 deletions(-) + .../webWorkerExtensionHostIframe.esm.html | 7 +--- + 4 files changed, 3 insertions(+), 86 deletions(-) diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts -index cf19e69171a..fafef7ac754 100644 +index f08369f98cf..1e61f4c8fe2 100644 --- a/src/vs/base/common/worker/simpleWorker.ts +++ b/src/vs/base/common/worker/simpleWorker.ts -@@ -7,18 +7,10 @@ import { CharCode } from 'vs/base/common/charCode'; - import { onUnexpectedError, transformErrorForSerialization } from 'vs/base/common/errors'; - import { Emitter, Event } from 'vs/base/common/event'; - import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; --import { AppResourcePath, FileAccess } from 'vs/base/common/network'; - import { isWeb } from 'vs/base/common/platform'; - import * as strings from 'vs/base/common/strings'; - import { URI } from 'vs/base/common/uri'; +@@ -7,18 +7,10 @@ import { CharCode } from '../charCode.js'; + import { onUnexpectedError, transformErrorForSerialization } from '../errors.js'; + import { Emitter, Event } from '../event.js'; + import { Disposable, IDisposable } from '../lifecycle.js'; +-import { AppResourcePath, FileAccess } from '../network.js'; + import { isWeb } from '../platform.js'; + import * as strings from '../strings.js'; + import { URI } from '../uri.js'; -// ESM-comment-begin --const isESM = false; +-// const isESM = false; -// ESM-comment-end -// ESM-uncomment-begin --// const isESM = true; +-const isESM = true; -// ESM-uncomment-end - const DEFAULT_CHANNEL = 'default'; @@ -52,10 +52,10 @@ index cf19e69171a..fafef7ac754 100644 - // Use the global require to be sure to get the global config - - // ESM-comment-begin -- const req = (globalThis.require || require); +- // const req = (globalThis.require || require); - // ESM-comment-end - // ESM-uncomment-begin -- // const req = globalThis.require; +- const req = globalThis.require; - // ESM-uncomment-end - - req([moduleId], (module: { create: IRequestHandlerFactory }) => { @@ -74,25 +74,25 @@ index cf19e69171a..fafef7ac754 100644 } diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts -index 4bf19b0d25e..7d9721053c1 100644 +index ff8bbb85464..b0163997f9b 100644 --- a/src/vs/editor/common/services/editorSimpleWorker.ts +++ b/src/vs/editor/common/services/editorSimpleWorker.ts -@@ -25,20 +25,12 @@ import { DetailedLineRangeMapping } from '../diff/rangeMapping'; - import { linesDiffComputers } from 'vs/editor/common/diff/linesDiffComputers'; - import { createProxyObject, getAllMethodNames } from 'vs/base/common/objects'; - import { IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider'; --import { AppResourcePath, FileAccess } from 'vs/base/common/network'; - import { BugIndicatingError } from 'vs/base/common/errors'; - import { computeDefaultDocumentColors } from 'vs/editor/common/languages/defaultDocumentColorsComputer'; - import { FindSectionHeaderOptions, SectionHeader, findSectionHeaders } from 'vs/editor/common/services/findSectionHeaders'; - import { IRawModelData, IWorkerTextModelSyncChannelServer } from './textModelSync/textModelSync.protocol'; - import { ICommonModel, WorkerTextModelSyncServer } from 'vs/editor/common/services/textModelSync/textModelSync.impl'; +@@ -25,20 +25,12 @@ import { DetailedLineRangeMapping } from '../diff/rangeMapping.js'; + import { linesDiffComputers } from '../diff/linesDiffComputers.js'; + import { createProxyObject, getAllMethodNames } from '../../../base/common/objects.js'; + import { IDocumentDiffProviderOptions } from '../diff/documentDiffProvider.js'; +-import { AppResourcePath, FileAccess } from '../../../base/common/network.js'; + import { BugIndicatingError } from '../../../base/common/errors.js'; + import { computeDefaultDocumentColors } from '../languages/defaultDocumentColorsComputer.js'; + import { FindSectionHeaderOptions, SectionHeader, findSectionHeaders } from './findSectionHeaders.js'; + import { IRawModelData, IWorkerTextModelSyncChannelServer } from './textModelSync/textModelSync.protocol.js'; + import { ICommonModel, WorkerTextModelSyncServer } from './textModelSync/textModelSync.impl.js'; -// ESM-comment-begin --const isESM = false; +-// const isESM = false; -// ESM-comment-end -// ESM-uncomment-begin --// const isESM = true; +-const isESM = true; -// ESM-uncomment-end - export interface IMirrorModel extends IMirrorTextModel { @@ -121,10 +121,10 @@ index 4bf19b0d25e..7d9721053c1 100644 // foreign method request diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts -index 80a60c1d4c1..5f1736f72a0 100644 +index 694559385c4..0be2f11f004 100644 --- a/src/vs/workbench/api/node/extensionHostProcess.ts +++ b/src/vs/workbench/api/node/extensionHostProcess.ts -@@ -57,24 +57,6 @@ const args = minimist(process.argv.slice(2), { +@@ -60,24 +60,6 @@ const args = minimist(process.argv.slice(2), { ] }) as ParsedExtHostArgs; @@ -134,7 +134,7 @@ index 80a60c1d4c1..5f1736f72a0 100644 -// happening we essentially blocklist this module from getting loaded in any -// extension by patching the node require() function. -(function () { -- const Module = globalThis._VSCODE_NODE_MODULES.module as any; +- const Module = require('module'); - const originalLoad = Module._load; - - Module._load = function (request: string) { @@ -150,15 +150,15 @@ index 80a60c1d4c1..5f1736f72a0 100644 const nativeExit: IExitFn = process.exit.bind(process); const nativeOn = process.on.bind(process); diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html -index 5368e599820..908984d7dc2 100644 +index 53bc54bb5aa..9a3c7cec21d 100644 --- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html +++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html @@ -4,7 +4,7 @@ @@ -167,12 +167,11 @@ index 5368e599820..908984d7dc2 100644 } - // ESM-comment-begin -- const isESM = false; +- // const isESM = false; - // ESM-comment-end - // ESM-uncomment-begin -- // const isESM = true; + const isESM = true; - // ESM-uncomment-end -+ const isESM = true; - const blob = new Blob([[ - `/*extensionHostWorker*/`, + // In below blob code, we are using JSON.stringify to ensure the passed + // in values are not breaking our script. The values may contain string diff --git a/vscode-paches/0024-feat-expose-api-factory.patch b/vscode-paches/0023-feat-expose-api-factory.patch similarity index 79% rename from vscode-paches/0024-feat-expose-api-factory.patch rename to vscode-paches/0023-feat-expose-api-factory.patch index f0e63257..991be7d7 100644 --- a/vscode-paches/0024-feat-expose-api-factory.patch +++ b/vscode-paches/0023-feat-expose-api-factory.patch @@ -8,18 +8,18 @@ Subject: [PATCH] feat: expose api factory 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts -index 5ce2ec7413b..5555f431ba0 100644 +index 71c42330bd1..093049532e8 100644 --- a/src/vs/workbench/api/worker/extHostExtensionService.ts +++ b/src/vs/workbench/api/worker/extHostExtensionService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl'; -+import { IExtensionApiFactory, createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl'; - import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHostExtensionActivator'; - import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService'; - import { URI } from 'vs/base/common/uri'; +-import { createApiFactoryAndRegisterActors } from '../common/extHost.api.impl.js'; ++import { createApiFactoryAndRegisterActors, IExtensionApiFactory } from '../common/extHost.api.impl.js'; + import { ExtensionActivationTimesBuilder } from '../common/extHostExtensionActivator.js'; + import { AbstractExtHostExtensionService } from '../common/extHostExtensionService.js'; + import { URI } from '../../../base/common/uri.js'; @@ -38,6 +38,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService { readonly extensionRuntime = ExtensionRuntime.Webworker; diff --git a/vscode-paches/0025-refactor-split-some-modules-to-be-able-to-import-the.patch b/vscode-paches/0024-refactor-split-some-modules-to-be-able-to-import-the.patch similarity index 92% rename from vscode-paches/0025-refactor-split-some-modules-to-be-able-to-import-the.patch rename to vscode-paches/0024-refactor-split-some-modules-to-be-able-to-import-the.patch index 471b3007..153f597c 100644 --- a/vscode-paches/0025-refactor-split-some-modules-to-be-able-to-import-the.patch +++ b/vscode-paches/0024-refactor-split-some-modules-to-be-able-to-import-the.patch @@ -8,13 +8,13 @@ Subject: [PATCH] refactor: split some modules to be able to import them .../editor/editor.contribution._autosave.ts | 9 + .../parts/editor/editor.contribution.ts | 3 +- .../files/browser/fileCommands._save.ts | 225 ++++++ - .../contrib/files/browser/fileCommands.ts | 221 +----- + .../contrib/files/browser/fileCommands.ts | 220 +----- .../files.contribution._configuration.ts | 297 ++++++++ .../browser/files.contribution._editorPane.ts | 93 +++ .../browser/files.contribution._explorer.ts | 280 ++++++++ .../files.contribution._fileEditorFactory.ts | 23 + .../files/browser/files.contribution.ts | 659 +----------------- - 9 files changed, 940 insertions(+), 870 deletions(-) + 9 files changed, 939 insertions(+), 870 deletions(-) create mode 100644 src/vs/workbench/browser/parts/editor/editor.contribution._autosave.ts create mode 100644 src/vs/workbench/contrib/files/browser/fileCommands._save.ts create mode 100644 src/vs/workbench/contrib/files/browser/files.contribution._configuration.ts @@ -38,22 +38,22 @@ index 00000000000..c7416d68719 + +registerWorkbenchContribution2(EditorAutoSave.ID, EditorAutoSave, WorkbenchPhase.BlockRestore); diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts -index 753f4aa8860..6effe9075e1 100644 +index 1c777faacaf..6977ff73214 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts -@@ -61,7 +61,6 @@ import { isMacintosh } from 'vs/base/common/platform'; - import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions'; - import { FloatingEditorClickMenu } from 'vs/workbench/browser/codeeditor'; - import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; --import { EditorAutoSave } from 'vs/workbench/browser/parts/editor/editorAutoSave'; - import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess'; - import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess'; - import { FileAccess } from 'vs/base/common/network'; -@@ -72,6 +71,7 @@ import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/e - import { ConfigureEditorAction, ConfigureEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from 'vs/workbench/browser/actions/layoutActions'; - import { ICommandAction } from 'vs/platform/action/common/action'; - import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; -+import './editor.contribution._autosave'; +@@ -61,7 +61,6 @@ import { isMacintosh } from '../../../../base/common/platform.js'; + import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js'; + import { FloatingEditorClickMenu } from '../../codeeditor.js'; + import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js'; +-import { EditorAutoSave } from './editorAutoSave.js'; + import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js'; + import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js'; + import { FileAccess } from '../../../../base/common/network.js'; +@@ -72,6 +71,7 @@ import { DynamicEditorConfigurations } from './editorConfiguration.js'; + import { ConfigureEditorAction, ConfigureEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from '../../actions/layoutActions.js'; + import { ICommandAction } from '../../../../platform/action/common/action.js'; + import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js'; ++import './editor.contribution._autosave.js'; //#region Editor Registrations @@ -297,74 +297,71 @@ index 00000000000..00d9d64137d + } +}); diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts -index c17a5b80692..501b58373c1 100644 +index 69cfd27a424..484b77a02f7 100644 --- a/src/vs/workbench/contrib/files/browser/fileCommands.ts +++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts -@@ -3,10 +3,10 @@ - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ +@@ -5,8 +5,7 @@ -+ - import * as nls from 'vs/nls'; - import { URI } from 'vs/base/common/uri'; --import { EditorResourceAccessor, IEditorCommandsContext, SideBySideEditor, IEditorIdentifier, SaveReason, EditorsOrder, EditorInputCapabilities } from 'vs/workbench/common/editor'; --import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput'; -+import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor'; - import { IWindowOpenable, IOpenWindowOptions, isWorkspaceToOpen, IOpenEmptyWindowOptions } from 'vs/platform/window/common/window'; - import { IHostService } from 'vs/workbench/services/host/browser/host'; - import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -@@ -14,7 +14,6 @@ import { IWorkspaceContextService, UNTITLED_WORKSPACE_NAME } from 'vs/platform/w - import { ExplorerFocusCondition, TextFileContentProvider, VIEWLET_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, FilesExplorerFocusCondition, ExplorerFolderContext, VIEW_ID } from 'vs/workbench/contrib/files/common/files'; - import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet'; - import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; --import { toErrorMessage } from 'vs/base/common/errorMessage'; - import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands'; - import { IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; - import { IFileService } from 'vs/platform/files/common/files'; -@@ -22,36 +21,29 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co - import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; - import { isWeb, isWindows } from 'vs/base/common/platform'; - import { ITextModelService } from 'vs/editor/common/services/resolverService'; --import { getResourceForCommand, getMultiSelectedResources, getOpenEditorsViewMultiSelection, IExplorerService } from 'vs/workbench/contrib/files/browser/files'; -+import { getResourceForCommand, getMultiSelectedResources, IExplorerService } from 'vs/workbench/contrib/files/browser/files'; - import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing'; --import { resolveCommandsContext } from 'vs/workbench/browser/parts/editor/editorCommandsContext'; - import { Schemas } from 'vs/base/common/network'; --import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; - import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; --import { IEditorService, SIDE_GROUP, ISaveEditorsOptions } from 'vs/workbench/services/editor/common/editorService'; --import { IEditorGroupsService, GroupsOrder, IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService'; -+import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -+import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; - import { ILabelService } from 'vs/platform/label/common/label'; --import { basename, joinPath, isEqual } from 'vs/base/common/resources'; -+import { basename, joinPath } from 'vs/base/common/resources'; - import { IDisposable, dispose } from 'vs/base/common/lifecycle'; - import { IEnvironmentService } from 'vs/platform/environment/common/environment'; --import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; --import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget'; --import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; - import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; --import { isCancellationError } from 'vs/base/common/errors'; --import { IAction, toAction } from 'vs/base/common/actions'; - import { EditorOpenSource, EditorResolution } from 'vs/platform/editor/common/editor'; --import { hash } from 'vs/base/common/hash'; - import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; - import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite'; - import { ViewContainerLocation } from 'vs/workbench/common/views'; - import { IViewsService } from 'vs/workbench/services/views/common/viewsService'; --import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants'; -+import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants'; - import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs'; - import { RemoveRootFolderAction } from 'vs/workbench/browser/actions/workspaceActions'; - import { OpenEditorsView } from 'vs/workbench/contrib/files/browser/views/openEditorsView'; - import { ExplorerView } from 'vs/workbench/contrib/files/browser/views/explorerView'; - import { IListService } from 'vs/platform/list/browser/listService'; -+import './fileCommands._save'; + import * as nls from '../../../../nls.js'; + import { URI } from '../../../../base/common/uri.js'; +-import { EditorResourceAccessor, IEditorCommandsContext, SideBySideEditor, IEditorIdentifier, SaveReason, EditorsOrder, EditorInputCapabilities } from '../../../common/editor.js'; +-import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js'; ++import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js'; + import { IWindowOpenable, IOpenWindowOptions, isWorkspaceToOpen, IOpenEmptyWindowOptions } from '../../../../platform/window/common/window.js'; + import { IHostService } from '../../../services/host/browser/host.js'; + import { ServicesAccessor, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; +@@ -14,7 +13,6 @@ import { IWorkspaceContextService, UNTITLED_WORKSPACE_NAME } from '../../../../p + import { ExplorerFocusCondition, TextFileContentProvider, VIEWLET_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, FilesExplorerFocusCondition, ExplorerFolderContext, VIEW_ID } from '../common/files.js'; + import { ExplorerViewPaneContainer } from './explorerViewlet.js'; + import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js'; +-import { toErrorMessage } from '../../../../base/common/errorMessage.js'; + import { CommandsRegistry, ICommandHandler, ICommandService } from '../../../../platform/commands/common/commands.js'; + import { IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js'; + import { IFileService } from '../../../../platform/files/common/files.js'; +@@ -22,36 +20,29 @@ import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keyb + import { KeyMod, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js'; + import { isWeb, isWindows } from '../../../../base/common/platform.js'; + import { ITextModelService } from '../../../../editor/common/services/resolverService.js'; +-import { getResourceForCommand, getMultiSelectedResources, getOpenEditorsViewMultiSelection, IExplorerService } from './files.js'; ++import { getResourceForCommand, getMultiSelectedResources, IExplorerService } from './files.js'; + import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.js'; +-import { resolveCommandsContext } from '../../../browser/parts/editor/editorCommandsContext.js'; + import { Schemas } from '../../../../base/common/network.js'; +-import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js'; + import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js'; +-import { IEditorService, SIDE_GROUP, ISaveEditorsOptions } from '../../../services/editor/common/editorService.js'; +-import { IEditorGroupsService, GroupsOrder, IEditorGroup } from '../../../services/editor/common/editorGroupsService.js'; ++import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js'; ++import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js'; + import { ILabelService } from '../../../../platform/label/common/label.js'; +-import { basename, joinPath, isEqual } from '../../../../base/common/resources.js'; ++import { basename, joinPath } from '../../../../base/common/resources.js'; + import { IDisposable, dispose } from '../../../../base/common/lifecycle.js'; + import { IEnvironmentService } from '../../../../platform/environment/common/environment.js'; +-import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js'; +-import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js'; +-import { ITextFileService } from '../../../services/textfile/common/textfiles.js'; + import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js'; +-import { isCancellationError } from '../../../../base/common/errors.js'; +-import { IAction, toAction } from '../../../../base/common/actions.js'; + import { EditorOpenSource, EditorResolution } from '../../../../platform/editor/common/editor.js'; +-import { hash } from '../../../../base/common/hash.js'; + import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; + import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js'; + import { ViewContainerLocation } from '../../../common/views.js'; + import { IViewsService } from '../../../services/views/common/viewsService.js'; +-import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants.js'; ++import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants.js'; + import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js'; + import { RemoveRootFolderAction } from '../../../browser/actions/workspaceActions.js'; + import { OpenEditorsView } from './views/openEditorsView.js'; + import { ExplorerView } from './views/explorerView.js'; + import { IListService } from '../../../../platform/list/browser/listService.js'; ++import './fileCommands._save.js'; export const openWindowCommand = (accessor: ServicesAccessor, toOpen: IWindowOpenable[], options?: IOpenWindowOptions) => { if (Array.isArray(toOpen)) { -@@ -362,203 +354,6 @@ CommandsRegistry.registerCommand({ +@@ -364,203 +355,6 @@ CommandsRegistry.registerCommand({ // Save / Save As / Save All / Revert @@ -570,7 +567,7 @@ index c17a5b80692..501b58373c1 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..b44c86e2c7e +index 00000000000..b7d4ca80081 --- /dev/null +++ b/src/vs/workbench/contrib/files/browser/files.contribution._configuration.ts @@ -0,0 +1,297 @@ @@ -765,7 +762,7 @@ index 00000000000..b44c86e2c7e + 'patternProperties': { + '.*': { 'type': 'boolean' } + }, -+ 'default': { '**/.git/objects/**': true, '**/.git/subtree-cache/**': true, '**/node_modules/*/**': true, '**/.hg/store/**': true }, ++ 'default': { '**/.git/objects/**': true, '**/.git/subtree-cache/**': true, '**/.hg/store/**': true }, + 'markdownDescription': nls.localize('watcherExclude', "Configure paths or [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude from file watching. Paths can either be relative to the watched folder or absolute. Glob patterns are matched relative from the watched folder. When you experience the file watcher process consuming a lot of CPU, make sure to exclude large folders that are of less interest (such as build output folders)."), + 'scope': ConfigurationScope.RESOURCE + }, @@ -1286,45 +1283,45 @@ index 00000000000..2f31d6a7984 + } +}); diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts -index 097721653f6..fa00f1d55a1 100644 +index 250bb0c060a..269fb34cadb 100644 --- a/src/vs/workbench/contrib/files/browser/files.contribution.ts +++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts @@ -3,658 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import * as nls from 'vs/nls'; --import { sep } from 'vs/base/common/path'; --import { Registry } from 'vs/platform/registry/common/platform'; --import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry'; --import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; --import { IFileEditorInput, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor'; --import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG } from 'vs/platform/files/common/files'; --import { SortOrder, LexicographicOptions, FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE, UndoConfirmLevel, IFilesConfiguration } from 'vs/workbench/contrib/files/common/files'; --import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker'; --import { TextFileSaveErrorHandler } from 'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler'; --import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput'; --import { BinaryFileEditor } from 'vs/workbench/contrib/files/browser/editors/binaryFileEditor'; --import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; --import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; --import { isNative, isWeb, isWindows } from 'vs/base/common/platform'; --import { ExplorerViewletViewsContribution } from 'vs/workbench/contrib/files/browser/explorerViewlet'; --import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor'; --import { ILabelService } from 'vs/platform/label/common/label'; --import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; --import { ExplorerService, UNDO_REDO_SOURCE } from 'vs/workbench/contrib/files/browser/explorerService'; --import { GUESSABLE_ENCODINGS, SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/encoding'; --import { Schemas } from 'vs/base/common/network'; --import { WorkspaceWatcher } from 'vs/workbench/contrib/files/browser/workspaceWatcher'; --import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema'; --import { DirtyFilesIndicator } from 'vs/workbench/contrib/files/common/dirtyFilesIndicator'; --import { UndoCommand, RedoCommand } from 'vs/editor/browser/editorExtensions'; --import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo'; --import { IExplorerService } from 'vs/workbench/contrib/files/browser/files'; --import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from 'vs/workbench/contrib/files/browser/editors/fileEditorHandler'; --import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry'; --import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; --import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor'; +-import * as nls from '../../../../nls.js'; +-import { sep } from '../../../../base/common/path.js'; +-import { Registry } from '../../../../platform/registry/common/platform.js'; +-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js'; +-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js'; +-import { IFileEditorInput, IEditorFactoryRegistry, EditorExtensions } from '../../../common/editor.js'; +-import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG } from '../../../../platform/files/common/files.js'; +-import { SortOrder, LexicographicOptions, FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE, UndoConfirmLevel, IFilesConfiguration } from '../common/files.js'; +-import { TextFileEditorTracker } from './editors/textFileEditorTracker.js'; +-import { TextFileSaveErrorHandler } from './editors/textFileSaveErrorHandler.js'; +-import { FileEditorInput } from './editors/fileEditorInput.js'; +-import { BinaryFileEditor } from './editors/binaryFileEditor.js'; +-import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; +-import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js'; +-import { isNative, isWeb, isWindows } from '../../../../base/common/platform.js'; +-import { ExplorerViewletViewsContribution } from './explorerViewlet.js'; +-import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../../browser/editor.js'; +-import { ILabelService } from '../../../../platform/label/common/label.js'; +-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; +-import { ExplorerService, UNDO_REDO_SOURCE } from './explorerService.js'; +-import { GUESSABLE_ENCODINGS, SUPPORTED_ENCODINGS } from '../../../services/textfile/common/encoding.js'; +-import { Schemas } from '../../../../base/common/network.js'; +-import { WorkspaceWatcher } from './workspaceWatcher.js'; +-import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js'; +-import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js'; +-import { UndoCommand, RedoCommand } from '../../../../editor/browser/editorExtensions.js'; +-import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js'; +-import { IExplorerService } from './files.js'; +-import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js'; +-import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js'; +-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; +-import { TextFileEditor } from './editors/textFileEditor.js'; - -class FileUriLabelContribution implements IWorkbenchContribution { - @@ -1585,7 +1582,7 @@ index 097721653f6..fa00f1d55a1 100644 - 'patternProperties': { - '.*': { 'type': 'boolean' } - }, -- 'default': { '**/.git/objects/**': true, '**/.git/subtree-cache/**': true, '**/node_modules/*/**': true, '**/.hg/store/**': true }, +- 'default': { '**/.git/objects/**': true, '**/.git/subtree-cache/**': true, '**/.hg/store/**': true }, - 'markdownDescription': nls.localize('watcherExclude', "Configure paths or [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude from file watching. Paths can either be relative to the watched folder or absolute. Glob patterns are matched relative from the watched folder. When you experience the file watcher process consuming a lot of CPU, make sure to exclude large folders that are of less interest (such as build output folders)."), - 'scope': ConfigurationScope.RESOURCE - }, @@ -1948,7 +1945,7 @@ index 097721653f6..fa00f1d55a1 100644 - aliases: ['Binary'], - mimetypes: ['text/x-code-binary'] -}); -+import './files.contribution._configuration'; -+import './files.contribution._editorPane'; -+import './files.contribution._fileEditorFactory'; -+import './files.contribution._explorer'; ++import './files.contribution._configuration.js'; ++import './files.contribution._editorPane.js'; ++import './files.contribution._fileEditorFactory.js'; ++import './files.contribution._explorer.js'; diff --git a/vscode-paches/0026-fix-replace-map-by-forEach.patch b/vscode-paches/0025-fix-replace-map-by-forEach.patch similarity index 93% rename from vscode-paches/0026-fix-replace-map-by-forEach.patch rename to vscode-paches/0025-fix-replace-map-by-forEach.patch index 1e6ee5e8..db0b72db 100644 --- a/vscode-paches/0026-fix-replace-map-by-forEach.patch +++ b/vscode-paches/0025-fix-replace-map-by-forEach.patch @@ -9,10 +9,10 @@ Subject: [PATCH] fix: replace map by forEach 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts -index a9fc39c84ed..957684aa7f7 100644 +index 5e83a9458bd..1a3545c6e24 100644 --- a/src/vs/workbench/browser/parts/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositeBar.ts -@@ -477,7 +477,7 @@ export class CompositeBar extends Widget implements ICompositeBar { +@@ -494,7 +494,7 @@ export class CompositeBar extends Widget implements ICompositeBar { // Compute sizes only if visible. Otherwise the size measurment would be computed wrongly. const currentItemsLength = compositeSwitcherBar.viewItems.length; compositeSwitcherBar.push(items.map(composite => composite.activityAction)); @@ -22,7 +22,7 @@ index a9fc39c84ed..957684aa7f7 100644 : compositeSwitcherBar.getWidth(currentItemsLength + index) )); diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts -index 9cb5f5920d1..4f591b9ce05 100644 +index 1ca314af9d2..d93257cf1c3 100644 --- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts +++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts @@ -688,7 +688,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer { diff --git a/vscode-paches/0027-feat-only-apply-style-on-specific-class.patch b/vscode-paches/0026-feat-only-apply-style-on-specific-class.patch similarity index 99% rename from vscode-paches/0027-feat-only-apply-style-on-specific-class.patch rename to vscode-paches/0026-feat-only-apply-style-on-specific-class.patch index e8b5e47c..6e889c12 100644 --- a/vscode-paches/0027-feat-only-apply-style-on-specific-class.patch +++ b/vscode-paches/0026-feat-only-apply-style-on-specific-class.patch @@ -355,7 +355,7 @@ index 6c9dbb9a0c9..4b381ddf79c 100644 outline-offset: -1px; } diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts -index 8fab9bc5b71..30f20a45b2a 100644 +index 9f36f4a74eb..de1352c0fe2 100644 --- a/src/vs/workbench/browser/style.ts +++ b/src/vs/workbench/browser/style.ts @@ -16,12 +16,12 @@ registerThemingParticipant((theme, collector) => { diff --git a/vscode-paches/0028-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch b/vscode-paches/0027-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch similarity index 64% rename from vscode-paches/0028-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch rename to vscode-paches/0027-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch index c4ceb233..aa511959 100644 --- a/vscode-paches/0028-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch +++ b/vscode-paches/0027-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch @@ -13,19 +13,19 @@ to be able to register the file before 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts -index a298cf3c232..f91b7cc7398 100644 +index f6873bf5524..b653ac57a36 100644 --- a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts +++ b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts -@@ -42,7 +42,7 @@ import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsSe - import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; - import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; - import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from 'vs/workbench/services/extensionManagement/common/extensionFeatures'; --import { DefaultIconPath, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -+import { getDefaultIconPath, EnablementState } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; - import { LocalWebWorkerRunningLocation } from 'vs/workbench/services/extensions/common/extensionRunningLocation'; - import { IExtensionHostProfile, IExtensionService, IExtensionsStatus } from 'vs/workbench/services/extensions/common/extensions'; - -@@ -276,8 +276,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane { +@@ -38,7 +38,7 @@ import { IEditorGroup } from '../../../services/editor/common/editorGroupsServic + import { IEditorService } from '../../../services/editor/common/editorService.js'; + import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js'; + import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js'; +-import { DefaultIconPath, EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js'; ++import { getDefaultIconPath, EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js'; + import { LocalWebWorkerRunningLocation } from '../../../services/extensions/common/extensionRunningLocation.js'; + import { IExtensionHostProfile, IExtensionService, IExtensionsStatus } from '../../../services/extensions/common/extensions.js'; + import { IExtension, IExtensionsWorkbenchService } from '../common/extensions.js'; +@@ -277,8 +277,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane { data.root.classList.toggle('odd', index % 2 === 1); @@ -37,19 +37,19 @@ index a298cf3c232..f91b7cc7398 100644 if (!data.icon.complete) { data.icon.style.visibility = 'hidden'; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index ba69585c920..08fb07a831c 100644 +index e34a9006982..307fc647c57 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -19,7 +19,7 @@ import { InstallOptions, IProductVersion, UninstallExtensionInfo - } from 'vs/platform/extensionManagement/common/extensionManagement'; --import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension, extensionsConfigurationNodeBase } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -+import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, getDefaultIconPath, IResourceExtension, extensionsConfigurationNodeBase } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; - import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; - import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; - import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -@@ -271,7 +271,7 @@ export class Extension implements IExtension { + } from '../../../../platform/extensionManagement/common/extensionManagement.js'; +-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension, extensionsConfigurationNodeBase } from '../../../services/extensionManagement/common/extensionManagement.js'; ++import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, getDefaultIconPath, IResourceExtension, extensionsConfigurationNodeBase } from '../../../services/extensionManagement/common/extensionManagement.js'; + import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js'; + import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; + import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; +@@ -272,7 +272,7 @@ export class Extension implements IExtension { } } } @@ -59,15 +59,15 @@ index ba69585c920..08fb07a831c 100644 get repository(): string | undefined { diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts -index afff5c25809..28b50d2e885 100644 +index a3d6f047f65..310fd38c68f 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts -@@ -33,7 +33,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; - import { checkGlobFileExists } from 'vs/workbench/services/extensions/common/workspaceContains'; - import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; - import { CancellationTokenSource } from 'vs/base/common/cancellation'; --import { DefaultIconPath } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -+import { getDefaultIconPath } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; +@@ -33,7 +33,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet + import { checkGlobFileExists } from '../../../services/extensions/common/workspaceContains.js'; + import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; + import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; +-import { DefaultIconPath } from '../../../services/extensionManagement/common/extensionManagement.js'; ++import { getDefaultIconPath } from '../../../services/extensionManagement/common/extensionManagement.js'; export const HasMultipleNewFileEntries = new RawContextKey('hasMultipleNewFileEntries', false); @@ -81,10 +81,10 @@ index afff5c25809..28b50d2e885 100644 when: ContextKeyExpr.deserialize(override ?? walkthrough.when) ?? ContextKeyExpr.true(), } as const; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts -index 4886c6ff699..9888464405d 100644 +index 0244e0aa381..5bd87b4b5ab 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts -@@ -40,7 +40,7 @@ export interface IExtensionManagementServerService { +@@ -43,7 +43,7 @@ export interface IExtensionManagementServerService { getExtensionInstallLocation(extension: IExtension): ExtensionInstallLocation | null; } diff --git a/vscode-paches/0029-cleanup-remove-some-checks-and-warnings.patch b/vscode-paches/0028-cleanup-remove-some-checks-and-warnings.patch similarity index 93% rename from vscode-paches/0029-cleanup-remove-some-checks-and-warnings.patch rename to vscode-paches/0028-cleanup-remove-some-checks-and-warnings.patch index 5d5bb8d9..9cee4389 100644 --- a/vscode-paches/0029-cleanup-remove-some-checks-and-warnings.patch +++ b/vscode-paches/0028-cleanup-remove-some-checks-and-warnings.patch @@ -25,7 +25,7 @@ index e5fa674ea82..c3e8d26f3da 100644 }); } diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 8870ddf4cc6..6bc4e3293c6 100644 +index 1b66babea28..44b1733ff0e 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -492,11 +492,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD @@ -53,7 +53,7 @@ index 8870ddf4cc6..6bc4e3293c6 100644 if (this.element && this._messagePort) { this._messagePort.postMessage({ channel, args: data }, transferable); diff --git a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts -index 4e9dc37e3f4..10fb6ae0300 100644 +index c7fe91bfe1e..608ca8f7ce2 100644 --- a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts +++ b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts @@ -364,13 +364,6 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili @@ -71,7 +71,7 @@ index 4e9dc37e3f4..10fb6ae0300 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 0c2e68dd1ec..6aa219f71f8 100644 +index 8141d1dfe02..6793d6c6fab 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -113,8 +113,6 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost @@ -84,16 +84,16 @@ index 0c2e68dd1ec..6aa219f71f8 100644 const relativeExtensionHostIframeSrc = FileAccess.asBrowserUri(iframeModulePath); diff --git a/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts b/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts -index a1a0779371e..18ca6d1b496 100644 +index ace5da0d59a..580cae23bdd 100644 --- a/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts +++ b/src/vs/workbench/services/textMate/common/TMScopeRegistry.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import * as resources from 'vs/base/common/resources'; - import { URI } from 'vs/base/common/uri'; - import { LanguageId, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes'; +-import * as resources from '../../../../base/common/resources.js'; + import { URI } from '../../../../base/common/uri.js'; + import { LanguageId, StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js'; @@ -40,16 +39,6 @@ export class TMScopeRegistry { } diff --git a/vscode-paches/0030-refactor-split-class-in-2.patch b/vscode-paches/0029-refactor-split-class-in-2.patch similarity index 97% rename from vscode-paches/0030-refactor-split-class-in-2.patch rename to vscode-paches/0029-refactor-split-class-in-2.patch index d436acd3..55bbda00 100644 --- a/vscode-paches/0030-refactor-split-class-in-2.patch +++ b/vscode-paches/0029-refactor-split-class-in-2.patch @@ -8,11 +8,11 @@ Subject: [PATCH] refactor: split class in 2 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts -index 83bce6798aa..c97b6de14b8 100644 +index b232937c792..e48e1d79a07 100644 --- a/src/vs/workbench/services/extensions/browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/browser/extensionService.ts -@@ -43,8 +43,10 @@ import { IUserDataInitializationService } from 'vs/workbench/services/userData/b - import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile'; +@@ -43,8 +43,10 @@ import { IUserDataInitializationService } from '../../userData/browser/userDataI + import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js'; export class ExtensionService extends AbstractExtensionService implements IExtensionService { - diff --git a/vscode-paches/0031-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch b/vscode-paches/0030-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch similarity index 76% rename from vscode-paches/0031-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch rename to vscode-paches/0030-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch index 388a28bd..234baff2 100644 --- a/vscode-paches/0031-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch +++ b/vscode-paches/0030-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch @@ -10,18 +10,18 @@ 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 62a129b809d..0a1a2490bef 100644 +index a821d841916..5b7f5226641 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { Event } from 'vs/base/common/event'; -+import { Emitter, Event } from 'vs/base/common/event'; - import { IProcessEnvironment, OperatingSystem } from 'vs/base/common/platform'; - import { URI, UriComponents } from 'vs/base/common/uri'; - import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; +-import { Event } from '../../../base/common/event.js'; ++import { Emitter, Event } from '../../../base/common/event.js'; + import { IProcessEnvironment, OperatingSystem } from '../../../base/common/platform.js'; + import { URI, UriComponents } from '../../../base/common/uri.js'; + import { createDecorator } from '../../instantiation/common/instantiation.js'; @@ -1055,12 +1055,27 @@ export const TerminalExtensions = { Backend: 'workbench.contributions.terminal.processBackend' }; @@ -79,26 +79,26 @@ index 62a129b809d..0a1a2490bef 100644 } Registry.add(TerminalExtensions.Backend, new TerminalBackendRegistry()); diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts -index 2dc85842d94..aad999896ea 100644 +index b1da8a45dd8..9ec62d935d7 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts -@@ -19,7 +19,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c - import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; - import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; - import { INotificationService } from 'vs/platform/notification/common/notification'; --import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IPtyHostAttachTarget, IRawTerminalInstanceLayoutInfo, IRawTerminalTabLayoutInfo, IShellLaunchConfig, ITerminalBackend, ITerminalLaunchError, ITerminalLogService, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalExitReason, TerminalLocation, TerminalLocationString, TitleEventSource } from 'vs/platform/terminal/common/terminal'; -+import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IPtyHostAttachTarget, IRawTerminalInstanceLayoutInfo, IRawTerminalTabLayoutInfo, IShellLaunchConfig, ITerminalBackend, ITerminalBackendRegistry, ITerminalLaunchError, ITerminalLogService, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalExitReason, TerminalExtensions, TerminalLocation, TerminalLocationString, TitleEventSource } from 'vs/platform/terminal/common/terminal'; - import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings'; - import { iconForeground } from 'vs/platform/theme/common/colorRegistry'; - import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry'; -@@ -53,6 +53,7 @@ import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilitie - import { ITimerService } from 'vs/workbench/services/timer/browser/timerService'; - import { mark } from 'vs/base/common/performance'; - import { DetachedTerminal } from 'vs/workbench/contrib/terminal/browser/detachedTerminal'; -+import { Registry } from 'vs/platform/registry/common/platform'; - import { ITerminalCapabilityImplMap, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; - import { createInstanceCapabilityEventMultiplexer } from 'vs/workbench/contrib/terminal/browser/terminalEvents'; - import { mainWindow } from 'vs/base/browser/window'; +@@ -19,7 +19,7 @@ import { IContextKey, IContextKeyService } from '../../../../platform/contextkey + import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js'; + import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; + import { INotificationService } from '../../../../platform/notification/common/notification.js'; +-import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IPtyHostAttachTarget, IRawTerminalInstanceLayoutInfo, IRawTerminalTabLayoutInfo, IShellLaunchConfig, ITerminalBackend, ITerminalLaunchError, ITerminalLogService, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalExitReason, TerminalLocation, TerminalLocationString, TitleEventSource } from '../../../../platform/terminal/common/terminal.js'; ++import { ICreateContributedTerminalProfileOptions, IExtensionTerminalProfile, IPtyHostAttachTarget, IRawTerminalInstanceLayoutInfo, IRawTerminalTabLayoutInfo, IShellLaunchConfig, ITerminalBackend, ITerminalBackendRegistry, ITerminalLaunchError, ITerminalLogService, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, TerminalExitReason, TerminalExtensions, TerminalLocation, TerminalLocationString, TitleEventSource } from '../../../../platform/terminal/common/terminal.js'; + import { formatMessageForTerminal } from '../../../../platform/terminal/common/terminalStrings.js'; + import { iconForeground } from '../../../../platform/theme/common/colorRegistry.js'; + import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js'; +@@ -57,6 +57,7 @@ import { ITerminalCapabilityImplMap, TerminalCapability } from '../../../../plat + import { createInstanceCapabilityEventMultiplexer } from './terminalEvents.js'; + import { mainWindow } from '../../../../base/browser/window.js'; + import { GroupIdentifier } from '../../../common/editor.js'; ++import { Registry } from '../../../../platform/registry/common/platform.js'; + + export class TerminalService extends Disposable implements ITerminalService { + declare _serviceBrand: undefined; @@ -216,7 +217,14 @@ export class TerminalService extends Disposable implements ITerminalService { this._handleInstanceContextKeys(); this._terminalShellTypeContextKey = TerminalContextKeys.shellType.bindTo(this._contextKeyService); diff --git a/vscode-paches/0032-fix-use-asBrowserUri-to-get-iframe-src.patch b/vscode-paches/0031-fix-use-asBrowserUri-to-get-iframe-src.patch similarity index 97% rename from vscode-paches/0032-fix-use-asBrowserUri-to-get-iframe-src.patch rename to vscode-paches/0031-fix-use-asBrowserUri-to-get-iframe-src.patch index 959f4967..f7dd1934 100644 --- a/vscode-paches/0032-fix-use-asBrowserUri-to-get-iframe-src.patch +++ b/vscode-paches/0031-fix-use-asBrowserUri-to-get-iframe-src.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: use asBrowserUri to get iframe src 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 6bc4e3293c6..b7a9e51144f 100644 +index 44b1733ff0e..2edd01a5bb4 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -448,7 +448,8 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD diff --git a/vscode-paches/0033-feat-add-some-parameter-to-webview-iframes.patch b/vscode-paches/0032-feat-add-some-parameter-to-webview-iframes.patch similarity index 65% rename from vscode-paches/0033-feat-add-some-parameter-to-webview-iframes.patch rename to vscode-paches/0032-feat-add-some-parameter-to-webview-iframes.patch index 61d6e35b..e2c9c7cc 100644 --- a/vscode-paches/0033-feat-add-some-parameter-to-webview-iframes.patch +++ b/vscode-paches/0032-feat-add-some-parameter-to-webview-iframes.patch @@ -8,18 +8,18 @@ Subject: [PATCH] feat: add some parameter to webview iframes 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index b7a9e51144f..be42aaaeff3 100644 +index 2edd01a5bb4..f24f65239fc 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -@@ -11,7 +11,7 @@ import { streamToBuffer, VSBufferReadableStream } from 'vs/base/common/buffer'; - import { CancellationTokenSource } from 'vs/base/common/cancellation'; - import { Emitter, Event } from 'vs/base/common/event'; - import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; --import { COI } from 'vs/base/common/network'; -+import { COI, FileAccess } from 'vs/base/common/network'; - import { URI } from 'vs/base/common/uri'; - import { generateUuid } from 'vs/base/common/uuid'; - import { localize } from 'vs/nls'; +@@ -11,7 +11,7 @@ import { streamToBuffer, VSBufferReadableStream } from '../../../../base/common/ + import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; + import { Emitter, Event } from '../../../../base/common/event.js'; + import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js'; +-import { COI } from '../../../../base/common/network.js'; ++import { COI, FileAccess } from '../../../../base/common/network.js'; + import { URI } from '../../../../base/common/uri.js'; + import { generateUuid } from '../../../../base/common/uuid.js'; + import { localize } from '../../../../nls.js'; @@ -441,6 +441,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD params.purpose = options.purpose; } diff --git a/vscode-paches/0034-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch b/vscode-paches/0033-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch similarity index 95% rename from vscode-paches/0034-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch rename to vscode-paches/0033-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch index 8f6f6bed..9cf3c23a 100644 --- a/vscode-paches/0034-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch +++ b/vscode-paches/0033-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: only detect fullscreen if it's not a guess 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts -index 253828dfd74..3559cd01d99 100644 +index 88d7b0db4c2..7499230f9ed 100644 --- a/src/vs/workbench/services/host/browser/browserHostService.ts +++ b/src/vs/workbench/services/host/browser/browserHostService.ts -@@ -215,13 +215,18 @@ export class BrowserHostService extends Disposable implements IHostService { +@@ -213,13 +213,18 @@ export class BrowserHostService extends Disposable implements IHostService { const windowId = getWindowId(window); const viewport = isIOS && window.visualViewport ? window.visualViewport /** Visual viewport */ : window /** Layout viewport */; diff --git a/vscode-paches/0035-fix-only-use-open-model.patch b/vscode-paches/0034-fix-only-use-open-model.patch similarity index 90% rename from vscode-paches/0035-fix-only-use-open-model.patch rename to vscode-paches/0034-fix-only-use-open-model.patch index d1547cef..c867fee0 100644 --- a/vscode-paches/0035-fix-only-use-open-model.patch +++ b/vscode-paches/0034-fix-only-use-open-model.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: only use open model 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts -index 8067c690fa3..b5cd1fbd527 100644 +index f9e86fbd6b3..e949ee95479 100644 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts +++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts @@ -3,15 +3,12 @@ @@ -16,12 +16,12 @@ index 8067c690fa3..b5cd1fbd527 100644 *--------------------------------------------------------------------------------------------*/ -import type { ModelOperations, ModelResult } from '@vscode/vscode-languagedetection'; --import { importAMDNodeModule } from 'vs/amdX'; +-import { importAMDNodeModule } from '../../../../amdX.js'; +import { ModelOperations, ModelResult } from '@vscode/vscode-languagedetection'; - import { StopWatch } from 'vs/base/common/stopwatch'; - import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker'; - import { LanguageDetectionWorkerHost, ILanguageDetectionWorker } from 'vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol'; - import { WorkerTextModelSyncServer } from 'vs/editor/common/services/textModelSync/textModelSync.impl'; + import { StopWatch } from '../../../../base/common/stopwatch.js'; + import { IRequestHandler, IWorkerServer } from '../../../../base/common/worker/simpleWorker.js'; + import { LanguageDetectionWorkerHost, ILanguageDetectionWorker } from './languageDetectionWorker.protocol.js'; + import { WorkerTextModelSyncServer } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js'; -type RegexpModel = { detect: (inp: string, langBiases: Record, supportedLangs?: string[]) => string | undefined }; - diff --git a/vscode-paches/0036-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch b/vscode-paches/0035-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch similarity index 69% rename from vscode-paches/0036-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch rename to vscode-paches/0035-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch index 556ed3a5..c55d11bc 100644 --- a/vscode-paches/0036-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch +++ b/vscode-paches/0035-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch @@ -8,14 +8,14 @@ Subject: [PATCH] fix: replace CJS require by FileAccess.toModuleContent 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts -index 9cc4cdf407c..7fbc00d48a7 100644 +index a2e56672926..89372f739df 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts -@@ -18,6 +18,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati - import { ILanguageService } from 'vs/editor/common/languages/language'; - import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; - import { gettingStartedContentRegistry } from 'vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent'; -+import { AppResourcePath, FileAccess } from 'vs/base/common/network'; +@@ -18,6 +18,7 @@ import { INotificationService } from '../../../../platform/notification/common/n + import { ILanguageService } from '../../../../editor/common/languages/language.js'; + import { IExtensionService } from '../../../services/extensions/common/extensions.js'; + import { gettingStartedContentRegistry } from '../common/gettingStartedContent.js'; ++import { AppResourcePath, FileAccess } from '../../../../base/common/network.js'; export class GettingStartedDetailsRenderer { diff --git a/vscode-paches/0037-fix-allow-adding-a-local-folder-even-when-there-is-a.patch b/vscode-paches/0036-fix-allow-adding-a-local-folder-even-when-there-is-a.patch similarity index 72% rename from vscode-paches/0037-fix-allow-adding-a-local-folder-even-when-there-is-a.patch rename to vscode-paches/0036-fix-allow-adding-a-local-folder-even-when-there-is-a.patch index 494d3d63..d1abeaca 100644 --- a/vscode-paches/0037-fix-allow-adding-a-local-folder-even-when-there-is-a.patch +++ b/vscode-paches/0036-fix-allow-adding-a-local-folder-even-when-there-is-a.patch @@ -9,18 +9,18 @@ Subject: [PATCH] fix: allow adding a local folder even when there is a remote 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts -index a3be20f5277..2261767327a 100644 +index 25fd78863cb..adc23e4e539 100644 --- a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts @@ -14,7 +14,7 @@ import { ConfigurationScope, IConfigurationRegistry, Extensions as Configuration - import { Registry } from 'vs/platform/registry/common/platform'; - import { ICommandService } from 'vs/platform/commands/common/commands'; - import { distinct, firstOrDefault } from 'vs/base/common/arrays'; --import { basename, isEqual, isEqualAuthority, joinPath, removeTrailingPathSeparator } from 'vs/base/common/resources'; -+import { basename, isEqual, joinPath, removeTrailingPathSeparator } from 'vs/base/common/resources'; - import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; - import { IFileService } from 'vs/platform/files/common/files'; - import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; + import { Registry } from '../../../../platform/registry/common/platform.js'; + import { ICommandService } from '../../../../platform/commands/common/commands.js'; + import { distinct } from '../../../../base/common/arrays.js'; +-import { basename, isEqual, isEqualAuthority, joinPath, removeTrailingPathSeparator } from '../../../../base/common/resources.js'; ++import { basename, isEqual, joinPath, removeTrailingPathSeparator } from '../../../../base/common/resources.js'; + import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js'; + import { IFileService } from '../../../../platform/files/common/files.js'; + import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js'; @@ -172,11 +172,6 @@ export abstract class AbstractWorkspaceEditingService extends Disposable impleme private async doAddFolders(foldersToAdd: IWorkspaceFolderCreationData[], index?: number, donotNotifyError: boolean = false): Promise { diff --git a/vscode-paches/0038-feat-allow-to-switch-storage-service-workspace.patch b/vscode-paches/0037-feat-allow-to-switch-storage-service-workspace.patch similarity index 98% rename from vscode-paches/0038-feat-allow-to-switch-storage-service-workspace.patch rename to vscode-paches/0037-feat-allow-to-switch-storage-service-workspace.patch index 6a7e0a91..2ea089f6 100644 --- a/vscode-paches/0038-feat-allow-to-switch-storage-service-workspace.patch +++ b/vscode-paches/0037-feat-allow-to-switch-storage-service-workspace.patch @@ -8,7 +8,7 @@ Subject: [PATCH] feat: allow to switch storage service workspace 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/services/storage/browser/storageService.ts b/src/vs/workbench/services/storage/browser/storageService.ts -index a77c2db9446..2b9a8c19926 100644 +index 68573404c1e..0473b91da5e 100644 --- a/src/vs/workbench/services/storage/browser/storageService.ts +++ b/src/vs/workbench/services/storage/browser/storageService.ts @@ -34,6 +34,7 @@ export class BrowserStorageService extends AbstractStorageService { diff --git a/vscode-paches/0038-cleanup-remove-code-that-we-will-run-ourselves.patch b/vscode-paches/0038-cleanup-remove-code-that-we-will-run-ourselves.patch new file mode 100644 index 00000000..3f5960c3 --- /dev/null +++ b/vscode-paches/0038-cleanup-remove-code-that-we-will-run-ourselves.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Mon, 11 Mar 2024 18:26:35 +0100 +Subject: [PATCH] cleanup: remove code that we will run ourselves + +--- + src/vs/workbench/browser/workbench.ts | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts +index 46172e06143..317aa021d22 100644 +--- a/src/vs/workbench/browser/workbench.ts ++++ b/src/vs/workbench/browser/workbench.ts +@@ -11,10 +11,7 @@ import { RunOnceScheduler, timeout } from '../../base/common/async.js'; + import { isFirefox, isSafari, isChrome } from '../../base/browser/browser.js'; + import { mark } from '../../base/common/performance.js'; + import { onUnexpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js'; +-import { Registry } from '../../platform/registry/common/platform.js'; + import { isWindows, isLinux, isWeb, isNative, isMacintosh } from '../../base/common/platform.js'; +-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../common/contributions.js'; +-import { IEditorFactoryRegistry, EditorExtensions } from '../common/editor.js'; + import { getSingletonServiceDescriptors } from '../../platform/instantiation/common/extensions.js'; + import { Position, Parts, IWorkbenchLayoutService, positionToString } from '../services/layout/browser/layoutService.js'; + import { IStorageService, WillSaveStateReason, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js'; +@@ -35,7 +32,6 @@ import { FontMeasurements } from '../../editor/browser/config/fontMeasurements.j + import { BareFontInfo } from '../../editor/common/config/fontInfo.js'; + import { ILogService } from '../../platform/log/common/log.js'; + import { toErrorMessage } from '../../base/common/errorMessage.js'; +-import { WorkbenchContextKeysHandler } from './contextkeys.js'; + import { coalesce } from '../../base/common/arrays.js'; + import { InstantiationService } from '../../platform/instantiation/common/instantiationService.js'; + import { Layout } from './layout.js'; +@@ -43,9 +39,6 @@ import { IHostService } from '../services/host/browser/host.js'; + import { IDialogService } from '../../platform/dialogs/common/dialogs.js'; + import { mainWindow } from '../../base/browser/window.js'; + import { PixelRatio } from '../../base/browser/pixelRatio.js'; +-import { IHoverService, WorkbenchHoverDelegate } from '../../platform/hover/browser/hover.js'; +-import { setHoverDelegateFactory } from '../../base/browser/ui/hover/hoverDelegateFactory.js'; +-import { setBaseLayerHoverDelegate } from '../../base/browser/ui/hover/hoverDelegate2.js'; + import { AccessibilityProgressSignalScheduler } from '../../platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.js'; + import { setProgressAcccessibilitySignalScheduler } from '../../base/browser/ui/progressbar/progressAccessibilitySignal.js'; + import { AccessibleViewRegistry } from '../../platform/accessibility/browser/accessibleViewRegistry.js'; +@@ -158,25 +151,12 @@ export class Workbench extends Layout { + const storageService = accessor.get(IStorageService); + const configurationService = accessor.get(IConfigurationService); + const hostService = accessor.get(IHostService); +- const hoverService = accessor.get(IHoverService); + const dialogService = accessor.get(IDialogService); + const notificationService = accessor.get(INotificationService) as NotificationService; + +- // Default Hover Delegate must be registered before creating any workbench/layout components +- // as these possibly will use the default hover delegate +- setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {})); +- setBaseLayerHoverDelegate(hoverService); +- + // Layout + this.initLayout(accessor); + +- // Registries +- Registry.as(WorkbenchExtensions.Workbench).start(accessor); +- Registry.as(EditorExtensions.EditorFactory).start(accessor); +- +- // Context Keys +- this._register(instantiationService.createInstance(WorkbenchContextKeysHandler)); +- + // Register Listeners + this.registerListeners(lifecycleService, storageService, configurationService, hostService, dialogService); + diff --git a/vscode-paches/0039-cleanup-remove-code-that-we-will-run-ourselves.patch b/vscode-paches/0039-cleanup-remove-code-that-we-will-run-ourselves.patch deleted file mode 100644 index 6e0c78a3..00000000 --- a/vscode-paches/0039-cleanup-remove-code-that-we-will-run-ourselves.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Mon, 11 Mar 2024 18:26:35 +0100 -Subject: [PATCH] cleanup: remove code that we will run ourselves - ---- - src/vs/workbench/browser/workbench.ts | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index 5211f730099..c7ff3b53fab 100644 ---- a/src/vs/workbench/browser/workbench.ts -+++ b/src/vs/workbench/browser/workbench.ts -@@ -11,10 +11,7 @@ import { RunOnceScheduler, timeout } from 'vs/base/common/async'; - import { isFirefox, isSafari, isChrome } from 'vs/base/browser/browser'; - import { mark } from 'vs/base/common/performance'; - import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors'; --import { Registry } from 'vs/platform/registry/common/platform'; - import { isWindows, isLinux, isWeb, isNative, isMacintosh } from 'vs/base/common/platform'; --import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; --import { IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor'; - import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions'; - import { Position, Parts, IWorkbenchLayoutService, positionToString } from 'vs/workbench/services/layout/browser/layoutService'; - import { IStorageService, WillSaveStateReason, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; -@@ -35,7 +32,6 @@ import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements'; - import { BareFontInfo } from 'vs/editor/common/config/fontInfo'; - import { ILogService } from 'vs/platform/log/common/log'; - import { toErrorMessage } from 'vs/base/common/errorMessage'; --import { WorkbenchContextKeysHandler } from 'vs/workbench/browser/contextkeys'; - import { coalesce } from 'vs/base/common/arrays'; - import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; - import { Layout } from 'vs/workbench/browser/layout'; -@@ -43,9 +39,6 @@ import { IHostService } from 'vs/workbench/services/host/browser/host'; - import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; - import { mainWindow } from 'vs/base/browser/window'; - import { PixelRatio } from 'vs/base/browser/pixelRatio'; --import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover'; --import { setHoverDelegateFactory } from 'vs/base/browser/ui/hover/hoverDelegateFactory'; --import { setBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2'; - import { AccessibilityProgressSignalScheduler } from 'vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler'; - import { setProgressAcccessibilitySignalScheduler } from 'vs/base/browser/ui/progressbar/progressAccessibilitySignal'; - import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry'; -@@ -158,25 +151,12 @@ export class Workbench extends Layout { - const storageService = accessor.get(IStorageService); - const configurationService = accessor.get(IConfigurationService); - const hostService = accessor.get(IHostService); -- const hoverService = accessor.get(IHoverService); - const dialogService = accessor.get(IDialogService); - const notificationService = accessor.get(INotificationService) as NotificationService; - -- // Default Hover Delegate must be registered before creating any workbench/layout components -- // as these possibly will use the default hover delegate -- setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {})); -- setBaseLayerHoverDelegate(hoverService); -- - // Layout - this.initLayout(accessor); - -- // Registries -- Registry.as(WorkbenchExtensions.Workbench).start(accessor); -- Registry.as(EditorExtensions.EditorFactory).start(accessor); -- -- // Context Keys -- this._register(instantiationService.createInstance(WorkbenchContextKeysHandler)); -- - // Register Listeners - this.registerListeners(lifecycleService, storageService, configurationService, hostService, dialogService); - diff --git a/vscode-paches/0040-fix-typescript-use-import-function-able-to-replace-i.patch b/vscode-paches/0039-fix-typescript-use-import-function-able-to-replace-i.patch similarity index 100% rename from vscode-paches/0040-fix-typescript-use-import-function-able-to-replace-i.patch rename to vscode-paches/0039-fix-typescript-use-import-function-able-to-replace-i.patch diff --git a/vscode-paches/0041-feat-add-a-way-to-detect-if-localization-were-alread.patch b/vscode-paches/0040-feat-add-a-way-to-detect-if-localization-were-alread.patch similarity index 96% rename from vscode-paches/0041-feat-add-a-way-to-detect-if-localization-were-alread.patch rename to vscode-paches/0040-feat-add-a-way-to-detect-if-localization-were-alread.patch index 6775f631..1e11f5f8 100644 --- a/vscode-paches/0041-feat-add-a-way-to-detect-if-localization-were-alread.patch +++ b/vscode-paches/0040-feat-add-a-way-to-detect-if-localization-were-alread.patch @@ -8,7 +8,7 @@ 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 2e914738989..78ced4fe478 100644 +index e730d0a761e..0c14d36a40e 100644 --- a/src/vs/nls.ts +++ b/src/vs/nls.ts @@ -47,6 +47,12 @@ function _format(message: string, args: (string | number | boolean | undefined | diff --git a/vscode-paches/0042-fix-move-action-from-service-file-to-contribution.patch b/vscode-paches/0041-fix-move-action-from-service-file-to-contribution.patch similarity index 76% rename from vscode-paches/0042-fix-move-action-from-service-file-to-contribution.patch rename to vscode-paches/0041-fix-move-action-from-service-file-to-contribution.patch index 7d0d0dbc..2d5829c8 100644 --- a/vscode-paches/0042-fix-move-action-from-service-file-to-contribution.patch +++ b/vscode-paches/0041-fix-move-action-from-service-file-to-contribution.patch @@ -11,16 +11,16 @@ 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 f44d95e6694..ba7b881c0bb 100644 +index e5b58995fd2..8ef9e2becc0 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 { StartupPageEditorResolverContribution, StartupPageRunnerContribution } - import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput'; - import { Categories } from 'vs/platform/action/common/actionCommonCategories'; - import { DisposableStore } from 'vs/base/common/lifecycle'; -+import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService._contribution'; +@@ -33,6 +33,7 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg + import { DisposableStore } from '../../../../base/common/lifecycle.js'; + import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js'; + import { GettingStartedAccessibleView } from './gettingStartedAccessibleView.js'; ++import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService._contribution.js'; - export * as icons from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons'; + export * as icons from './gettingStartedIcons.js'; diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService._contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService._contribution.ts new file mode 100644 @@ -84,31 +84,31 @@ index 00000000000..3fc81fe28fc + } +}); diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts -index 28b50d2e885..8ca55d9f564 100644 +index 310fd38c68f..0d7b7a10e1c 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -3,11 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; - import { Emitter, Event } from 'vs/base/common/event'; - import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; - import { Memento } from 'vs/workbench/common/memento'; --import { Action2, registerAction2 } from 'vs/platform/actions/common/actions'; - import { ICommandService } from 'vs/platform/commands/common/commands'; - import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; - import { Disposable } from 'vs/base/common/lifecycle'; -@@ -28,7 +27,7 @@ import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/ - import { dirname } from 'vs/base/common/path'; - import { coalesce } from 'vs/base/common/arrays'; - import { IViewsService } from 'vs/workbench/services/views/common/viewsService'; --import { localize, localize2 } from 'vs/nls'; -+import { localize } from 'vs/nls'; - import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; - import { checkGlobFileExists } from 'vs/workbench/services/extensions/common/workspaceContains'; - import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; +-import { createDecorator, IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; ++import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; + import { Emitter, Event } from '../../../../base/common/event.js'; + import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; + import { Memento } from '../../../common/memento.js'; +-import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js'; + import { ICommandService } from '../../../../platform/commands/common/commands.js'; + import { ContextKeyExpr, ContextKeyExpression, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js'; + import { Disposable } from '../../../../base/common/lifecycle.js'; +@@ -28,7 +27,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta + import { dirname } from '../../../../base/common/path.js'; + import { coalesce } from '../../../../base/common/arrays.js'; + import { IViewsService } from '../../../services/views/common/viewsService.js'; +-import { localize, localize2 } from '../../../../nls.js'; ++import { localize } from '../../../../nls.js'; + import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; + import { checkGlobFileExists } from '../../../services/extensions/common/workspaceContains.js'; + import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; @@ -668,48 +667,4 @@ const convertInternalMediaPathsToBrowserURIs = (path: string | { hc: string; hcL } }; diff --git a/vscode-paches/0043-refactor-split-workbench-contribution.patch b/vscode-paches/0042-refactor-split-workbench-contribution.patch similarity index 61% rename from vscode-paches/0043-refactor-split-workbench-contribution.patch rename to vscode-paches/0042-refactor-split-workbench-contribution.patch index 9edc3189..4d16a13a 100644 --- a/vscode-paches/0043-refactor-split-workbench-contribution.patch +++ b/vscode-paches/0042-refactor-split-workbench-contribution.patch @@ -11,35 +11,35 @@ Subject: [PATCH] refactor: split workbench contribution .../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(+), 31 deletions(-) + src/vs/workbench/workbench.common.main.ts | 12 ++++++-- + 8 files changed, 96 insertions(+), 34 deletions(-) diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts -index 1d563ea1dce..2d9cfed9595 100644 +index 2764905f82f..342930c504d 100644 --- a/src/vs/workbench/api/browser/extensionHost.contribution.ts +++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts @@ -3,17 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; --import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js'; +-import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; - -// --- other interested parties --import { JSONValidationExtensionPoint } from 'vs/workbench/api/common/jsonValidationExtensionPoint'; --import { ColorExtensionPoint } from 'vs/workbench/services/themes/common/colorExtensionPoint'; --import { IconExtensionPoint } from 'vs/workbench/services/themes/common/iconExtensionPoint'; --import { TokenClassificationExtensionPoints } from 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint'; --import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint'; --import { StatusBarItemsExtensionPoint } from 'vs/workbench/api/browser/statusBarExtensionPoint'; +-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'; - // --- mainThread participants - import './mainThreadLocalization'; - import './mainThreadBulkEdits'; -@@ -88,22 +77,3 @@ import './mainThreadShare'; - import './mainThreadProfileContentHandlers'; - import './mainThreadAiRelatedInformation'; - import './mainThreadAiEmbeddingVector'; + import './mainThreadLocalization.js'; + import './mainThreadBulkEdits.js'; +@@ -89,22 +78,3 @@ import './mainThreadShare.js'; + import './mainThreadProfileContentHandlers.js'; + import './mainThreadAiRelatedInformation.js'; + import './mainThreadAiEmbeddingVector.js'; - -export class ExtensionPoints implements IWorkbenchContribution { - @@ -60,23 +60,23 @@ index 1d563ea1dce..2d9cfed9595 100644 - -registerWorkbenchContribution2(ExtensionPoints.ID, ExtensionPoints, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts -index b692381eaa2..9420ceebbf6 100644 +index 022b7ff6e54..9e5c057b1fe 100644 --- a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts +++ b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts @@ -6,7 +6,7 @@ - import { IJSONSchema } from 'vs/base/common/jsonSchema'; - import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; - import { localize } from 'vs/nls'; --import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -+import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation'; - import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions'; - import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; - import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from 'vs/workbench/services/statusbar/browser/statusbar'; -@@ -22,6 +22,7 @@ import { Iterable } from 'vs/base/common/iterator'; - import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; - import { asStatusBarItemIdentifier } from 'vs/workbench/api/common/extHostTypes'; - import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from 'vs/workbench/common/theme'; -+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; + import { IJSONSchema } from '../../../base/common/jsonSchema.js'; + import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js'; + import { localize } from '../../../nls.js'; +-import { createDecorator } from '../../../platform/instantiation/common/instantiation.js'; ++import { createDecorator, IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; + import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js'; + import { ExtensionsRegistry } from '../../services/extensions/common/extensionsRegistry.js'; + import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from '../../services/statusbar/browser/statusbar.js'; +@@ -22,6 +22,7 @@ import { Iterable } from '../../../base/common/iterator.js'; + import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js'; + import { asStatusBarItemIdentifier } from '../common/extHostTypes.js'; + import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from '../../common/theme.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2 } from '../../common/contributions.js'; // --- service @@ -98,15 +98,15 @@ index b692381eaa2..9420ceebbf6 100644 + +registerWorkbenchContribution2(StatusBarItemsExtensionPointWorkbenchContribution.ID, StatusBarItemsExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts b/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts -index 1b82d305f19..aae5859f0b4 100644 +index 24559bee3f8..574f4f8cb44 100644 --- a/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts +++ b/src/vs/workbench/api/common/jsonValidationExtensionPoint.ts -@@ -13,6 +13,8 @@ import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; - import { Registry } from 'vs/platform/registry/common/platform'; - import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; - import { MarkdownString } from 'vs/base/common/htmlContent'; -+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; -+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +@@ -13,6 +13,8 @@ import { IExtensionManifest } from '../../../platform/extensions/common/extensio + import { Registry } from '../../../platform/registry/common/platform.js'; + import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js'; + import { MarkdownString } from '../../../base/common/htmlContent.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../common/contributions.js'; ++import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; interface IJSONValidationExtensionPoint { fileMatch: string | string[]; @@ -128,15 +128,15 @@ index 1b82d305f19..aae5859f0b4 100644 + +registerWorkbenchContribution2(JSONValidationExtensionPointWorkbenchContribution.ID, JSONValidationExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts b/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts -index e3d1fcd1064..4b2c9641e2a 100644 +index 80aa77d2019..9af7e9a1e4a 100644 --- a/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts +++ b/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts -@@ -18,6 +18,8 @@ import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages'; - import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader'; - import { hash } from 'vs/base/common/hash'; - import { Disposable } from 'vs/base/common/lifecycle'; -+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; -+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +@@ -18,6 +18,8 @@ import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages. + import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js'; + import { hash } from '../../../../base/common/hash.js'; + import { Disposable } from '../../../../base/common/lifecycle.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; ++import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; interface IRegExp { pattern: string; @@ -158,15 +158,15 @@ index e3d1fcd1064..4b2c9641e2a 100644 + +registerWorkbenchContribution2(LanguageConfigurationWorkbenchContribution.ID, LanguageConfigurationWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts -index 235e0ed2948..1e7165b62f6 100644 +index b392cc8614f..bc4df0624f8 100644 --- a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts +++ b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts @@ -13,6 +13,8 @@ import { Extensions, IExtensionFeatureTableRenderer, IExtensionFeaturesRegistry, - import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; - import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; - import { MarkdownString } from 'vs/base/common/htmlContent'; -+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; + import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js'; + import { IExtensionManifest } from '../../../../platform/extensions/common/extensions.js'; + import { MarkdownString } from '../../../../base/common/htmlContent.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; ++import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; interface IColorExtensionPoint { id: string; @@ -188,15 +188,15 @@ index 235e0ed2948..1e7165b62f6 100644 + +registerWorkbenchContribution2(ColorExtensionPointWorkbenchContribution.ID, ColorExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts -index 23becff8428..6bfef797984 100644 +index 29588b66234..798300c0efd 100644 --- a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts +++ b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts -@@ -11,6 +11,8 @@ import { ThemeIcon } from 'vs/base/common/themables'; - import * as resources from 'vs/base/common/resources'; - import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; - import { extname, posix } from 'vs/base/common/path'; -+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; +@@ -11,6 +11,8 @@ import { ThemeIcon } from '../../../../base/common/themables.js'; + import * as resources from '../../../../base/common/resources.js'; + import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js'; + import { extname, posix } from '../../../../base/common/path.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; ++import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; interface IIconExtensionPoint { [id: string]: { @@ -218,15 +218,15 @@ index 23becff8428..6bfef797984 100644 + +registerWorkbenchContribution2(ColorExtensionPointWorkbenchContribution.ID, ColorExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts -index 49abd845677..33357dc7a36 100644 +index d78e65afc3f..56bd057fb3e 100644 --- a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts +++ b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts @@ -6,6 +6,8 @@ - import * as nls from 'vs/nls'; - import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry'; - import { getTokenClassificationRegistry, ITokenClassificationRegistry, typeAndModifierIdPattern } from 'vs/platform/theme/common/tokenClassificationRegistry'; -+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; + import * as nls from '../../../../nls.js'; + import { ExtensionsRegistry, ExtensionMessageCollector } from '../../extensions/common/extensionsRegistry.js'; + import { getTokenClassificationRegistry, ITokenClassificationRegistry, typeAndModifierIdPattern } from '../../../../platform/theme/common/tokenClassificationRegistry.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js'; ++import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; interface ITokenTypeExtensionPoint { id: string; @@ -247,19 +247,25 @@ index 49abd845677..33357dc7a36 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 9e01f17536a..502d97c34d4 100644 +index 285fea2c50e..490e6ebae78 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts -@@ -35,6 +35,12 @@ import 'vs/workbench/browser/actions/widgetNavigationCommands'; - import 'vs/workbench/services/actions/common/menusExtensionPoint'; - import 'vs/workbench/api/common/configurationExtensionPoint'; - import 'vs/workbench/api/browser/viewsExtensionPoint'; -+import 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint'; -+import 'vs/workbench/api/common/jsonValidationExtensionPoint'; -+import 'vs/workbench/services/themes/common/colorExtensionPoint'; -+import 'vs/workbench/services/themes/common/iconExtensionPoint'; -+import 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint'; -+import 'vs/workbench/api/browser/statusBarExtensionPoint'; +@@ -32,9 +32,15 @@ import './browser/actions/widgetNavigationCommands.js'; + + //#region --- API Extension Points + +-import './services/actions/common/menusExtensionPoint.js'; +-import './api/common/configurationExtensionPoint.js'; +-import './api/browser/viewsExtensionPoint.js'; ++import 'vs/workbench/services/actions/common/menusExtensionPoint.js'; ++import 'vs/workbench/api/common/configurationExtensionPoint.js'; ++import 'vs/workbench/api/browser/viewsExtensionPoint.js'; ++import 'vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.js'; ++import 'vs/workbench/api/common/jsonValidationExtensionPoint.js'; ++import 'vs/workbench/services/themes/common/colorExtensionPoint.js'; ++import 'vs/workbench/services/themes/common/iconExtensionPoint.js'; ++import 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js'; ++import 'vs/workbench/api/browser/statusBarExtensionPoint.js'; //#endregion diff --git a/vscode-paches/0044-refactor-split-service-and-extension-point.patch b/vscode-paches/0043-refactor-split-service-and-extension-point.patch similarity index 77% rename from vscode-paches/0044-refactor-split-service-and-extension-point.patch rename to vscode-paches/0043-refactor-split-service-and-extension-point.patch index 376af549..563c6406 100644 --- a/vscode-paches/0044-refactor-split-service-and-extension-point.patch +++ b/vscode-paches/0043-refactor-split-service-and-extension-point.patch @@ -5,57 +5,58 @@ Subject: [PATCH] refactor: split service and extension point --- .../api/browser/mainThreadStatusBar.ts | 2 +- - .../api/browser/statusBarExtensionPoint.ts | 165 +----------------- - .../workbench/api/browser/statusBarService.ts | 160 +++++++++++++++++ - 3 files changed, 167 insertions(+), 160 deletions(-) + .../api/browser/statusBarExtensionPoint.ts | 160 +----------------- + .../workbench/api/browser/statusBarService.ts | 159 +++++++++++++++++ + 3 files changed, 164 insertions(+), 157 deletions(-) create mode 100644 src/vs/workbench/api/browser/statusBarService.ts diff --git a/src/vs/workbench/api/browser/mainThreadStatusBar.ts b/src/vs/workbench/api/browser/mainThreadStatusBar.ts -index 00eb17f4982..6c8e54d035d 100644 +index 4988e519f39..d57f2ada2ba 100644 --- a/src/vs/workbench/api/browser/mainThreadStatusBar.ts +++ b/src/vs/workbench/api/browser/mainThreadStatusBar.ts -@@ -10,7 +10,7 @@ import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle'; - import { Command } from 'vs/editor/common/languages'; - import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; - import { IMarkdownString } from 'vs/base/common/htmlContent'; --import { IExtensionStatusBarItemService, StatusBarUpdateKind } from 'vs/workbench/api/browser/statusBarExtensionPoint'; -+import { IExtensionStatusBarItemService, StatusBarUpdateKind } from 'vs/workbench/api/browser/statusBarService'; - import { IStatusbarEntry, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar'; +@@ -10,8 +10,8 @@ import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js + import { Command } from '../../../editor/common/languages.js'; + import { IAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js'; + import { IMarkdownString } from '../../../base/common/htmlContent.js'; +-import { IExtensionStatusBarItemService, StatusBarUpdateKind } from './statusBarExtensionPoint.js'; + import { IStatusbarEntry, StatusbarAlignment } from '../../services/statusbar/browser/statusbar.js'; ++import { IExtensionStatusBarItemService, StatusBarUpdateKind } from './statusBarService.js'; @extHostNamedCustomer(MainContext.MainThreadStatusBar) + export class MainThreadStatusBar implements MainThreadStatusBarShape { diff --git a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts -index 9420ceebbf6..17826e3fef7 100644 +index 9e5c057b1fe..695a7c69617 100644 --- a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts +++ b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts -@@ -3,171 +3,18 @@ - * Licensed under the MIT License. See License.txt in the project root for license information. +@@ -4,171 +4,19 @@ *--------------------------------------------------------------------------------------------*/ -+import { Iterable } from 'vs/base/common/iterator'; - import { IJSONSchema } from 'vs/base/common/jsonSchema'; --import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -+import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle'; - import { localize } from 'vs/nls'; --import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation'; --import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions'; --import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; --import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from 'vs/workbench/services/statusbar/browser/statusbar'; --import { ThemeColor } from 'vs/base/common/themables'; --import { Command } from 'vs/editor/common/languages'; - import { IAccessibilityInformation, isAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; --import { IMarkdownString } from 'vs/base/common/htmlContent'; --import { getCodiconAriaLabel } from 'vs/base/common/iconLabels'; --import { hash } from 'vs/base/common/hash'; --import { Event, Emitter } from 'vs/base/common/event'; --import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; --import { Iterable } from 'vs/base/common/iterator'; - import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; -+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; - import { asStatusBarItemIdentifier } from 'vs/workbench/api/common/extHostTypes'; --import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from 'vs/workbench/common/theme'; - import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions'; -- -- + import { IJSONSchema } from '../../../base/common/jsonSchema.js'; +-import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js'; ++import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js'; + import { localize } from '../../../nls.js'; +-import { createDecorator, IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; ++import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; + import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js'; + import { ExtensionsRegistry } from '../../services/extensions/common/extensionsRegistry.js'; +-import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from '../../services/statusbar/browser/statusbar.js'; +-import { ThemeColor } from '../../../base/common/themables.js'; +-import { Command } from '../../../editor/common/languages.js'; + import { IAccessibilityInformation, isAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js'; +-import { IMarkdownString } from '../../../base/common/htmlContent.js'; +-import { getCodiconAriaLabel } from '../../../base/common/iconLabels.js'; +-import { hash } from '../../../base/common/hash.js'; +-import { Event, Emitter } from '../../../base/common/event.js'; +-import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js'; + import { Iterable } from '../../../base/common/iterator.js'; + import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js'; + import { asStatusBarItemIdentifier } from '../common/extHostTypes.js'; +-import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from '../../common/theme.js'; +-import { IWorkbenchContribution, registerWorkbenchContribution2 } from '../../common/contributions.js'; ++import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../common/contributions.js'; ++import { IExtensionStatusBarItemService, StatusBarUpdateKind } from './statusBarService.js'; + + -// --- service - -export const IExtensionStatusBarItemService = createDecorator('IExtensionStatusBarItemService'); @@ -199,36 +200,33 @@ index 9420ceebbf6..17826e3fef7 100644 -registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, InstantiationType.Delayed); - -// --- extension point and reading of it -+import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions'; -+import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; -+import { IExtensionStatusBarItemService, StatusBarUpdateKind } from './statusBarService'; - +- interface IUserFriendlyStatusItemEntry { id: string; + name: string; diff --git a/src/vs/workbench/api/browser/statusBarService.ts b/src/vs/workbench/api/browser/statusBarService.ts new file mode 100644 -index 00000000000..eaaaa2b3cbe +index 00000000000..2dcf5005a86 --- /dev/null +++ b/src/vs/workbench/api/browser/statusBarService.ts -@@ -0,0 +1,160 @@ +@@ -0,0 +1,159 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + -+import { Emitter, Event } from 'vs/base/common/event'; -+import { hash } from 'vs/base/common/hash'; -+import { IMarkdownString } from 'vs/base/common/htmlContent'; -+import { getCodiconAriaLabel } from 'vs/base/common/iconLabels'; -+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -+import { ThemeColor } from 'vs/base/common/themables'; -+import { Command } from 'vs/editor/common/languages'; -+import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; -+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; -+import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -+import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from 'vs/workbench/common/theme'; -+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarEntryPriority, IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, StatusbarAlignment, StatusbarEntryKind } from 'vs/workbench/services/statusbar/browser/statusbar'; -+ ++import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js'; ++import { createDecorator } from '../../../platform/instantiation/common/instantiation.js'; ++import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry, StatusbarAlignment, IStatusbarEntryPriority, StatusbarEntryKind } from '../../services/statusbar/browser/statusbar.js'; ++import { ThemeColor } from '../../../base/common/themables.js'; ++import { Command } from '../../../editor/common/languages.js'; ++import { IAccessibilityInformation } from '../../../platform/accessibility/common/accessibility.js'; ++import { IMarkdownString } from '../../../base/common/htmlContent.js'; ++import { getCodiconAriaLabel } from '../../../base/common/iconLabels.js'; ++import { hash } from '../../../base/common/hash.js'; ++import { Event, Emitter } from '../../../base/common/event.js'; ++import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js'; ++import { STATUS_BAR_ERROR_ITEM_BACKGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND } from '../../common/theme.js'; + +// --- service + diff --git a/vscode-paches/0045-fix-weird-syntax.patch b/vscode-paches/0044-fix-weird-syntax.patch similarity index 64% rename from vscode-paches/0045-fix-weird-syntax.patch rename to vscode-paches/0044-fix-weird-syntax.patch index 980a0752..ee85e1dc 100644 --- a/vscode-paches/0045-fix-weird-syntax.patch +++ b/vscode-paches/0044-fix-weird-syntax.patch @@ -8,16 +8,16 @@ Subject: [PATCH] fix: weird syntax 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts -index 8506385b01c..3f6554ac9c0 100644 +index f573e788fb3..2245a1ef63b 100644 --- a/src/vs/platform/notification/common/notification.ts +++ b/src/vs/platform/notification/common/notification.ts @@ -6,10 +6,12 @@ - import { IAction } from 'vs/base/common/actions'; - import { Event } from 'vs/base/common/event'; - import { IDisposable } from 'vs/base/common/lifecycle'; --import BaseSeverity from 'vs/base/common/severity'; -+import Severity from 'vs/base/common/severity'; - import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; + import { IAction } from '../../../base/common/actions.js'; + import { Event } from '../../../base/common/event.js'; + import { IDisposable } from '../../../base/common/lifecycle.js'; +-import BaseSeverity from '../../../base/common/severity.js'; ++import Severity from '../../../base/common/severity.js'; + import { createDecorator } from '../../instantiation/common/instantiation.js'; -export import Severity = BaseSeverity; +export { diff --git a/vscode-paches/0045-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch b/vscode-paches/0045-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch new file mode 100644 index 00000000..2971e75c --- /dev/null +++ b/vscode-paches/0045-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch @@ -0,0 +1,104 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Thu, 25 Apr 2024 18:13:11 +0200 +Subject: [PATCH] fix: do not export stuff from web workbench or the typescript + language service is trying to import from it + +--- + .../browser/treeSitterTokenizationFeature.ts | 2 +- + .../workbench/workbench.web.main.internal.ts | 58 +------------------ + 2 files changed, 2 insertions(+), 58 deletions(-) + +diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts +index 9bd32453f1e..1aca8d0cec4 100644 +--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts ++++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts +@@ -29,7 +29,7 @@ export interface ITreeSitterTokenizationFeature { + _serviceBrand: undefined; + } + +-class TreeSitterTokenizationFeature extends Disposable implements ITreeSitterTokenizationFeature { ++export class TreeSitterTokenizationFeature extends Disposable implements ITreeSitterTokenizationFeature { + public _serviceBrand: undefined; + private readonly _tokenizersRegistrations: DisposableMap = new DisposableMap(); + +diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts +index 402696a4a83..e87a4db290c 100644 +--- a/src/vs/workbench/workbench.web.main.internal.ts ++++ b/src/vs/workbench/workbench.web.main.internal.ts +@@ -75,7 +75,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'; +@@ -175,66 +174,11 @@ import './contrib/remote/browser/remoteStartEntry.contribution.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 +-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 +- }; +- (globalThis as any).__VSCODE_WEB_ESM_PROMISE(exports); +- delete (globalThis as any).__VSCODE_WEB_ESM_PROMISE; +-} + + export { +- +- // Factory + create, +- +- // Basic Types +- URI, +- Event, +- Emitter, +- Disposable, +- GroupOrientation, +- LogLevel, +- RemoteAuthorityResolverError, +- RemoteAuthorityResolverErrorCode, +- +- // Facade API +- env, +- window, +- workspace, +- commands, +- logger, +- Menu + }; + + //#endregion diff --git a/vscode-paches/0047-fix-change-syntax-that-language-service-refactor-doe.patch b/vscode-paches/0046-fix-change-syntax-that-language-service-refactor-doe.patch similarity index 86% rename from vscode-paches/0047-fix-change-syntax-that-language-service-refactor-doe.patch rename to vscode-paches/0046-fix-change-syntax-that-language-service-refactor-doe.patch index 83f80d93..889417b4 100644 --- a/vscode-paches/0047-fix-change-syntax-that-language-service-refactor-doe.patch +++ b/vscode-paches/0046-fix-change-syntax-that-language-service-refactor-doe.patch @@ -10,12 +10,12 @@ the re-exports source are removed during "Move to new file" refactor 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts -index dab0931a4c1..c8f3a8f30fe 100644 +index 37cb20ffba3..cc2d2ffd6f0 100644 --- a/src/vs/workbench/contrib/tasks/common/taskService.ts +++ b/src/vs/workbench/contrib/tasks/common/taskService.ts -@@ -15,7 +15,9 @@ import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from 'vs/workbe - import { IStringDictionary } from 'vs/base/common/collections'; - import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; +@@ -15,7 +15,9 @@ import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from './taskSys + import { IStringDictionary } from '../../../../base/common/collections.js'; + import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js'; -export type { ITaskSummary, Task, ITaskTerminateResponse as TaskTerminateResponse }; +export type { ITaskSummary } from 'vs/workbench/contrib/tasks/common/taskSystem'; diff --git a/vscode-paches/0046-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch b/vscode-paches/0046-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch deleted file mode 100644 index 6983ba87..00000000 --- a/vscode-paches/0046-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Thu, 25 Apr 2024 18:13:11 +0200 -Subject: [PATCH] fix: do not export stuff from web workbench or the typescript - language service is trying to import from it - ---- - src/vs/workbench/workbench.web.main.ts | 28 ++------------------------ - 1 file changed, 2 insertions(+), 26 deletions(-) - -diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts -index e4a0a7e3e72..da0be08af02 100644 ---- a/src/vs/workbench/workbench.web.main.ts -+++ b/src/vs/workbench/workbench.web.main.ts -@@ -175,37 +175,13 @@ import 'vs/workbench/contrib/remote/browser/remoteStartEntry.contribution'; - // - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - --import { create, commands, env, window, workspace, logger } from 'vs/workbench/browser/web.factory'; --import { Menu } from 'vs/workbench/browser/web.api'; --import { URI } from 'vs/base/common/uri'; --import { Event, Emitter } from 'vs/base/common/event'; --import { Disposable } from 'vs/base/common/lifecycle'; --import { GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService'; -+import { create } from 'vs/workbench/browser/web.factory'; - import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider'; --import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver'; - - export { - - // Factory -- create, -- -- // Basic Types -- URI, -- Event, -- Emitter, -- Disposable, -- GroupOrientation, -- LogLevel, -- RemoteAuthorityResolverError, -- RemoteAuthorityResolverErrorCode, -- -- // Facade API -- env, -- window, -- workspace, -- commands, -- logger, -- Menu -+ create - }; - - //#endregion diff --git a/vscode-paches/0048-feat-add-build-tool-to-extract-service-identifiers.patch b/vscode-paches/0047-feat-add-build-tool-to-extract-service-identifiers.patch similarity index 100% rename from vscode-paches/0048-feat-add-build-tool-to-extract-service-identifiers.patch rename to vscode-paches/0047-feat-add-build-tool-to-extract-service-identifiers.patch diff --git a/vscode-paches/0049-fix-fix-editor-css.patch b/vscode-paches/0048-fix-fix-editor-css.patch similarity index 100% rename from vscode-paches/0049-fix-fix-editor-css.patch rename to vscode-paches/0048-fix-fix-editor-css.patch diff --git a/vscode-paches/0050-refactor-split-code-to-be-able-to-import-only-requir.patch b/vscode-paches/0049-refactor-split-code-to-be-able-to-import-only-requir.patch similarity index 91% rename from vscode-paches/0050-refactor-split-code-to-be-able-to-import-only-requir.patch rename to vscode-paches/0049-refactor-split-code-to-be-able-to-import-only-requir.patch index 70f7e05b..428364e7 100644 --- a/vscode-paches/0050-refactor-split-code-to-be-able-to-import-only-requir.patch +++ b/vscode-paches/0049-refactor-split-code-to-be-able-to-import-only-requir.patch @@ -4,13 +4,35 @@ Date: Mon, 29 Apr 2024 17:16:21 +0200 Subject: [PATCH] refactor: split code to be able to import only required part --- + .../treeSitter/treeSitterParserService.ts | 3 +- .../common/extensionsScannerService.ts | 294 +++++++++--------- src/vs/platform/files/common/fileService.ts | 111 ++++--- .../localization/browser/localeService.ts | 38 ++- - 3 files changed, 236 insertions(+), 207 deletions(-) + 4 files changed, 237 insertions(+), 209 deletions(-) +diff --git a/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts +index a7eed4bdd12..dcf01b1b28e 100644 +--- a/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts ++++ b/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts +@@ -15,7 +15,6 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet + import { ILogService } from '../../../../platform/log/common/log.js'; + import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; + import { setTimeout0 } from '../../../../base/common/platform.js'; +-import { importAMDNodeModule } from '../../../../amdX.js'; + import { Emitter, Event } from '../../../../base/common/event.js'; + import { CancellationToken, cancelOnDispose } from '../../../../base/common/cancellation.js'; + import { IEnvironmentService } from '../../../../platform/environment/common/environment.js'; +@@ -319,7 +318,7 @@ export class TreeSitterImporter { + private _treeSitterImport: typeof import('@vscode/tree-sitter-wasm') | undefined; + private async _getTreeSitterImport() { + if (!this._treeSitterImport) { +- this._treeSitterImport = await importAMDNodeModule('@vscode/tree-sitter-wasm', 'wasm/tree-sitter.js'); ++ this._treeSitterImport = await import('@vscode/tree-sitter-wasm'); + } + return this._treeSitterImport; + } diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts -index 7d4c51d21bb..20758125c70 100644 +index 8f238a84029..4b9d098aba5 100644 --- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts +++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts @@ -545,14 +545,160 @@ export class ExtensionScannerInput { @@ -338,12 +360,12 @@ index 7d4c51d21bb..20758125c70 100644 interface IExtensionCacheData { diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts -index b353968540e..55977ded402 100644 +index 2c0bfe1369c..e40cc7c20b0 100644 --- a/src/vs/platform/files/common/fileService.ts +++ b/src/vs/platform/files/common/fileService.ts -@@ -23,6 +23,64 @@ import { readFileIntoStream } from 'vs/platform/files/common/io'; - import { ILogService } from 'vs/platform/log/common/log'; - import { ErrorNoTelemetry } from 'vs/base/common/errors'; +@@ -23,6 +23,64 @@ import { readFileIntoStream } from './io.js'; + import { ILogService } from '../../log/common/log.js'; + import { ErrorNoTelemetry } from '../../../base/common/errors.js'; + +function resourceForError(resource: URI): string { @@ -475,10 +497,10 @@ index b353968540e..55977ded402 100644 //#endregion diff --git a/src/vs/workbench/services/localization/browser/localeService.ts b/src/vs/workbench/services/localization/browser/localeService.ts -index c77edccfe58..9d048b43b1f 100644 +index 63082ed6952..a107a2f8695 100644 --- a/src/vs/workbench/services/localization/browser/localeService.ts +++ b/src/vs/workbench/services/localization/browser/localeService.ts -@@ -74,8 +74,7 @@ const localeStorage = new class LocaleStorage { +@@ -51,8 +51,7 @@ const localeStorage = new class LocaleStorage { } }; @@ -488,7 +510,7 @@ index c77edccfe58..9d048b43b1f 100644 declare readonly _serviceBrand: undefined; constructor( -@@ -84,20 +83,15 @@ export class WebLocaleService implements ILocaleService { +@@ -61,20 +60,15 @@ export class WebLocaleService implements ILocaleService { @IProductService private readonly productService: IProductService ) { } @@ -513,7 +535,7 @@ index c77edccfe58..9d048b43b1f 100644 const restartDialog = await this.dialogService.confirm({ type: 'info', -@@ -112,8 +106,7 @@ export class WebLocaleService implements ILocaleService { +@@ -89,8 +83,7 @@ export class WebLocaleService implements ILocaleService { } async clearLocalePreference(): Promise { @@ -523,7 +545,7 @@ index c77edccfe58..9d048b43b1f 100644 if (Language.value() === navigator.language.toLowerCase()) { return; -@@ -132,6 +125,25 @@ export class WebLocaleService implements ILocaleService { +@@ -109,6 +102,25 @@ export class WebLocaleService implements ILocaleService { } } diff --git a/vscode-paches/0050-fix-rollback-typescript-as-the-last-version-breaks-t.patch b/vscode-paches/0050-fix-rollback-typescript-as-the-last-version-breaks-t.patch new file mode 100644 index 00000000..5d86cc91 --- /dev/null +++ b/vscode-paches/0050-fix-rollback-typescript-as-the-last-version-breaks-t.patch @@ -0,0 +1,63 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Fri, 2 Aug 2024 14:20:58 +0200 +Subject: [PATCH] fix: rollback typescript as the last version breaks the + extractServices script + +--- + package-lock.json | 8 ++++---- + package.json | 2 +- + src/vs/base/parts/request/browser/request.ts | 1 + + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/package-lock.json b/package-lock.json +index a849e69a098..88d0ca5061b 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -154,7 +154,7 @@ + "ts-node": "^10.9.1", + "tsec": "0.2.7", + "tslib": "^2.6.3", +- "typescript": "^5.7.0-dev.20240903", ++ "typescript": "5.5.0-dev.20240408", + "util": "^0.12.4", + "webpack": "^5.94.0", + "webpack-cli": "^5.1.4", +@@ -18579,9 +18579,9 @@ + "dev": true + }, + "node_modules/typescript": { +- "version": "5.7.0-dev.20240903", +- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.0-dev.20240903.tgz", +- "integrity": "sha512-XTUc5uVwBbLlT0v3FqTx9sDN1MLQnT5mwSC3JefCrcKT6Zv+rPcQE7HLKM9IsrNiM1tiaQvamJTgVH0S+UMH2A==", ++ "version": "5.5.0-dev.20240408", ++ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.0-dev.20240408.tgz", ++ "integrity": "sha512-WCqFA68PbE0+khOu6x2LPxePy0tKdWuNO2m2K4A/L+OPqua1Qmck9OXUQ/5nUd4B/8UlBuhkhuulQbr2LHO9vA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", +diff --git a/package.json b/package.json +index 51fb981850e..446627d4f3a 100644 +--- a/package.json ++++ b/package.json +@@ -216,7 +216,7 @@ + "ts-node": "^10.9.1", + "tsec": "0.2.7", + "tslib": "^2.6.3", +- "typescript": "^5.7.0-dev.20240903", ++ "typescript": "5.5.0-dev.20240408", + "util": "^0.12.4", + "webpack": "^5.94.0", + "webpack-cli": "^5.1.4", +diff --git a/src/vs/base/parts/request/browser/request.ts b/src/vs/base/parts/request/browser/request.ts +index fe0fa0e7838..2c46daa9b6d 100644 +--- a/src/vs/base/parts/request/browser/request.ts ++++ b/src/vs/base/parts/request/browser/request.ts +@@ -15,6 +15,7 @@ export async function request(options: IRequestOptions, token: CancellationToken + + const cancellation = new AbortController(); + const disposable = token.onCancellationRequested(() => cancellation.abort()); ++ // @ts-ignore AbortSignal exists in more recent versions of typescript + const signal = options.timeout ? AbortSignal.any([ + cancellation.signal, + AbortSignal.timeout(options.timeout), diff --git a/vscode-paches/0052-fix-just-use-regular-dynamic-import.patch b/vscode-paches/0051-fix-just-use-regular-dynamic-import.patch similarity index 75% rename from vscode-paches/0052-fix-just-use-regular-dynamic-import.patch rename to vscode-paches/0051-fix-just-use-regular-dynamic-import.patch index c21a38f0..2cae0ff0 100644 --- a/vscode-paches/0052-fix-just-use-regular-dynamic-import.patch +++ b/vscode-paches/0051-fix-just-use-regular-dynamic-import.patch @@ -8,18 +8,18 @@ Subject: [PATCH] fix: just use regular dynamic import 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -index 7f529f4a661..667e56edc89 100644 +index 28f6ea57c03..0ab2ac0cdc0 100644 --- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts +++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts @@ -5,8 +5,6 @@ - import * as nls from 'vs/nls'; - import { Emitter, Event } from 'vs/base/common/event'; --import { isESM } from 'vs/base/common/amd'; --import { AppResourcePath, FileAccess } from 'vs/base/common/network'; - import { Disposable } from 'vs/base/common/lifecycle'; - import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo'; - import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; + import * as nls from '../../../../nls.js'; + import { Emitter, Event } from '../../../../base/common/event.js'; +-import { isESM } from '../../../../base/common/amd.js'; +-import { AppResourcePath, FileAccess } from '../../../../base/common/network.js'; + import { Disposable } from '../../../../base/common/lifecycle.js'; + import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from '../common/keymapInfo.js'; + import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; @@ -457,10 +455,7 @@ export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBa const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux'; diff --git a/vscode-paches/0051-fix-rollback-typescript-as-the-last-version-breaks-t.patch b/vscode-paches/0051-fix-rollback-typescript-as-the-last-version-breaks-t.patch deleted file mode 100644 index e3a22e11..00000000 --- a/vscode-paches/0051-fix-rollback-typescript-as-the-last-version-breaks-t.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Fri, 2 Aug 2024 14:20:58 +0200 -Subject: [PATCH] fix: rollback typescript as the last version breaks the - extractServices script - ---- - package.json | 2 +- - src/vs/base/parts/request/browser/request.ts | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/package.json b/package.json -index 13fc4f4cabe..78c5bf13c55 100644 ---- a/package.json -+++ b/package.json -@@ -215,7 +215,7 @@ - "ts-node": "^10.9.1", - "tsec": "0.2.7", - "tslib": "^2.6.3", -- "typescript": "^5.7.0-dev.20240826", -+ "typescript": "5.5.0-dev.20240408", - "util": "^0.12.4", - "vscode-nls-dev": "^3.3.1", - "webpack": "^5.91.0", -diff --git a/src/vs/base/parts/request/browser/request.ts b/src/vs/base/parts/request/browser/request.ts -index 7e40f2d80f5..d7cef790158 100644 ---- a/src/vs/base/parts/request/browser/request.ts -+++ b/src/vs/base/parts/request/browser/request.ts -@@ -15,6 +15,7 @@ export async function request(options: IRequestOptions, token: CancellationToken - - const cancellation = new AbortController(); - const disposable = token.onCancellationRequested(() => cancellation.abort()); -+ // @ts-ignore AbortSignal exists in more recent versions of typescript - const signal = options.timeout ? AbortSignal.any([ - cancellation.signal, - AbortSignal.timeout(options.timeout), diff --git a/vscode-paches/0052-fix-fix-treeshaking-script.patch b/vscode-paches/0052-fix-fix-treeshaking-script.patch new file mode 100644 index 00000000..c0da3f63 --- /dev/null +++ b/vscode-paches/0052-fix-fix-treeshaking-script.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Sun, 6 Oct 2024 16:29:10 +0200 +Subject: [PATCH] fix: fix treeshaking script + +--- + build/lib/treeshaking.js | 1 + + build/lib/treeshaking.ts | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js +index af06f4e3ec5..323603d8bfa 100644 +--- a/build/lib/treeshaking.js ++++ b/build/lib/treeshaking.js +@@ -104,6 +104,7 @@ function discoverAndReadFiles(ts, options) { + if (options.redirects[moduleId]) { + redirectedModuleId = options.redirects[moduleId]; + } ++ redirectedModuleId = moduleId.replace(/.js$/, ''); + const dts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.d.ts'); + if (fs.existsSync(dts_filename)) { + const dts_filecontents = fs.readFileSync(dts_filename).toString(); +diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts +index cd17c5f0278..bbb9abf8169 100644 +--- a/build/lib/treeshaking.ts ++++ b/build/lib/treeshaking.ts +@@ -159,6 +159,7 @@ function discoverAndReadFiles(ts: typeof import('typescript'), options: ITreeSha + if (options.redirects[moduleId]) { + redirectedModuleId = options.redirects[moduleId]; + } ++ redirectedModuleId = moduleId.replace(/.js$/, ''); + + const dts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.d.ts'); + if (fs.existsSync(dts_filename)) { diff --git a/vscode-paches/0053-fix-fix-build.patch b/vscode-paches/0053-fix-fix-build.patch new file mode 100644 index 00000000..c044649b --- /dev/null +++ b/vscode-paches/0053-fix-fix-build.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Sun, 6 Oct 2024 16:58:18 +0200 +Subject: [PATCH] fix: fix build + +--- + src/vs/workbench/api/node/extHostExtensionService.ts | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts +index 51e767f1fdc..f96e3b57486 100644 +--- a/src/vs/workbench/api/node/extHostExtensionService.ts ++++ b/src/vs/workbench/api/node/extHostExtensionService.ts +@@ -46,7 +46,6 @@ class NodeModuleRequireInterceptor extends RequireInterceptor { + return originalLookup.call(this, applyAlternatives(request), parent); + }; + +- // ESM-uncomment-begin + const originalResolveFilename = node_module._resolveFilename; + node_module._resolveFilename = function resolveFilename(request: string, parent: unknown, isMain: boolean, options?: { paths?: string[] }) { + if (request === 'vsda' && Array.isArray(options?.paths) && options.paths.length === 0) { +@@ -58,7 +57,6 @@ class NodeModuleRequireInterceptor extends RequireInterceptor { + } + return originalResolveFilename.call(this, request, parent, isMain, options); + }; +- // ESM-uncomment-end + + const applyAlternatives = (request: string) => { + for (const alternativeModuleName of that._alternatives) { diff --git a/vscode-paches/0054-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch b/vscode-paches/0054-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch new file mode 100644 index 00000000..50f11fcc --- /dev/null +++ b/vscode-paches/0054-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Sun, 6 Oct 2024 18:36:08 +0200 +Subject: [PATCH] fix: make editor types build until it's fixed by MS + +--- + build/gulpfile.editor.js | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js +index a5951d21d34..44c61cb0dfd 100644 +--- a/build/gulpfile.editor.js ++++ b/build/gulpfile.editor.js +@@ -77,7 +77,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { + extrausages + ], + shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers +- importIgnorePattern: /\.css$/, ++ importIgnorePattern: /\.css$|^@vscode\//, + destRoot: path.join(root, 'out-editor-src'), + redirects: { + '@vscode/tree-sitter-wasm': '../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-web', +@@ -366,19 +366,19 @@ gulp.task('extract-editor-src', + + gulp.task('editor-distro', + task.series( +- task.parallel( +- util.rimraf('out-editor-src'), +- util.rimraf('out-editor-build'), +- util.rimraf('out-editor-esm'), +- util.rimraf('out-monaco-editor-core'), +- util.rimraf('out-editor'), +- util.rimraf('out-editor-min') +- ), +- extractEditorSrcTask, +- task.series( +- createESMSourcesAndResourcesTask, +- compileEditorESMTask, +- ), ++ // task.parallel( ++ // util.rimraf('out-editor-src'), ++ // util.rimraf('out-editor-build'), ++ // util.rimraf('out-editor-esm'), ++ // util.rimraf('out-monaco-editor-core'), ++ // util.rimraf('out-editor'), ++ // util.rimraf('out-editor-min') ++ // ), ++ // extractEditorSrcTask, ++ // task.series( ++ // createESMSourcesAndResourcesTask, ++ // compileEditorESMTask, ++ // ), + finalEditorResourcesTask + ) + );