diff --git a/.github/workflows/check_build.yml b/.github/workflows/check_build.yml index 3d80ee8d..927914e9 100644 --- a/.github/workflows/check_build.yml +++ b/.github/workflows/check_build.yml @@ -24,6 +24,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install libkrb5-dev - name: Volta uses: volta-cli/action@v4 - name: Install dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57b7f62c..cffc7e61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,10 @@ jobs: with: # get all tags for semantic release fetch-depth: 0 + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install libkrb5-dev - name: Volta uses: volta-cli/action@v4 - name: Install dependencies diff --git a/demo/package-lock.json b/demo/package-lock.json index 53df308b..b22beaac 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -14,9 +14,18 @@ "@codingame/monaco-vscode-base-service-override": "file:../dist/service-override-base", "@codingame/monaco-vscode-bat-default-extension": "file:../dist/default-extension-bat", "@codingame/monaco-vscode-bulk-edit-service-override": "file:../dist/service-override-bulk-edit", + "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "file:../dist/common-chat-comments-extensions-interactive-notebook-search", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "file:../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal", + "@codingame/monaco-vscode-chat-extensions-notebook-common": "file:../dist/common-chat-extensions-notebook", + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-task-terminal-testing", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "file:../dist/common-chat-extensions-notebook-terminal", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-terminal-testing", + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "file:../dist/common-chat-interactive-notebook-search", + "@codingame/monaco-vscode-chat-notebook-common": "file:../dist/common-chat-notebook", "@codingame/monaco-vscode-chat-service-override": "file:../dist/service-override-chat", "@codingame/monaco-vscode-clojure-default-extension": "file:../dist/default-extension-clojure", "@codingame/monaco-vscode-coffeescript-default-extension": "file:../dist/default-extension-coffeescript", + "@codingame/monaco-vscode-comments-extensions-common": "file:../dist/common-comments-extensions", "@codingame/monaco-vscode-comments-service-override": "file:../dist/service-override-comments", "@codingame/monaco-vscode-configuration-editing-default-extension": "file:../dist/default-extension-configuration-editing", "@codingame/monaco-vscode-configuration-service-override": "file:../dist/service-override-configuration", @@ -25,6 +34,7 @@ "@codingame/monaco-vscode-css-default-extension": "file:../dist/default-extension-css", "@codingame/monaco-vscode-css-language-features-default-extension": "file:../dist/default-extension-css-language-features", "@codingame/monaco-vscode-dart-default-extension": "file:../dist/default-extension-dart", + "@codingame/monaco-vscode-debug-notebook-common": "file:../dist/common-debug-notebook", "@codingame/monaco-vscode-debug-service-override": "file:../dist/service-override-debug", "@codingame/monaco-vscode-dialogs-service-override": "file:../dist/service-override-dialogs", "@codingame/monaco-vscode-diff-default-extension": "file:../dist/default-extension-diff", @@ -34,6 +44,7 @@ "@codingame/monaco-vscode-emmet-default-extension": "file:../dist/default-extension-emmet", "@codingame/monaco-vscode-emmet-service-override": "file:../dist/service-override-emmet", "@codingame/monaco-vscode-environment-service-override": "file:../dist/service-override-environment", + "@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common": "file:../dist/common-explorer-outline-timeline-view-common-views-workbench", "@codingame/monaco-vscode-explorer-service-override": "file:../dist/service-override-explorer", "@codingame/monaco-vscode-extension-editing-default-extension": "file:../dist/default-extension-extension-editing", "@codingame/monaco-vscode-extension-gallery-service-override": "file:../dist/service-override-extension-gallery", @@ -96,6 +107,7 @@ "@codingame/monaco-vscode-notebook-renderers-default-extension": "file:../dist/default-extension-notebook-renderers", "@codingame/monaco-vscode-notebook-service-override": "file:../dist/service-override-notebook", "@codingame/monaco-vscode-notifications-service-override": "file:../dist/service-override-notifications", + "@codingame/monaco-vscode-notifications-workbench-common": "file:../dist/common-notifications-workbench", "@codingame/monaco-vscode-npm-default-extension": "file:../dist/default-extension-npm", "@codingame/monaco-vscode-objective-c-default-extension": "file:../dist/default-extension-objective-c", "@codingame/monaco-vscode-outline-service-override": "file:../dist/service-override-outline", @@ -153,10 +165,12 @@ "@codingame/monaco-vscode-typescript-language-features-default-extension": "file:../dist/default-extension-typescript-language-features", "@codingame/monaco-vscode-update-service-override": "file:../dist/service-override-update", "@codingame/monaco-vscode-user-data-profile-service-override": "file:../dist/service-override-user-data-profile", + "@codingame/monaco-vscode-user-data-profile-user-data-sync-common": "file:../dist/common-user-data-profile-user-data-sync", "@codingame/monaco-vscode-user-data-sync-service-override": "file:../dist/service-override-user-data-sync", "@codingame/monaco-vscode-vb-default-extension": "file:../dist/default-extension-vb", "@codingame/monaco-vscode-view-banner-service-override": "file:../dist/service-override-view-banner", "@codingame/monaco-vscode-view-common-service-override": "file:../dist/service-override-view-common", + "@codingame/monaco-vscode-view-common-views-workbench-common": "file:../dist/common-view-common-views-workbench", "@codingame/monaco-vscode-view-status-bar-service-override": "file:../dist/service-override-view-status-bar", "@codingame/monaco-vscode-view-title-bar-service-override": "file:../dist/service-override-view-title-bar", "@codingame/monaco-vscode-views-service-override": "file:../dist/service-override-views", @@ -169,7 +183,7 @@ "@codingame/monaco-vscode-yaml-default-extension": "file:../dist/default-extension-yaml", "ansi-colors": "^4.1.3", "dockerode": "^4.0.2", - "express": "^4.21.0", + "express": "^4.21.1", "monaco-editor": "file:../dist/editor-api", "vscode": "file:../dist/main", "ws": "^8.18.0" @@ -181,10 +195,160 @@ "@types/express": "^5.0.0", "@types/node": "^20.11.4", "@types/wicg-file-system-access": "^2023.10.5", - "@types/ws": "^8.5.12", + "@types/ws": "^8.5.13", "ts-node": "^10.9.2", - "typescript": "~5.6.2", - "vite": "~5.4.8" + "typescript": "~5.6.3", + "vite": "~5.4.10" + } + }, + "../dist/common-chat-comments-extensions-interactive-notebook-search": { + "name": "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal": { + "name": "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", + "marked": "~14.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-extensions-interactive-notebook-search-terminal": { + "extraneous": true + }, + "../dist/common-chat-extensions-notebook": { + "name": "@codingame/monaco-vscode-chat-extensions-notebook-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "0.0.0-semantic-release", + "marked": "~14.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-extensions-notebook-task-terminal-testing": { + "name": "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-extensions-notebook-terminal": { + "name": "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "0.0.0-semantic-release", + "@xterm/addon-serialize": "^0.14.0-beta.65", + "@xterm/addon-webgl": "^0.19.0-beta.65", + "@xterm/xterm": "^5.6.0-beta.65", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-extensions-notebook-terminal-testing": { + "name": "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", + "@xterm/addon-clipboard": "^0.2.0-beta.48", + "@xterm/addon-image": "^0.9.0-beta.65", + "@xterm/addon-search": "^0.16.0-beta.65", + "@xterm/addon-serialize": "^0.14.0-beta.65", + "@xterm/addon-unicode11": "^0.9.0-beta.65", + "@xterm/addon-webgl": "^0.19.0-beta.65", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-interactive-notebook-search": { + "name": "@codingame/monaco-vscode-chat-interactive-notebook-search-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "marked": "~14.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-interactive-notebook-search-terminal": { + "extraneous": true + }, + "../dist/common-chat-notebook": { + "name": "@codingame/monaco-vscode-chat-notebook-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-chat-notebook-terminal": { + "extraneous": true + }, + "../dist/common-chat-notebook-terminal-testing": { + "extraneous": true + }, + "../dist/common-comments-extensions": { + "name": "@codingame/monaco-vscode-comments-extensions-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "0.0.0-semantic-release", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-debug-notebook": { + "name": "@codingame/monaco-vscode-debug-notebook-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-explorer-outline-timeline-view-common-views-workbench": { + "name": "@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-notifications-workbench": { + "name": "@codingame/monaco-vscode-notifications-workbench-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-user-data-profile-user-data-sync": { + "name": "@codingame/monaco-vscode-user-data-profile-user-data-sync-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } + }, + "../dist/common-view-common-views-workbench": { + "name": "@codingame/monaco-vscode-view-common-views-workbench-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common": "0.0.0-semantic-release", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, "../dist/default-extension-bat": { @@ -824,7 +988,7 @@ "@codingame/monaco-vscode-layout-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release", "@vscode/iconv-lite-umd": "0.7.0", - "jschardet": "3.1.3", + "jschardet": "3.1.4", "marked": "~14.0.0" } }, @@ -834,9 +998,9 @@ "dev": true, "license": "MIT", "dependencies": { - "@rollup/pluginutils": "^5.1.2", + "@rollup/pluginutils": "^5.1.3", "css-url-parser": "^1.1.4", - "memfs": "^4.12.0", + "memfs": "^4.14.0", "mime-types": "^2.1.35", "yauzl": "^3.0.0" } @@ -887,6 +1051,10 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -895,6 +1063,8 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-comments-extensions-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -912,6 +1082,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-debug-notebook-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -976,6 +1147,10 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-comments-extensions-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } @@ -1001,6 +1176,8 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1101,7 +1278,12 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "marked": "~14.0.0", + "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-debug-notebook-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1110,6 +1292,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-notifications-workbench-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1151,6 +1334,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1184,6 +1368,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1241,6 +1426,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1249,13 +1435,10 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@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/xterm": "^5.6.0-beta.64", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1264,6 +1447,8 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-terminal-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } @@ -1318,6 +1503,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { + "@codingame/monaco-vscode-user-data-profile-user-data-sync-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1327,6 +1513,7 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-user-data-profile-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-user-data-profile-user-data-sync-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1344,6 +1531,8 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-bulk-edit-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-view-common-views-workbench-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1371,6 +1560,7 @@ "@codingame/monaco-vscode-keybindings-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-common-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-view-common-views-workbench-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1397,9 +1587,11 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-keybindings-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-notifications-workbench-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-quickaccess-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-banner-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-common-service-override": "0.0.0-semantic-release", + "@codingame/monaco-vscode-view-common-views-workbench-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-status-bar-service-override": "0.0.0-semantic-release", "@codingame/monaco-vscode-view-title-bar-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" @@ -1537,13 +1729,15 @@ "node_modules/@balena/dockerignore": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", - "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==" + "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==", + "license": "Apache-2.0" }, "node_modules/@codingame/esbuild-import-meta-url-plugin": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@codingame/esbuild-import-meta-url-plugin/-/esbuild-import-meta-url-plugin-1.0.2.tgz", "integrity": "sha512-b1PjH6DVdTQd0WLO2R+b9oMlO7REyiAVbcx8weN1ZYiBSROuAy9MJ/j2NI4sxmFv9GK0wM9HRrBg6J2CBZ1xzQ==", "dev": true, + "license": "ISC", "dependencies": { "esbuild": ">=0.19.x", "import-meta-resolve": "^4.0.0" @@ -1573,6 +1767,38 @@ "resolved": "../dist/service-override-bulk-edit", "link": true }, + "node_modules/@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": { + "resolved": "../dist/common-chat-comments-extensions-interactive-notebook-search", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": { + "resolved": "../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-common": { + "resolved": "../dist/common-chat-extensions-notebook", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": { + "resolved": "../dist/common-chat-extensions-notebook-task-terminal-testing", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": { + "resolved": "../dist/common-chat-extensions-notebook-terminal", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": { + "resolved": "../dist/common-chat-extensions-notebook-terminal-testing", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-interactive-notebook-search-common": { + "resolved": "../dist/common-chat-interactive-notebook-search", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-notebook-common": { + "resolved": "../dist/common-chat-notebook", + "link": true + }, "node_modules/@codingame/monaco-vscode-chat-service-override": { "resolved": "../dist/service-override-chat", "link": true @@ -1585,6 +1811,10 @@ "resolved": "../dist/default-extension-coffeescript", "link": true }, + "node_modules/@codingame/monaco-vscode-comments-extensions-common": { + "resolved": "../dist/common-comments-extensions", + "link": true + }, "node_modules/@codingame/monaco-vscode-comments-service-override": { "resolved": "../dist/service-override-comments", "link": true @@ -1617,6 +1847,10 @@ "resolved": "../dist/default-extension-dart", "link": true }, + "node_modules/@codingame/monaco-vscode-debug-notebook-common": { + "resolved": "../dist/common-debug-notebook", + "link": true + }, "node_modules/@codingame/monaco-vscode-debug-service-override": { "resolved": "../dist/service-override-debug", "link": true @@ -1653,6 +1887,10 @@ "resolved": "../dist/service-override-environment", "link": true }, + "node_modules/@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common": { + "resolved": "../dist/common-explorer-outline-timeline-view-common-views-workbench", + "link": true + }, "node_modules/@codingame/monaco-vscode-explorer-service-override": { "resolved": "../dist/service-override-explorer", "link": true @@ -1901,6 +2139,10 @@ "resolved": "../dist/service-override-notifications", "link": true }, + "node_modules/@codingame/monaco-vscode-notifications-workbench-common": { + "resolved": "../dist/common-notifications-workbench", + "link": true + }, "node_modules/@codingame/monaco-vscode-npm-default-extension": { "resolved": "../dist/default-extension-npm", "link": true @@ -2133,6 +2375,10 @@ "resolved": "../dist/service-override-user-data-profile", "link": true }, + "node_modules/@codingame/monaco-vscode-user-data-profile-user-data-sync-common": { + "resolved": "../dist/common-user-data-profile-user-data-sync", + "link": true + }, "node_modules/@codingame/monaco-vscode-user-data-sync-service-override": { "resolved": "../dist/service-override-user-data-sync", "link": true @@ -2149,6 +2395,10 @@ "resolved": "../dist/service-override-view-common", "link": true }, + "node_modules/@codingame/monaco-vscode-view-common-views-workbench-common": { + "resolved": "../dist/common-view-common-views-workbench", + "link": true + }, "node_modules/@codingame/monaco-vscode-view-status-bar-service-override": { "resolved": "../dist/service-override-view-status-bar", "link": true @@ -2194,6 +2444,7 @@ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "0.3.9" }, @@ -2209,6 +2460,7 @@ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "aix" @@ -2225,6 +2477,7 @@ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -2241,6 +2494,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -2257,6 +2511,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -2273,6 +2528,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2289,6 +2545,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2305,6 +2562,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -2321,6 +2579,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -2337,6 +2596,7 @@ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2353,6 +2613,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2369,6 +2630,7 @@ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2385,6 +2647,7 @@ "loong64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2401,6 +2664,7 @@ "mips64el" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2417,6 +2681,7 @@ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2433,6 +2698,7 @@ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2449,6 +2715,7 @@ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2465,6 +2732,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -2481,6 +2749,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "netbsd" @@ -2497,6 +2766,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -2513,6 +2783,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -2529,6 +2800,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "sunos" @@ -2545,6 +2817,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -2561,6 +2834,7 @@ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -2577,6 +2851,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -2590,6 +2865,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -2598,221 +2874,267 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.4.tgz", + "integrity": "sha512-jfUJrFct/hTA0XDM5p/htWKoNNTbDLY0KRwEt6pyOA6k2fmk0WVwl65PdUdJZgzGEHWx+49LilkcSaumQRyNQw==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ] }, "node_modules/@rollup/rollup-android-arm64": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.4.tgz", + "integrity": "sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.4.tgz", + "integrity": "sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ] }, "node_modules/@rollup/rollup-darwin-x64": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.4.tgz", + "integrity": "sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.4.tgz", + "integrity": "sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.4.tgz", + "integrity": "sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.4.tgz", + "integrity": "sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.4.tgz", + "integrity": "sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.4.tgz", + "integrity": "sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.4.tgz", + "integrity": "sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.4.tgz", + "integrity": "sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.4.tgz", + "integrity": "sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw==", "cpu": [ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.4.tgz", + "integrity": "sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ==", "cpu": [ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.4.tgz", + "integrity": "sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.4.tgz", + "integrity": "sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.4.tgz", + "integrity": "sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.4.tgz", + "integrity": "sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.4.tgz", + "integrity": "sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -2822,31 +3144,36 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node12": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node14": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node16": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, + "license": "MIT", "dependencies": { "@types/connect": "*", "@types/node": "*" @@ -2857,6 +3184,7 @@ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -2866,6 +3194,7 @@ "resolved": "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.6.tgz", "integrity": "sha512-yKpAGEuKRSS8wwx0joknWxsmLha78wNMe9R2S3UNsVOkZded8UqOrV8KoeDXoXsjndxwyF3eIhyClGbO1SEhEg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "@types/ssh2": "*" @@ -2876,6 +3205,7 @@ "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.31.tgz", "integrity": "sha512-42R9eoVqJDSvVspV89g7RwRqfNExgievLNWoHkg7NoWIqAmavIbgQBb4oc0qRtHkxE+I3Xxvqv7qVXFABKPBTg==", "dev": true, + "license": "MIT", "dependencies": { "@types/docker-modem": "*", "@types/node": "*", @@ -2886,13 +3216,15 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/express": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.0.tgz", "integrity": "sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^5.0.0", @@ -2901,10 +3233,11 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz", - "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz", + "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -2916,40 +3249,46 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/mime": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/node": { - "version": "20.16.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.11.tgz", - "integrity": "sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==", + "version": "20.17.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.6.tgz", + "integrity": "sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~6.19.2" } }, "node_modules/@types/qs": { - "version": "6.9.16", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz", - "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==", - "dev": true + "version": "6.9.17", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz", + "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==", + "dev": true, + "license": "MIT" }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mime": "^1", "@types/node": "*" @@ -2960,6 +3299,7 @@ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-errors": "*", "@types/node": "*", @@ -2971,15 +3311,17 @@ "resolved": "https://registry.npmjs.org/@types/ssh2/-/ssh2-1.15.1.tgz", "integrity": "sha512-ZIbEqKAsi5gj35y4P4vkJYly642wIbY6PqoN0xiyQGshKUGXR9WQjF/iF9mXBQ8uBKy3ezfsCkcoHKhd0BzuDA==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^18.11.18" } }, "node_modules/@types/ssh2/node_modules/@types/node": { - "version": "18.19.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.55.tgz", - "integrity": "sha512-zzw5Vw52205Zr/nmErSEkN5FLqXPuKX/k5d1D7RKHATGqU7y6YfX9QxZraUzUrFGqH6XzOzG196BC35ltJC4Cw==", + "version": "18.19.64", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.64.tgz", + "integrity": "sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } @@ -2988,19 +3330,22 @@ "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/wicg-file-system-access": { "version": "2023.10.5", "resolved": "https://registry.npmjs.org/@types/wicg-file-system-access/-/wicg-file-system-access-2023.10.5.tgz", "integrity": "sha512-e9kZO9kCdLqT2h9Tw38oGv9UNzBBWaR1MzuAavxPcsV/7FJ3tWbU6RI3uB+yKIDPGLkGVbplS52ub0AcRLvrhA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz", + "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -3009,6 +3354,7 @@ "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -3018,10 +3364,11 @@ } }, "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -3034,6 +3381,7 @@ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, + "license": "MIT", "dependencies": { "acorn": "^8.11.0" }, @@ -3045,6 +3393,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", "engines": { "node": ">=6" } @@ -3053,17 +3402,20 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" }, "node_modules/asn1": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "license": "MIT", "dependencies": { "safer-buffer": "~2.1.0" } @@ -3085,12 +3437,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "license": "BSD-3-Clause", "dependencies": { "tweetnacl": "^0.14.3" } @@ -3099,6 +3453,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -3109,6 +3464,7 @@ "version": "1.20.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -3132,6 +3488,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -3139,7 +3496,8 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/buffer": { "version": "5.7.1", @@ -3159,6 +3517,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -3177,6 +3536,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3185,6 +3545,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -3202,12 +3563,14 @@ "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -3219,14 +3582,16 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3234,7 +3599,8 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" }, "node_modules/cpu-features": { "version": "0.0.10", @@ -3254,12 +3620,14 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/debug": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -3276,6 +3644,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -3292,6 +3661,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3300,6 +3670,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -3310,6 +3681,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -3318,6 +3690,7 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.3.tgz", "integrity": "sha512-89zhop5YVhcPEt5FpUFGr3cDyceGhq/F9J+ZndQ4KfqNvfbJpPMfgeixFgUj5OjCYAboElqODxY5Z1EBsSa6sg==", + "license": "Apache-2.0", "dependencies": { "debug": "^4.1.1", "readable-stream": "^3.5.0", @@ -3332,6 +3705,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.2.tgz", "integrity": "sha512-9wM1BVpVMFr2Pw3eJNXrYYt6DT9k0xMcsSCjtPvyQ+xa1iPg/Mo3T/gUcwI0B2cczqCeCYRPF8yFYDwtFXT0+w==", + "license": "Apache-2.0", "dependencies": { "@balena/dockerignore": "^1.0.2", "docker-modem": "^5.0.3", @@ -3344,12 +3718,14 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3358,6 +3734,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -3366,6 +3743,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -3377,6 +3755,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -3387,6 +3766,7 @@ "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -3423,27 +3803,30 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" }, "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -3478,6 +3861,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -3485,12 +3869,14 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/finalhandler": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", @@ -3508,6 +3894,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -3515,12 +3902,14 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3529,6 +3918,7 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3536,7 +3926,8 @@ "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" }, "node_modules/fsevents": { "version": "2.3.3", @@ -3544,6 +3935,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -3556,6 +3948,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3564,6 +3957,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -3582,6 +3976,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -3593,6 +3988,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -3604,6 +4000,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3615,6 +4012,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3626,6 +4024,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -3637,6 +4036,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -3652,6 +4052,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -3676,13 +4077,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/import-meta-resolve": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -3691,12 +4094,14 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -3705,12 +4110,14 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3719,6 +4126,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -3727,6 +4135,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3735,6 +4144,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -3746,6 +4156,7 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3754,6 +4165,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -3764,7 +4176,8 @@ "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" }, "node_modules/monaco-editor": { "resolved": "../dist/editor-api", @@ -3773,12 +4186,14 @@ "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/nan": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", - "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT", "optional": true }, "node_modules/nanoid": { @@ -3792,6 +4207,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -3803,6 +4219,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3811,6 +4228,7 @@ "version": "1.13.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3822,6 +4240,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -3833,6 +4252,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -3841,6 +4261,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3848,13 +4269,15 @@ "node_modules/path-to-regexp": { "version": "0.1.10", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "license": "MIT" }, "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" }, "node_modules/postcss": { "version": "8.4.47", @@ -3875,6 +4298,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.0", @@ -3888,6 +4312,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -3900,6 +4325,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -3909,6 +4335,7 @@ "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -3923,6 +4350,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3931,6 +4359,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -3945,6 +4374,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -3955,10 +4385,11 @@ } }, "node_modules/rollup": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz", - "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.4.tgz", + "integrity": "sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "1.0.6" }, @@ -3970,22 +4401,24 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@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", + "@rollup/rollup-android-arm-eabi": "4.24.4", + "@rollup/rollup-android-arm64": "4.24.4", + "@rollup/rollup-darwin-arm64": "4.24.4", + "@rollup/rollup-darwin-x64": "4.24.4", + "@rollup/rollup-freebsd-arm64": "4.24.4", + "@rollup/rollup-freebsd-x64": "4.24.4", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.4", + "@rollup/rollup-linux-arm-musleabihf": "4.24.4", + "@rollup/rollup-linux-arm64-gnu": "4.24.4", + "@rollup/rollup-linux-arm64-musl": "4.24.4", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.4", + "@rollup/rollup-linux-riscv64-gnu": "4.24.4", + "@rollup/rollup-linux-s390x-gnu": "4.24.4", + "@rollup/rollup-linux-x64-gnu": "4.24.4", + "@rollup/rollup-linux-x64-musl": "4.24.4", + "@rollup/rollup-win32-arm64-msvc": "4.24.4", + "@rollup/rollup-win32-ia32-msvc": "4.24.4", + "@rollup/rollup-win32-x64-msvc": "4.24.4", "fsevents": "~2.3.2" } }, @@ -4006,17 +4439,20 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" }, "node_modules/send": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -4040,6 +4476,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -4047,12 +4484,14 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/send/node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4061,6 +4500,7 @@ "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "license": "MIT", "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", @@ -4075,6 +4515,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -4090,12 +4531,14 @@ "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -4114,6 +4557,7 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -4121,7 +4565,8 @@ "node_modules/split-ca": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz", - "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==" + "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==", + "license": "ISC" }, "node_modules/ssh2": { "version": "1.16.0", @@ -4144,6 +4589,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4152,6 +4598,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -4160,6 +4607,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "license": "MIT", "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", @@ -4171,6 +4619,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -4186,6 +4635,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", "engines": { "node": ">=0.6" } @@ -4195,6 +4645,7 @@ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, + "license": "MIT", "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -4236,12 +4687,14 @@ "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "license": "Unlicense" }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -4251,10 +4704,11 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4267,12 +4721,14 @@ "version": "6.19.8", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4280,12 +4736,14 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "license": "MIT", "engines": { "node": ">= 0.4.0" } @@ -4294,21 +4752,24 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/vite": { - "version": "5.4.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz", - "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==", + "version": "5.4.10", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", + "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", @@ -4370,12 +4831,14 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" }, "node_modules/ws": { "version": "8.18.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -4397,6 +4860,7 @@ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } diff --git a/demo/package.json b/demo/package.json index e81ae4dd..83b08174 100644 --- a/demo/package.json +++ b/demo/package.json @@ -21,10 +21,10 @@ "@types/express": "^5.0.0", "@types/node": "^20.11.4", "@types/wicg-file-system-access": "^2023.10.5", - "@types/ws": "^8.5.12", + "@types/ws": "^8.5.13", "ts-node": "^10.9.2", - "typescript": "~5.6.2", - "vite": "~5.4.8" + "typescript": "~5.6.3", + "vite": "~5.4.10" }, "dependencies": { "@codingame/monaco-vscode-accessibility-service-override": "file:../dist/service-override-accessibility", @@ -186,9 +186,25 @@ "@codingame/monaco-vscode-workspace-trust-service-override": "file:../dist/service-override-workspace-trust", "@codingame/monaco-vscode-xml-default-extension": "file:../dist/default-extension-xml", "@codingame/monaco-vscode-yaml-default-extension": "file:../dist/default-extension-yaml", + + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "file:../dist/common-chat-extensions-notebook-terminal", + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-task-terminal-testing", + "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "file:../dist/common-chat-interactive-notebook-search", + "@codingame/monaco-vscode-chat-notebook-common": "file:../dist/common-chat-notebook", + "@codingame/monaco-vscode-comments-extensions-common": "file:../dist/common-comments-extensions", + "@codingame/monaco-vscode-debug-notebook-common": "file:../dist/common-debug-notebook", + "@codingame/monaco-vscode-explorer-outline-timeline-view-common-views-workbench-common": "file:../dist/common-explorer-outline-timeline-view-common-views-workbench", + "@codingame/monaco-vscode-notifications-workbench-common": "file:../dist/common-notifications-workbench", + "@codingame/monaco-vscode-view-common-views-workbench-common": "file:../dist/common-view-common-views-workbench", + "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "file:../dist/common-chat-comments-extensions-interactive-notebook-search", + "@codingame/monaco-vscode-chat-extensions-notebook-common": "file:../dist/common-chat-extensions-notebook", + "@codingame/monaco-vscode-user-data-profile-user-data-sync-common": "file:../dist/common-user-data-profile-user-data-sync", + "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-terminal-testing", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "file:../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal", + "ansi-colors": "^4.1.3", "dockerode": "^4.0.2", - "express": "^4.21.0", + "express": "^4.21.1", "monaco-editor": "file:../dist/editor-api", "vscode": "file:../dist/main", "ws": "^8.18.0" @@ -197,7 +213,7 @@ "esbuild": "^0.24.0" }, "volta": { - "node": "18.19.0", - "npm": "10.7.0" + "node": "20.18.0", + "npm": "10.9.0" } } diff --git a/demo/vite.config.ts b/demo/vite.config.ts index 05d6bc08..fcaac520 100644 --- a/demo/vite.config.ts +++ b/demo/vite.config.ts @@ -2,9 +2,11 @@ import { defineConfig } from 'vite' import importMetaUrlPlugin from '@codingame/esbuild-import-meta-url-plugin' import * as fs from 'fs' import path from 'path' -import pkg from './package.json' assert { type: 'json' } +const pkg = JSON.parse( + fs.readFileSync(new URL('./package.json', import.meta.url).pathname).toString() +) -const localDependencies = Object.entries(pkg.dependencies) +const localDependencies = Object.entries(pkg.dependencies as Record) .filter(([, version]) => version.startsWith('file:../')) .map(([name]) => name) export default defineConfig({ diff --git a/demo/vite.netlify.config.ts b/demo/vite.netlify.config.ts index 9044d931..2e87dd89 100644 --- a/demo/vite.netlify.config.ts +++ b/demo/vite.netlify.config.ts @@ -1,7 +1,10 @@ import { defineConfig } from 'vite' -import pkg from './package.json' assert { type: 'json' } +import * as fs from 'fs' +const pkg = JSON.parse( + fs.readFileSync(new URL('./package.json', import.meta.url).pathname).toString() +) -const localDependencies = Object.entries(pkg.dependencies) +const localDependencies = Object.entries(pkg.dependencies as Record) .filter(([, version]) => version.startsWith('file:../')) .map(([name]) => name) diff --git a/package-lock.json b/package-lock.json index 172e8db2..7a0a9001 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", "@parcel/watcher": "2.1.0", - "@rollup/pluginutils": "^5.1.2", + "@rollup/pluginutils": "^5.1.3", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", @@ -21,23 +21,23 @@ "@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.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", + "@xterm/addon-clipboard": "^0.2.0-beta.48", + "@xterm/addon-image": "^0.9.0-beta.65", + "@xterm/addon-search": "^0.16.0-beta.65", + "@xterm/addon-serialize": "^0.14.0-beta.65", + "@xterm/addon-unicode11": "^0.9.0-beta.65", + "@xterm/addon-webgl": "^0.19.0-beta.65", + "@xterm/headless": "^5.6.0-beta.65", + "@xterm/xterm": "^5.6.0-beta.65", + "cookie": "^0.7.2", "css-url-parser": "^1.1.4", - "jschardet": "3.1.3", + "jschardet": "3.1.4", "kerberos": "2.1.1", "keytar": "^7.9.0", "marked": "~14.0.0", - "memfs": "^4.12.0", + "memfs": "^4.14.0", "mime-types": "^2.1.35", - "node-pty": "1.1.0-beta21", + "node-pty": "^1.1.0-beta22", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.1.0", @@ -45,26 +45,26 @@ "yazl": "^2.4.3" }, "devDependencies": { - "@babel/core": "^7.25.7", + "@babel/core": "^7.26.0", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.25.7", - "@babel/preset-env": "^7.25.7", - "@babel/preset-typescript": "^7.25.7", + "@babel/plugin-proposal-decorators": "^7.25.9", + "@babel/preset-env": "^7.26.0", + "@babel/preset-typescript": "^7.26.0", "@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": "^28.0.0", - "@rollup/plugin-dynamic-import-vars": "^2.1.3", + "@rollup/plugin-commonjs": "^28.0.1", + "@rollup/plugin-dynamic-import-vars": "^2.1.5", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.3.0", "@rollup/plugin-replace": "^6.0.1", - "@rollup/plugin-typescript": "^12.1.0", + "@rollup/plugin-typescript": "^12.1.1", "@types/mime-types": "^2.1.4", "@types/node": "18.19.8", "@types/semver": "^7.5.8", - "@types/vscode": "~1.94.0", + "@types/vscode": "~1.95.0", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.33", "@types/yauzl": "^2.10.3", @@ -88,7 +88,7 @@ "patch-package": "^8.0.0", "prettier": "^3.3.3", "recast": "^0.23.9", - "rollup": "^4.24.0", + "rollup": "^4.24.4", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.1.1", "rollup-plugin-styles": "^4.0.0", @@ -97,10 +97,10 @@ "ts-morph": "^22.0.0", "ts-node": "^10.9.2", "type-fest": "^4.26.1", - "typescript": "^5.6.2", + "typescript": "^5.6.3", "vscode-semver": "npm:semver@=5.5.0", "yargs": "^17.7.2", - "zx": "^8.1.9" + "zx": "^8.2.0" } }, "node_modules/@ampproject/remapping": { @@ -117,12 +117,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", - "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, "dependencies": { - "@babel/highlight": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -130,30 +131,30 @@ } }, "node_modules/@babel/compat-data": { - "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==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz", + "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz", - "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@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", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -178,12 +179,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", - "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", "dev": true, "dependencies": { - "@babel/types": "^7.25.7", + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -193,38 +195,38 @@ } }, "node_modules/@babel/helper-annotate-as-pure": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "dependencies": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz", + "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==", "dev": true, "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", - "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.25.7", - "@babel/helper-validator-option": "^7.25.7", + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -243,17 +245,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", + "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", "dev": true, "dependencies": { - "@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", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/traverse": "^7.25.9", "semver": "^6.3.1" }, "engines": { @@ -273,12 +275,12 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz", + "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-annotate-as-pure": "^7.25.9", "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, @@ -315,41 +317,40 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", + "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", "dev": true, "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "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==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, "dependencies": { - "@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" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -359,35 +360,35 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", + "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", "dev": true, "dependencies": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", - "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", + "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.7", - "@babel/helper-wrap-function": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-wrap-function": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -397,14 +398,14 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz", - "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", + "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", "dev": true, "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.25.7", - "@babel/helper-optimise-call-expression": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -414,107 +415,92 @@ } }, "node_modules/@babel/helper-simple-access": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz", + "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==", "dev": true, "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", + "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", "dev": true, "dependencies": { - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", - "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz", - "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", + "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", "dev": true, "dependencies": { - "@babel/template": "^7.25.7", - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "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.7", - "@babel/types": "^7.25.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "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==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.25.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz", - "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", "dev": true, "dependencies": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.26.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -524,13 +510,13 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz", + "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -540,12 +526,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz", + "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -555,12 +541,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "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==", + "version": "7.25.9", + "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.9.tgz", + "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -570,14 +556,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", - "@babel/plugin-transform-optional-chaining": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -587,13 +573,13 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz", + "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -620,14 +606,14 @@ } }, "node_modules/@babel/plugin-proposal-decorators": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.7.tgz", - "integrity": "sha512-q1mqqqH0e1lhmsEQHV5U8OmdueBC2y0RFr2oUzZoFRtN3MvPmt2fsFRcNQAoGLTSNdHBFUYGnlgcRFhkBbKjPw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz", + "integrity": "sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-decorators": "^7.25.7" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-syntax-decorators": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -648,52 +634,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-decorators": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz", + "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -702,37 +649,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-import-assertions": { - "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==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz", + "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -742,12 +665,12 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "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==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -756,139 +679,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-jsx": { - "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.25.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", + "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -898,12 +695,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", + "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -929,12 +726,12 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", + "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -944,15 +741,14 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz", + "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==", "dev": true, "dependencies": { - "@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.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -962,14 +758,14 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz", + "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-remap-async-to-generator": "^7.25.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -979,12 +775,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz", + "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -994,12 +790,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", + "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1009,13 +805,13 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz", + "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1025,14 +821,13 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "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==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz", + "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==", "dev": true, "dependencies": { - "@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" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1042,16 +837,16 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", + "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", "dev": true, "dependencies": { - "@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", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/traverse": "^7.25.9", "globals": "^11.1.0" }, "engines": { @@ -1062,13 +857,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", + "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/template": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/template": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1078,12 +873,12 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1093,13 +888,13 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", + "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1109,12 +904,12 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", + "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1124,13 +919,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1140,13 +935,12 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz", + "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1156,13 +950,13 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz", + "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1172,13 +966,12 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz", + "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1188,13 +981,13 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", + "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1204,14 +997,14 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", + "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/traverse": "^7.25.7" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1221,13 +1014,12 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz", + "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1237,12 +1029,12 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", + "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1252,13 +1044,12 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz", + "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1268,12 +1059,12 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", + "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1283,13 +1074,13 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", + "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1299,14 +1090,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz", + "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-simple-access": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-simple-access": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1316,15 +1107,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", + "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", "dev": true, "dependencies": { - "@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" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1334,13 +1125,13 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", + "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1350,13 +1141,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1366,12 +1157,12 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", + "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1381,13 +1172,12 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz", + "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1397,13 +1187,12 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz", + "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1413,15 +1202,14 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz", + "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==", "dev": true, "dependencies": { - "@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.25.7" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1431,13 +1219,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", + "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-replace-supers": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1447,13 +1235,12 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz", + "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1463,14 +1250,13 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1480,12 +1266,12 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1495,13 +1281,13 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz", + "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1511,15 +1297,14 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz", + "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==", "dev": true, "dependencies": { - "@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" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1529,12 +1314,12 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", + "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1544,12 +1329,12 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz", - "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", + "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.9", "regenerator-transform": "^0.15.2" }, "engines": { @@ -1559,13 +1344,29 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-regexp-modifiers": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz", + "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-transform-reserved-words": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", + "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1575,12 +1376,12 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1590,13 +1391,13 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz", - "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", + "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1606,12 +1407,12 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", + "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1621,12 +1422,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz", + "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1636,12 +1437,12 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz", + "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1651,16 +1452,16 @@ } }, "node_modules/@babel/plugin-transform-typescript": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz", + "integrity": "sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==", "dev": true, "dependencies": { - "@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" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-syntax-typescript": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1670,12 +1471,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", + "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1685,13 +1486,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz", + "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1701,13 +1502,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", + "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1717,13 +1518,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "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==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz", + "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1733,88 +1534,74 @@ } }, "node_modules/@babel/preset-env": { - "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", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz", + "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9", "@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.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", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-import-assertions": "^7.26.0", + "@babel/plugin-syntax-import-attributes": "^7.26.0", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@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/plugin-transform-arrow-functions": "^7.25.9", + "@babel/plugin-transform-async-generator-functions": "^7.25.9", + "@babel/plugin-transform-async-to-generator": "^7.25.9", + "@babel/plugin-transform-block-scoped-functions": "^7.25.9", + "@babel/plugin-transform-block-scoping": "^7.25.9", + "@babel/plugin-transform-class-properties": "^7.25.9", + "@babel/plugin-transform-class-static-block": "^7.26.0", + "@babel/plugin-transform-classes": "^7.25.9", + "@babel/plugin-transform-computed-properties": "^7.25.9", + "@babel/plugin-transform-destructuring": "^7.25.9", + "@babel/plugin-transform-dotall-regex": "^7.25.9", + "@babel/plugin-transform-duplicate-keys": "^7.25.9", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-dynamic-import": "^7.25.9", + "@babel/plugin-transform-exponentiation-operator": "^7.25.9", + "@babel/plugin-transform-export-namespace-from": "^7.25.9", + "@babel/plugin-transform-for-of": "^7.25.9", + "@babel/plugin-transform-function-name": "^7.25.9", + "@babel/plugin-transform-json-strings": "^7.25.9", + "@babel/plugin-transform-literals": "^7.25.9", + "@babel/plugin-transform-logical-assignment-operators": "^7.25.9", + "@babel/plugin-transform-member-expression-literals": "^7.25.9", + "@babel/plugin-transform-modules-amd": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.25.9", + "@babel/plugin-transform-modules-systemjs": "^7.25.9", + "@babel/plugin-transform-modules-umd": "^7.25.9", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-new-target": "^7.25.9", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9", + "@babel/plugin-transform-numeric-separator": "^7.25.9", + "@babel/plugin-transform-object-rest-spread": "^7.25.9", + "@babel/plugin-transform-object-super": "^7.25.9", + "@babel/plugin-transform-optional-catch-binding": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9", + "@babel/plugin-transform-private-methods": "^7.25.9", + "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@babel/plugin-transform-property-literals": "^7.25.9", + "@babel/plugin-transform-regenerator": "^7.25.9", + "@babel/plugin-transform-regexp-modifiers": "^7.26.0", + "@babel/plugin-transform-reserved-words": "^7.25.9", + "@babel/plugin-transform-shorthand-properties": "^7.25.9", + "@babel/plugin-transform-spread": "^7.25.9", + "@babel/plugin-transform-sticky-regex": "^7.25.9", + "@babel/plugin-transform-template-literals": "^7.25.9", + "@babel/plugin-transform-typeof-symbol": "^7.25.9", + "@babel/plugin-transform-unicode-escapes": "^7.25.9", + "@babel/plugin-transform-unicode-property-regex": "^7.25.9", + "@babel/plugin-transform-unicode-regex": "^7.25.9", + "@babel/plugin-transform-unicode-sets-regex": "^7.25.9", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.10", "babel-plugin-polyfill-corejs3": "^0.10.6", @@ -1853,16 +1640,16 @@ } }, "node_modules/@babel/preset-typescript": { - "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==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz", + "integrity": "sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==", "dev": true, "dependencies": { - "@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" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "@babel/plugin-syntax-jsx": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.25.9", + "@babel/plugin-transform-typescript": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1872,9 +1659,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", - "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -1884,30 +1671,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", - "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", - "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "dev": true, "dependencies": { - "@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", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1916,14 +1703,13 @@ } }, "node_modules/@babel/types": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz", - "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2853,18 +2639,18 @@ } }, "node_modules/@rollup/plugin-commonjs": { - "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==", + "version": "28.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.1.tgz", + "integrity": "sha512-+tNWdlWKbpB3WgBN7ijjYkq9X5uhjmcvyjEght4NmH5fAU++zfQzAJ6wumLS+dNcvwEZhKx2Z+skY8m7v0wGSA==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.0.1", "commondir": "^1.0.1", "estree-walker": "^2.0.2", - "fdir": "^6.1.1", + "fdir": "^6.2.0", "is-reference": "1.2.1", "magic-string": "^0.30.3", - "picomatch": "^2.3.1" + "picomatch": "^4.0.2" }, "engines": { "node": ">=16.0.0 || 14 >= 14.17" @@ -2878,22 +2664,10 @@ } } }, - "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.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==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rollup/plugin-dynamic-import-vars/-/plugin-dynamic-import-vars-2.1.5.tgz", + "integrity": "sha512-Mymi24fd9hlRifdZV/jYIFj1dn99F34imiYu3KzlAcgBcRi3i9SucgW/VRo5SQ9K4NuQ7dCep6pFWgNyhRdFHQ==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.0.1", @@ -2980,9 +2754,9 @@ } }, "node_modules/@rollup/plugin-typescript": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.0.tgz", - "integrity": "sha512-Kzs8KGJofe7cfTRODsnG1jNGxSvU8gVoNNd7Z/QaY25AYwe2LSSUpx/kPxqF38NYkpR8de3m51r9uwJpDlz6dg==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.1.tgz", + "integrity": "sha512-t7O653DpfB5MbFrqPe/VcKFFkvRuFNp9qId3xq4Eth5xlyymzxNpye2z8Hrl0RIMuXTSr5GGcFpkdlMeacUiFQ==", "dev": true, "dependencies": { "@rollup/pluginutils": "^5.1.0", @@ -3006,13 +2780,13 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.2.tgz", - "integrity": "sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.3.tgz", + "integrity": "sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", - "picomatch": "^2.3.1" + "picomatch": "^4.0.2" }, "engines": { "node": ">=14.0.0" @@ -3026,21 +2800,10 @@ } } }, - "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.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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.4.tgz", + "integrity": "sha512-jfUJrFct/hTA0XDM5p/htWKoNNTbDLY0KRwEt6pyOA6k2fmk0WVwl65PdUdJZgzGEHWx+49LilkcSaumQRyNQw==", "cpu": [ "arm" ], @@ -3051,9 +2814,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.4.tgz", + "integrity": "sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA==", "cpu": [ "arm64" ], @@ -3064,9 +2827,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.4.tgz", + "integrity": "sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ==", "cpu": [ "arm64" ], @@ -3077,9 +2840,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.4.tgz", + "integrity": "sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg==", "cpu": [ "x64" ], @@ -3089,10 +2852,36 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.4.tgz", + "integrity": "sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.4.tgz", + "integrity": "sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.4.tgz", + "integrity": "sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA==", "cpu": [ "arm" ], @@ -3103,9 +2892,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.4.tgz", + "integrity": "sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw==", "cpu": [ "arm" ], @@ -3116,9 +2905,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.4.tgz", + "integrity": "sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg==", "cpu": [ "arm64" ], @@ -3129,9 +2918,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.4.tgz", + "integrity": "sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA==", "cpu": [ "arm64" ], @@ -3142,9 +2931,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.4.tgz", + "integrity": "sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA==", "cpu": [ "ppc64" ], @@ -3155,9 +2944,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.4.tgz", + "integrity": "sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw==", "cpu": [ "riscv64" ], @@ -3168,9 +2957,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.4.tgz", + "integrity": "sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ==", "cpu": [ "s390x" ], @@ -3181,9 +2970,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.4.tgz", + "integrity": "sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA==", "cpu": [ "x64" ], @@ -3194,9 +2983,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.4.tgz", + "integrity": "sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q==", "cpu": [ "x64" ], @@ -3207,9 +2996,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.4.tgz", + "integrity": "sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA==", "cpu": [ "arm64" ], @@ -3220,9 +3009,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.4.tgz", + "integrity": "sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg==", "cpu": [ "ia32" ], @@ -3233,9 +3022,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "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==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.4.tgz", + "integrity": "sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg==", "cpu": [ "x64" ], @@ -3565,10 +3354,11 @@ "dev": true }, "node_modules/@types/vscode": { - "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 + "version": "1.95.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.95.0.tgz", + "integrity": "sha512-0LBD8TEiNbet3NvWsmn59zLzOFu/txSlGxnv5yAFHCrhG9WvAnR3IvfHzMOs2aeWqgvNjq9pO99IUw8d3n+unw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/vscode-semver": { "name": "@types/semver", @@ -5153,9 +4943,10 @@ "dev": true }, "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -8080,9 +7871,10 @@ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "node_modules/jschardet": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.3.tgz", - "integrity": "sha512-Q1PKVMK/uu+yjdlobgWIYkUOCR1SqUmW9m/eUJNNj4zI2N12i25v8fYpVf+zCakQeaTdBdhnZTFbVIAVZIVVOg==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz", + "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==", + "license": "LGPL-2.1+", "engines": { "node": ">=0.1.90" } @@ -8493,9 +8285,9 @@ "dev": true }, "node_modules/memfs": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz", - "integrity": "sha512-74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz", + "integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==", "dependencies": { "@jsonjoy.com/json-pack": "^1.0.3", "@jsonjoy.com/util": "^1.3.0", @@ -8765,10 +8557,11 @@ } }, "node_modules/node-pty": { - "version": "1.1.0-beta21", - "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta21.tgz", - "integrity": "sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==", + "version": "1.1.0-beta9", + "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta9.tgz", + "integrity": "sha512-/Ue38pvXJdgRZ3+me1FgfglLd301GhJN0NStiotdt61tm43N5htUyR/IXOUzOKuNaFmCwIhy6nwb77Ky41LMbw==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "node-addon-api": "^7.1.0" } @@ -12041,9 +11834,6 @@ "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": ">=12" }, @@ -13171,9 +12961,9 @@ } }, "node_modules/rollup": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz", - "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.4.tgz", + "integrity": "sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==", "devOptional": true, "dependencies": { "@types/estree": "1.0.6" @@ -13186,22 +12976,24 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@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", + "@rollup/rollup-android-arm-eabi": "4.24.4", + "@rollup/rollup-android-arm64": "4.24.4", + "@rollup/rollup-darwin-arm64": "4.24.4", + "@rollup/rollup-darwin-x64": "4.24.4", + "@rollup/rollup-freebsd-arm64": "4.24.4", + "@rollup/rollup-freebsd-x64": "4.24.4", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.4", + "@rollup/rollup-linux-arm-musleabihf": "4.24.4", + "@rollup/rollup-linux-arm64-gnu": "4.24.4", + "@rollup/rollup-linux-arm64-musl": "4.24.4", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.4", + "@rollup/rollup-linux-riscv64-gnu": "4.24.4", + "@rollup/rollup-linux-s390x-gnu": "4.24.4", + "@rollup/rollup-linux-x64-gnu": "4.24.4", + "@rollup/rollup-linux-x64-musl": "4.24.4", + "@rollup/rollup-win32-arm64-msvc": "4.24.4", + "@rollup/rollup-win32-ia32-msvc": "4.24.4", + "@rollup/rollup-win32-x64-msvc": "4.24.4", "fsevents": "~2.3.2" } }, @@ -14593,15 +14385,6 @@ "node": ">=0.6.0" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -14843,9 +14626,9 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -15287,9 +15070,9 @@ } }, "node_modules/zx": { - "version": "8.1.9", - "resolved": "https://registry.npmjs.org/zx/-/zx-8.1.9.tgz", - "integrity": "sha512-UHuLHphHmsBYKkAchkSrEN4nzDyagafqC9HUxtc1J7eopaScW6H9dsLJ1lmkAntnLtDTGoM8fa+jrJrXiIfKFA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/zx/-/zx-8.2.0.tgz", + "integrity": "sha512-ec7Z1Ki9h4CsKqbMjZ8H7G1PbbZYErscxT314LF66Ljx1YRENisqa5m9IN2VjbYgOKxdv5t0MbVd3Hf+II3e7w==", "dev": true, "bin": { "zx": "build/cli.js" diff --git a/package.json b/package.json index f2240bf4..514a9b18 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, "config": { "vscode": { - "version": "1.94.2", - "ref": "1.94.2", - "commit": "384ff7382de624fb94dbaf6da11977bba1ecd427" + "version": "1.95.1", + "ref": "1.95.1", + "commit": "65edc4939843c90c34d61f4ce11704f09d3e5cb6" }, "monaco": { "ref": "v0.52.0", @@ -41,26 +41,26 @@ } }, "devDependencies": { - "@babel/core": "^7.25.7", + "@babel/core": "^7.26.0", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.25.7", - "@babel/preset-env": "^7.25.7", - "@babel/preset-typescript": "^7.25.7", + "@babel/plugin-proposal-decorators": "^7.25.9", + "@babel/preset-env": "^7.26.0", + "@babel/preset-typescript": "^7.26.0", "@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": "^28.0.0", - "@rollup/plugin-dynamic-import-vars": "^2.1.3", + "@rollup/plugin-commonjs": "^28.0.1", + "@rollup/plugin-dynamic-import-vars": "^2.1.5", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.3.0", "@rollup/plugin-replace": "^6.0.1", - "@rollup/plugin-typescript": "^12.1.0", + "@rollup/plugin-typescript": "^12.1.1", "@types/mime-types": "^2.1.4", "@types/node": "18.19.8", "@types/semver": "^7.5.8", - "@types/vscode": "~1.94.0", + "@types/vscode": "~1.95.0", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.33", "@types/yauzl": "^2.10.3", @@ -84,7 +84,7 @@ "patch-package": "^8.0.0", "prettier": "^3.3.3", "recast": "^0.23.9", - "rollup": "^4.24.0", + "rollup": "^4.24.4", "rollup-plugin-copy": "^3.5.0", "rollup-plugin-dts": "^6.1.1", "rollup-plugin-styles": "^4.0.0", @@ -93,16 +93,16 @@ "ts-morph": "^22.0.0", "ts-node": "^10.9.2", "type-fest": "^4.26.1", - "typescript": "^5.6.2", + "typescript": "^5.6.3", "vscode-semver": "npm:semver@=5.5.0", "yargs": "^17.7.2", - "zx": "^8.1.9" + "zx": "^8.2.0" }, "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", "@parcel/watcher": "2.1.0", - "@rollup/pluginutils": "^5.1.2", + "@rollup/pluginutils": "^5.1.3", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", @@ -111,23 +111,23 @@ "@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.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", + "@xterm/addon-clipboard": "^0.2.0-beta.48", + "@xterm/addon-image": "^0.9.0-beta.65", + "@xterm/addon-search": "^0.16.0-beta.65", + "@xterm/addon-serialize": "^0.14.0-beta.65", + "@xterm/addon-unicode11": "^0.9.0-beta.65", + "@xterm/addon-webgl": "^0.19.0-beta.65", + "@xterm/headless": "^5.6.0-beta.65", + "@xterm/xterm": "^5.6.0-beta.65", + "cookie": "^0.7.2", "css-url-parser": "^1.1.4", - "jschardet": "3.1.3", + "jschardet": "3.1.4", "kerberos": "2.1.1", "keytar": "^7.9.0", "marked": "~14.0.0", - "memfs": "^4.12.0", + "memfs": "^4.14.0", "mime-types": "^2.1.35", - "node-pty": "1.1.0-beta21", + "node-pty": "^1.1.0-beta22", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.1.0", @@ -143,7 +143,7 @@ "@semantic-release/github": "^10.3.4" }, "volta": { - "node": "18.19.0", - "npm": "10.7.0" + "node": "20.18.0", + "npm": "10.9.0" } } diff --git a/rollup/rollup-metadata-plugin.ts b/rollup/rollup-metadata-plugin.ts index 9a08200c..e6654fb2 100644 --- a/rollup/rollup-metadata-plugin.ts +++ b/rollup/rollup-metadata-plugin.ts @@ -3,12 +3,14 @@ import { builtinModules } from 'module' interface Group { name: string + publicName?: string modules: Set entrypoints: Set dependencies: Set groupDependencies: Set // A greater priority means the that this group will be chosen for module present in multiple groups priority: number + isCombination: boolean } interface GroupResult { @@ -16,6 +18,7 @@ interface GroupResult { directDependencies: Set exclusiveModules: Set entrypoints: Set + isCombination: boolean } interface Options { @@ -26,18 +29,29 @@ interface Options { ) => { name: string; publicName?: string; priority?: number } handle( this: PluginContext, - group: GroupResult, - moduleGroupName: Map, - otherDependencies: Set, - options: OutputOptions, - bundle: OutputBundle + params: { + group: GroupResult + moduleGroupName: Map + otherDependencies: Set + otherModules: Set + options: OutputOptions + bundle: OutputBundle + } ): void | Promise + // Should shared modules be put in new combination groups + // By default, they are put in the group with the highest priority + generateCombinationGroups?: boolean + getCombinedGroup?: (names: string[]) => { name: string; publicName?: string } + minCompinedGroupSize?: number } export default ({ handle, getGroup = () => ({ name: 'main' }), - stage = 'generateBundle' + stage = 'generateBundle', + generateCombinationGroups = false, + getCombinedGroup = (names) => ({ name: names.reduce((a, b) => `${a}_${b}`) }), + minCompinedGroupSize = 10 }: Options): Plugin => ({ name: 'generate-metadata', [stage]: async function (this: PluginContext, options: OutputOptions, bundle: OutputBundle) { @@ -102,11 +116,13 @@ export default ({ if (!groups.has(groupName)) { groups.set(groupName, { entrypoints: new Set(), + publicName, name: groupName, modules: new Set(), dependencies: new Set(), groupDependencies: new Set(), - priority: priority ?? 0 + priority: priority ?? 0, + isCombination: false }) } const group = groups.get(groupName)! @@ -119,14 +135,6 @@ export default ({ } } - for (const group of groups.values()) { - group.groupDependencies = new Set( - Array.from(group.dependencies) - .map((d) => groupByPublicName.get(d)?.name) - .filter((g): g is string => g != null) - ) - } - const moduleGroups = new Map() for (const [_, group] of groups.entries()) { for (const module of group.modules) { @@ -138,18 +146,68 @@ export default ({ } const moduleGroup = new Map() - for (const [id, groups] of moduleGroups.entries()) { + const combinedModuleGroup = new Map() + for (const [id, currentModuleGroups] of moduleGroups.entries()) { // Find a group that everyone depends on - const greatestPriority = Math.max(...groups.map((g) => g.priority)) - const priorityGroups = groups.filter((g) => g.priority >= greatestPriority) - moduleGroup.set( - id, - priorityGroups.find((group) => - priorityGroups - .filter((ogroup) => ogroup !== group) - .every((ogroup) => ogroup.groupDependencies.has(group.name)) - ) ?? null + const greatestPriority = Math.max(...currentModuleGroups.map((g) => g.priority)) + const priorityGroups = currentModuleGroups.filter((g) => g.priority >= greatestPriority) + + const groupThatEveryOneDependsOn = priorityGroups.find((group) => + priorityGroups + .filter((ogroup) => ogroup !== group) + .every((ogroup) => ogroup.groupDependencies.has(group.name)) ) + moduleGroup.set(id, groupThatEveryOneDependsOn ?? null) + + if (generateCombinationGroups && groupThatEveryOneDependsOn == null) { + const newGroup = getCombinedGroup(priorityGroups.map((g) => g.name)) + let group = groups.get(newGroup.name) + if (group == null) { + // The combination group doesn't exists yet + group = { + entrypoints: new Set(), + name: newGroup.name, + publicName: newGroup.publicName, + modules: new Set(), + dependencies: new Set(), + groupDependencies: new Set(), + priority: 0, + isCombination: true + } + groups.set(newGroup.name, group) + if (newGroup.publicName != null) { + groupByPublicName.set(newGroup.publicName, group) + } + } + group.modules.add(id) + combinedModuleGroup.set(id, group) + } + } + + for (const group of groups.values()) { + group.groupDependencies = new Set( + Array.from(group.dependencies) + .map((d) => groupByPublicName.get(d)?.name) + .filter((g): g is string => g != null) + ) + } + + for (const [id, group] of combinedModuleGroup) { + if (group.modules.size < minCompinedGroupSize) { + // if the combined group is too small and if it doesn't have direct dependencies, remove it + groups.delete(group.name) + } else { + moduleGroup.set(id, group) + + if (group.publicName != null) { + const previousGroups = moduleGroups.get(id) + if (previousGroups != null) { + for (const previousGroup of previousGroups) { + previousGroup.dependencies.add(group.publicName) + } + } + } + } } const moduleGroupName = new Map( @@ -170,7 +228,8 @@ export default ({ directDependencies, entrypoints: group.entrypoints, exclusiveModules, - name + name, + isCombination: group.isCombination } }) @@ -179,15 +238,26 @@ export default ({ .map((set) => Array.from(set)) .flat() ) + const otherModules = new Set(Array.from(moduleGroups.keys())) for (const group of groupResults) { for (const directDependency of group.directDependencies) { otherDependencies.delete(directDependency) } + for (const exclusiveModule of group.exclusiveModules) { + otherModules.delete(exclusiveModule) + } } await Promise.all( groupResults.map(async (group) => { - await handle.call(this, group, moduleGroupName, otherDependencies, options, bundle) + await handle.call(this, { + group, + moduleGroupName, + otherDependencies, + otherModules, + options, + bundle + }) }) ) } diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index 0391d5b1..bb3c4308 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -18,7 +18,10 @@ import * as fs from 'node:fs' import * as nodePath from 'node:path' import { fileURLToPath } from 'node:url' import metadataPlugin from './rollup-metadata-plugin' -import pkg from '../package.json' assert { type: 'json' } + +const pkg = JSON.parse( + fs.readFileSync(new URL('../package.json', import.meta.url).pathname).toString() +) const __dirname = nodePath.dirname(fileURLToPath(import.meta.url)) @@ -829,6 +832,25 @@ export default (args: Record): rollup.RollupOptions[] => { } }, metadataPlugin({ + generateCombinationGroups: true, + getCombinedGroup(names) { + const name = names + .slice() + .sort() + .map((groupName) => { + const match = /^(.*):(.*)$/.exec(groupName) + if (match == null) { + return groupName + } + const [_, _category, name] = match + return name + }) + .join('-') + return { + name: `common:${name}`, + publicName: `@codingame/monaco-vscode-${name}-common` + } + }, // generate package.json and service-override packages getGroup(id: string, options) { const serviceOverrideDir = nodePath.resolve(options.dir!, 'service-override') @@ -861,7 +883,106 @@ export default (args: Record): rollup.RollupOptions[] => { priority: 1 } }, - async handle(group, moduleGroupName, otherDependencies, options, bundle) { + async handle({ group, moduleGroupName, otherDependencies, otherModules, bundle }) { + const customResolutionPlugin = ({ + customLoad, + forMain = false + }: { + customLoad: (id: string) => string | undefined + forMain?: boolean + }) => + { + name: 'custom-resolution', + resolveId(source, importer) { + if (source === 'entrypoint' || source === 'worker') { + return source + } + if (source.startsWith('@codingame/monaco-vscode-')) { + return { + external: true, + id: source + } + } + const importerDir = nodePath.dirname( + nodePath.resolve(DIST_DIR_MAIN, importer ?? '/') + ) + const resolved = nodePath.resolve(importerDir, source) + const resolvedWithExtension = resolved.endsWith('.js') + ? resolved + : `${resolved}.js` + + const isVscodeFile = resolved.startsWith(VSCODE_SRC_DIST_DIR) + const isServiceOverride = + nodePath.dirname(resolved) === DIST_SERVICE_OVERRIDE_DIR_MAIN + const isExclusive = group.exclusiveModules.has(resolvedWithExtension) + const pathFromRoot = nodePath.relative(DIST_DIR_MAIN, resolvedWithExtension) + const shouldBeShared = SHARED_ROOT_FILES_BETWEEN_PACKAGES.includes( + nodePath.relative(DIST_DIR_MAIN, resolvedWithExtension) + ) + if (pathFromRoot.startsWith('external/') && !isExclusive) { + if (forMain) { + return undefined + } + return { + external: true, + id: `vscode/${pathFromRoot}` + } + } + + if (((isVscodeFile || isServiceOverride) && !isExclusive) || shouldBeShared) { + function getPackageFromGroupName(groupName: string) { + if (groupName === 'main') { + return 'vscode' + } + const [_, category, name] = /^(.*):(.*)$/.exec(groupName)! + return `@codingame/monaco-vscode-${name}-${category}` + } + const importFromGroup = isVscodeFile + ? (moduleGroupName.get(resolved) ?? 'main') + : 'main' + if (importFromGroup === 'main' && forMain) { + return undefined + } + + const importFromModule = getPackageFromGroupName(importFromGroup) + // Those modules will be imported from external monaco-vscode-api + let externalResolved = resolved.startsWith(VSCODE_SRC_DIST_DIR) + ? `${importFromModule}/vscode/${nodePath.relative(VSCODE_SRC_DIST_DIR, resolved)}` + : `${importFromModule}/${nodePath.relative(DIST_DIR_MAIN, resolved)}` + if (externalResolved.endsWith('.js')) { + externalResolved = externalResolved.slice(0, -3) + } + return { + id: externalResolved, + external: true + } + } + + return undefined + }, + load(id) { + const customLoadResult = customLoad(id) + if (customLoadResult != null) { + return customLoadResult + } + if (id.startsWith('vscode/')) { + return ( + bundle[nodePath.relative('vscode', id)] as rollup.OutputChunk | undefined + )?.code + } + return ( + bundle[nodePath.relative(DIST_DIR_MAIN, id)] as rollup.OutputChunk | undefined + )?.code + }, + resolveFileUrl(options) { + let relativePath = options.relativePath + if (!relativePath.startsWith('.')) { + relativePath = `./${options.relativePath}` + } + return `'${relativePath}'` + } + } + if (group.name === 'main') { const dependencies = new Set([...group.directDependencies, ...otherDependencies]) const externalMainDependencies = Object.fromEntries( @@ -871,7 +992,7 @@ export default (args: Record): rollup.RollupOptions[] => { (d) => !ALLOWED_MAIN_DEPENDENCIES.has(d) ) if (notAllowedDependencies.length > 0) { - this.error( + this.warn( `Not allowed dependencies detected in main package: ${notAllowedDependencies.join(', ')}` ) } @@ -974,6 +1095,52 @@ export default (args: Record): rollup.RollupOptions[] => { source: JSON.stringify(packageJson, null, 2), type: 'asset' }) + + const groupBundle = await rollup.rollup({ + input: Array.from([...group.exclusiveModules, ...otherModules]), + external, + treeshake: false, + plugins: [ + importMetaAssets({ + include: ['**/*.ts', '**/*.js'] + }), + nodeResolve({ + extensions: EXTENSIONS + }), + customResolutionPlugin({ + forMain: true, + customLoad() { + return undefined + } + }) + ] + }) + const output = await groupBundle.generate({ + preserveModules: true, + preserveModulesRoot: nodePath.resolve(DIST_DIR, 'main'), + minifyInternalExports: false, + assetFileNames: 'assets/[name][extname]', + format: 'esm', + dir: nodePath.resolve(DIST_DIR, 'main'), + entryFileNames: '[name].js', + chunkFileNames: '[name].js', + hoistTransitiveImports: false + }) + for (const chunkOrAsset of output.output) { + if (chunkOrAsset.type === 'chunk') { + this.emitFile({ + type: 'prebuilt-chunk', + code: chunkOrAsset.code, + fileName: chunkOrAsset.fileName, + exports: chunkOrAsset.exports, + map: chunkOrAsset.map ?? undefined, + sourcemapFileName: chunkOrAsset.sourcemapFileName ?? undefined + }) + } + bundle[chunkOrAsset.fileName] = chunkOrAsset + } + + await groupBundle.close() } else if (group.name === 'editor.api') { const directory = nodePath.resolve(DIST_DIR, 'editor-api') @@ -1032,89 +1199,16 @@ export default (args: Record): rollup.RollupOptions[] => { nodeResolve({ extensions: EXTENSIONS }), - { - name: 'loader', - resolveId(source, importer) { - if (source === 'entrypoint') { - return source - } - if (source.startsWith('@codingame/monaco-vscode-')) { - return { - external: true, - id: source - } - } - const importerDir = nodePath.dirname( - nodePath.resolve(DIST_DIR_MAIN, importer ?? '/') - ) - const resolved = nodePath.resolve(importerDir, source) - const resolvedWithExtension = resolved.endsWith('.js') - ? resolved - : `${resolved}.js` - - const isVscodeFile = resolved.startsWith(VSCODE_SRC_DIST_DIR) - const isServiceOverride = - nodePath.dirname(resolved) === DIST_SERVICE_OVERRIDE_DIR_MAIN - const isExclusive = group.exclusiveModules.has(resolvedWithExtension) - const pathFromRoot = nodePath.relative(DIST_DIR_MAIN, resolvedWithExtension) - const shouldBeShared = SHARED_ROOT_FILES_BETWEEN_PACKAGES.includes( - nodePath.relative(DIST_DIR_MAIN, resolvedWithExtension) - ) - if (pathFromRoot.startsWith('external/') && !isExclusive) { - return { - external: true, - id: `vscode/${pathFromRoot}` - } - } - if (((isVscodeFile || isServiceOverride) && !isExclusive) || shouldBeShared) { - function getPackageFromGroupName(groupName: string) { - if (groupName === 'main') { - return 'vscode' - } - const [_, category, name] = /^(.*):(.*)$/.exec(groupName)! - return `@codingame/monaco-vscode-${name}-${category}` - } - const importFromGroup = isVscodeFile - ? (moduleGroupName.get(resolved) ?? 'main') - : 'main' - const importFromModule = getPackageFromGroupName(importFromGroup) - // Those modules will be imported from external monaco-vscode-api - let externalResolved = resolved.startsWith(VSCODE_SRC_DIST_DIR) - ? `${importFromModule}/vscode/${nodePath.relative(VSCODE_SRC_DIST_DIR, resolved)}` - : `${importFromModule}/${nodePath.relative(DIST_DIR_MAIN, resolved)}` - if (externalResolved.endsWith('.js')) { - externalResolved = externalResolved.slice(0, -3) - } - return { - id: externalResolved, - external: true - } - } - - return undefined - }, - load(id) { + customResolutionPlugin({ + customLoad: (id) => { if (id === 'entrypoint') { return `export * from '${Array.from(group.entrypoints)[0]!.slice(0, -3)}'` } - if (id.startsWith('vscode/')) { - return ( - bundle[nodePath.relative('vscode', id)] as rollup.OutputChunk | undefined - )?.code - } - return ( - bundle[nodePath.relative(DIST_DIR_MAIN, id)] as - | rollup.OutputChunk - | undefined - )?.code - }, - resolveFileUrl(options) { - let relativePath = options.relativePath - if (!relativePath.startsWith('.')) { - relativePath = `./${options.relativePath}` - } - return `'${relativePath}'` - }, + return undefined + } + }), + { + name: 'bundle-generator', generateBundle() { this.emitFile({ fileName: 'package.json', @@ -1161,6 +1255,123 @@ export default (args: Record): rollup.RollupOptions[] => { for (const exclusiveModule of group.exclusiveModules) { delete bundle[nodePath.relative(DIST_DIR_MAIN, exclusiveModule)] } + } else if (group.isCombination) { + const [_, category, name] = /^(.*):(.*)$/.exec(group.name)! + + const directory = nodePath.resolve(DIST_DIR, `${category}-${name}`) + + await fs.promises.mkdir(directory, { + recursive: true + }) + + const packageJson: PackageJson = { + name: `@codingame/monaco-vscode-${name}-${category}`, + ...Object.fromEntries( + Object.entries(pkg).filter(([key]) => + ['version', 'keywords', 'author', 'license', 'repository', 'type'].includes(key) + ) + ), + private: false, + description: `${pkg.description} - ${name} ${category}`, + exports: { + '.': { + default: './empty.js' + }, + './vscode/*': { + default: './src/*.js' + } + } + } + + const groupBundle = await rollup.rollup({ + input: Array.from(group.exclusiveModules), + external, + treeshake: false, + plugins: [ + importMetaAssets({ + include: ['**/*.ts', '**/*.js'] + // assets are externals and this plugin is not able to ignore external assets + }), + nodeResolve({ + extensions: EXTENSIONS + }), + customResolutionPlugin({ + customLoad() { + return undefined + } + }), + { + name: 'bundle-generator', + generateBundle() { + const externalDependencies = Array.from(this.getModuleIds()).filter( + (id) => this.getModuleInfo(id)!.isExternal + ) + + const uniqueExternalDependencies = new Set( + externalDependencies.flatMap((dep) => { + const match = /((?:@[^/]+?\/)?[^/]*)(?:\/.*)?/.exec(dep) + if (match == null) { + return [] + } + return [match[1]!] + }) + ) + packageJson.dependencies = { + vscode: `npm:${pkg.name}@^${pkg.version}`, + ...Object.fromEntries( + Object.entries(pkg.dependencies).filter(([key]) => + uniqueExternalDependencies.has(key) + ) + ), + ...Object.fromEntries( + Array.from(uniqueExternalDependencies) + .filter((dep) => dep.startsWith('@codingame/monaco-vscode-')) + .map((dep) => { + return [dep, pkg.version] + }) + ) + } + + this.emitFile({ + fileName: 'empty.js', + needsCodeReference: false, + source: 'export {}', + type: 'asset' + }) + this.emitFile({ + fileName: 'package.json', + needsCodeReference: false, + source: JSON.stringify(packageJson, null, 2), + type: 'asset' + }) + } + } + ] + }) + const output = await groupBundle.write({ + preserveModules: true, + preserveModulesRoot: nodePath.resolve(DIST_DIR, 'main/vscode'), + minifyInternalExports: false, + assetFileNames: 'assets/[name][extname]', + format: 'esm', + dir: directory, + entryFileNames: '[name].js', + chunkFileNames: '[name].js', + hoistTransitiveImports: false + }) + await groupBundle.close() + + // remove exclusive files from main bundle to prevent them from being duplicated + for (const exclusiveModule of group.exclusiveModules) { + delete bundle[nodePath.relative(DIST_DIR_MAIN, exclusiveModule)] + } + + const assets = output.output + .filter((file): file is rollup.OutputAsset => file.type === 'asset') + .filter((file) => file.fileName !== 'package.json') + for (const asset of assets) { + delete bundle[asset.fileName] + } } else { const [_, category, name] = /^(.*):(.*)$/.exec(group.name)! @@ -1202,19 +1413,6 @@ export default (args: Record): rollup.RollupOptions[] => { } } : {}) - }, - dependencies: { - vscode: `npm:${pkg.name}@^${pkg.version}`, - ...Object.fromEntries( - Object.entries(pkg.dependencies).filter(([key]) => - group.directDependencies.has(key) - ) - ), - ...Object.fromEntries( - Array.from(group.directDependencies) - .filter((dep) => dep.startsWith('@codingame/monaco-vscode-')) - .map((dep) => [dep, pkg.version]) - ) } } @@ -1239,69 +1437,8 @@ export default (args: Record): rollup.RollupOptions[] => { nodeResolve({ extensions: EXTENSIONS }), - { - name: 'loader', - resolveId(source, importer) { - if (source === 'entrypoint' || source === 'worker') { - return source - } - if (source.startsWith('@codingame/monaco-vscode-')) { - return { - external: true, - id: source - } - } - const importerDir = nodePath.dirname( - nodePath.resolve(DIST_DIR_MAIN, importer ?? '/') - ) - const resolved = nodePath.resolve(importerDir, source) - const resolvedWithExtension = resolved.endsWith('.js') - ? resolved - : `${resolved}.js` - - const isVscodeFile = resolved.startsWith(VSCODE_SRC_DIST_DIR) - const isServiceOverride = - nodePath.dirname(resolved) === DIST_SERVICE_OVERRIDE_DIR_MAIN - const isExclusive = group.exclusiveModules.has(resolvedWithExtension) - const pathFromRoot = nodePath.relative(DIST_DIR_MAIN, resolvedWithExtension) - const shouldBeShared = SHARED_ROOT_FILES_BETWEEN_PACKAGES.includes( - nodePath.relative(DIST_DIR_MAIN, resolvedWithExtension) - ) - if (pathFromRoot.startsWith('external/') && !isExclusive) { - return { - external: true, - id: `vscode/${pathFromRoot}` - } - } - - if (((isVscodeFile || isServiceOverride) && !isExclusive) || shouldBeShared) { - function getPackageFromGroupName(groupName: string) { - if (groupName === 'main') { - return 'vscode' - } - const [_, category, name] = /^(.*):(.*)$/.exec(groupName)! - return `@codingame/monaco-vscode-${name}-${category}` - } - const importFromGroup = isVscodeFile - ? (moduleGroupName.get(resolved) ?? 'main') - : 'main' - const importFromModule = getPackageFromGroupName(importFromGroup) - // Those modules will be imported from external monaco-vscode-api - let externalResolved = resolved.startsWith(VSCODE_SRC_DIST_DIR) - ? `${importFromModule}/vscode/${nodePath.relative(VSCODE_SRC_DIST_DIR, resolved)}` - : `${importFromModule}/${nodePath.relative(DIST_DIR_MAIN, resolved)}` - if (externalResolved.endsWith('.js')) { - externalResolved = externalResolved.slice(0, -3) - } - return { - id: externalResolved, - external: true - } - } - - return undefined - }, - load(id) { + customResolutionPlugin({ + customLoad(id) { if (id === 'entrypoint') { const codeLines: string[] = [] if ((entrypointInfo.exports ?? []).includes('default')) { @@ -1322,25 +1459,40 @@ export default (args: Record): rollup.RollupOptions[] => { if (id === 'worker') { return `import '${workerEntryPoint}'` } - if (id.startsWith('vscode/')) { - return ( - bundle[nodePath.relative('vscode', id)] as rollup.OutputChunk | undefined - )?.code - } - return ( - bundle[nodePath.relative(DIST_DIR_MAIN, id)] as - | rollup.OutputChunk - | undefined - )?.code - }, - resolveFileUrl(options) { - let relativePath = options.relativePath - if (!relativePath.startsWith('.')) { - relativePath = `./${options.relativePath}` - } - return `'${relativePath}'` - }, + return undefined + } + }), + { + name: 'bundle-generator', generateBundle() { + const externalDependencies = Array.from(this.getModuleIds()).filter( + (id) => this.getModuleInfo(id)!.isExternal + ) + + const uniqueExternalDependencies = new Set( + externalDependencies.flatMap((dep) => { + const match = /((?:@[^/]+?\/)?[^/]*)(?:\/.*)?/.exec(dep) + if (match == null) { + return [] + } + return [match[1]!] + }) + ) + packageJson.dependencies = { + vscode: `npm:${pkg.name}@^${pkg.version}`, + ...Object.fromEntries( + Object.entries(pkg.dependencies).filter(([key]) => + uniqueExternalDependencies.has(key) + ) + ), + ...Object.fromEntries( + Array.from(uniqueExternalDependencies) + .filter((dep) => dep.startsWith('@codingame/monaco-vscode-')) + .map((dep) => { + return [dep, pkg.version] + }) + ) + } this.emitFile({ fileName: 'package.json', needsCodeReference: false, diff --git a/rollup/rollup.default-extensions.ts b/rollup/rollup.default-extensions.ts index 65cce116..7eeba2a6 100644 --- a/rollup/rollup.default-extensions.ts +++ b/rollup/rollup.default-extensions.ts @@ -8,7 +8,9 @@ import * as path from 'path' import { fileURLToPath } from 'url' import metadataPlugin from './rollup-metadata-plugin' import extensionDirectoryPlugin from '../dist/rollup-extension-directory-plugin/rollup-extension-directory-plugin.js' -import pkg from '../package.json' assert { type: 'json' } +const pkg = JSON.parse( + fs.readFileSync(new URL('../package.json', import.meta.url).pathname).toString() +) const __dirname = path.dirname(fileURLToPath(import.meta.url)) @@ -101,7 +103,7 @@ export default rollup.defineConfig([ } }), metadataPlugin({ - handle({ directDependencies }, moduleGroupName, otherDependencies, options, bundle) { + handle({ group: { directDependencies }, bundle }) { const entrypoint = Object.values(bundle).filter( (v) => (v as rollup.OutputChunk).isEntry )[0]!.fileName @@ -189,7 +191,7 @@ ${extensions.map((name) => ` whenReady${pascalCase(name)}()`).join(',\n')} } }, metadataPlugin({ - handle({ directDependencies }, moduleGroupName, otherDependencies, options, bundle) { + handle({ group: { directDependencies }, bundle }) { const entrypoint = Object.values(bundle).filter( (v) => (v as rollup.OutputChunk).isEntry )[0]!.fileName diff --git a/rollup/rollup.language-packs.ts b/rollup/rollup.language-packs.ts index 6ac20628..62448667 100644 --- a/rollup/rollup.language-packs.ts +++ b/rollup/rollup.language-packs.ts @@ -7,7 +7,9 @@ import * as fs from 'fs' import * as path from 'path' import { fileURLToPath } from 'url' import * as fsPromise from 'fs/promises' -import pkg from '../package.json' assert { type: 'json' } +const pkg = JSON.parse( + fs.readFileSync(new URL('../package.json', import.meta.url).pathname).toString() +) const __dirname = path.dirname(fileURLToPath(import.meta.url)) diff --git a/rollup/rollup.monaco.ts b/rollup/rollup.monaco.ts index d466df5f..cbfd2d10 100644 --- a/rollup/rollup.monaco.ts +++ b/rollup/rollup.monaco.ts @@ -4,8 +4,11 @@ import { PackageJson } from 'type-fest' import replace from '@rollup/plugin-replace' import glob from 'fast-glob' import * as path from 'path' +import * as fs from 'fs' import { fileURLToPath } from 'url' -import pkg from '../package.json' assert { type: 'json' } +const pkg = JSON.parse( + fs.readFileSync(new URL('../package.json', import.meta.url).pathname).toString() +) const __dirname = path.dirname(fileURLToPath(import.meta.url)) diff --git a/rollup/rollup.rollup-plugins.config.ts b/rollup/rollup.rollup-plugins.config.ts index 5b7d6e44..43274473 100644 --- a/rollup/rollup.rollup-plugins.config.ts +++ b/rollup/rollup.rollup-plugins.config.ts @@ -6,8 +6,11 @@ import json from '@rollup/plugin-json' import { PackageJson } from 'type-fest' import * as path from 'path' import { fileURLToPath } from 'url' +import * as fs from 'fs' import metadataPlugin from './rollup-metadata-plugin' -import pkg from '../package.json' assert { type: 'json' } +const pkg = JSON.parse( + fs.readFileSync(new URL('../package.json', import.meta.url).pathname).toString() +) const __dirname = path.dirname(fileURLToPath(import.meta.url)) const EXTENSIONS = ['', '.ts', '.js'] @@ -58,7 +61,7 @@ const config: rollup.RollupOptions[] = [ preferConst: false }), metadataPlugin({ - handle({ directDependencies }) { + handle({ group: { directDependencies } }) { const packageJson: PackageJson = { name: `@codingame/monaco-vscode-${path.basename(output)}`, ...Object.fromEntries( @@ -73,7 +76,9 @@ const config: rollup.RollupOptions[] = [ types: `${path.basename(output)}.d.ts`, dependencies: { ...Object.fromEntries( - Object.entries(pkg.dependencies).filter(([key]) => directDependencies.has(key)) + Object.entries(pkg.dependencies as Record).filter(([key]) => + directDependencies.has(key) + ) ) } } diff --git a/rollup/rollup.types.config.ts b/rollup/rollup.types.config.ts index 0c5cd0fa..2e669f8c 100644 --- a/rollup/rollup.types.config.ts +++ b/rollup/rollup.types.config.ts @@ -173,13 +173,11 @@ export default rollup.defineConfig( priority: 1 } }, - async handle( - { name: groupName, exclusiveModules, entrypoints }, + async handle({ + group: { name: groupName, exclusiveModules, entrypoints }, moduleGroupName, - otherDependencies, - options, bundle - ) { + }) { if (groupName === 'main') { return } diff --git a/scripts/install-vscode b/scripts/install-vscode index fbde98fa..8cfad263 100755 --- a/scripts/install-vscode +++ b/scripts/install-vscode @@ -35,13 +35,11 @@ echo "Patching vscode..." find "$patch_directory" -type f -name '*.patch' -print0 | sort -z | xargs -t -0 -n 1 patch -p1 -i echo "Installing vscode dependencies..." -yarn config set ignore-engines -yarn install --ignore-scripts -yarn postinstall || true +npm ci echo "Installing build dependencies" cd build -yarn install --ignore-engines +npm ci cd .. echo "Extracting service identifiers" @@ -60,7 +58,7 @@ cp -R .build/web/extensions "$extension_output_directory" # Remove useless files cd src rm -rf `find . -name '*.test.ts' -o -name 'test' -o -name 'electron-browser'` -rm -f bootstrap*.js *main.js *cli.js +rm -f bootstrap*.ts *main.ts *cli.ts rm -rf vs/code cd .. diff --git a/src/extension.api.ts b/src/extension.api.ts index 90cdbf1a..25603ecb 100644 --- a/src/extension.api.ts +++ b/src/extension.api.ts @@ -310,11 +310,9 @@ const api: typeof vscode = { ChatRequestNotebookData: extHostTypes.ChatRequestNotebookData, ChatResponseMovePart: extHostTypes.ChatResponseMovePart, LanguageModelChatMessageRole: extHostTypes.LanguageModelChatMessageRole, - LanguageModelChatMessage: extHostTypes.LanguageModelChatMessage, - LanguageModelChatResponseTextPart: extHostTypes.LanguageModelTextPart, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + LanguageModelChatMessage: extHostTypes.LanguageModelChatMessage, LanguageModelError: extHostTypes.LanguageModelError, - LanguageModelChatResponseToolCallPart: extHostTypes.LanguageModelToolCallPart, - LanguageModelChatMessageToolResultPart: extHostTypes.LanguageModelToolResultPart, NewSymbolName: extHostTypes.NewSymbolName, NewSymbolNameTag: extHostTypes.NewSymbolNameTag, NewSymbolNameTriggerKind: extHostTypes.NewSymbolNameTriggerKind, @@ -323,7 +321,15 @@ const api: typeof vscode = { ExcludeSettingOptions: searchExtTypes.ExcludeSettingOptions, TextSearchContextNew: searchExtTypes.TextSearchContextNew, TextSearchMatchNew: searchExtTypes.TextSearchMatchNew, - ChatResponseCodeblockUriPart: extHostTypes.ChatResponseCodeblockUriPart + ChatResponseCodeblockUriPart: extHostTypes.ChatResponseCodeblockUriPart, + ChatEditingSessionActionOutcome: extHostTypes.ChatEditingSessionActionOutcome, + LanguageModelChatToolMode: extHostTypes.LanguageModelChatToolMode, + LanguageModelToolCallPart: extHostTypes.LanguageModelToolCallPart, + LanguageModelToolResultPart: extHostTypes.LanguageModelToolResultPart, + LanguageModelTextPart: extHostTypes.LanguageModelTextPart, + LanguageModelPromptTsxPart: extHostTypes.LanguageModelPromptTsxPart, + LanguageModelToolResult: extHostTypes.LanguageModelToolResult, + ChatReferenceBinaryData: extHostTypes.ChatReferenceBinaryData } // @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 d25aa10e..8a385470 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -148,7 +148,7 @@ import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/comm import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff.service' import { ISCMService, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm.service' import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace.service' -import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel.service' +import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchTreeModel/searchViewModelWorkbenchService.service' import { INotebookSearchService } from 'vs/workbench/contrib/search/common/notebookSearch.service' import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService.service' import { IShareService } from 'vs/workbench/contrib/share/common/share.service' @@ -316,6 +316,7 @@ import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMap 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 { ILanguageModelIgnoredFilesService } from 'vs/workbench/contrib/chat/common/ignoredFiles.service' import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n' import { unsupported } from './tools' @@ -397,6 +398,7 @@ registerSingleton(IEditorService, EditorService, InstantiationType.Eager) class PaneCompositePartService implements IPaneCompositePartService { readonly _serviceBrand = undefined + getPaneCompositeIds = () => [] onDidPaneCompositeOpen = Event.None onDidPaneCompositeClose = Event.None openPaneComposite = async () => undefined @@ -1260,6 +1262,7 @@ registerSingleton(ILanguageStatusService, LanguageStatusService, InstantiationTy class HostService implements IHostService { _serviceBrand: undefined + getScreenshot = async () => undefined getPathForFile = () => undefined onDidChangeFullScreen = Event.None onDidChangeFocus = Event.None @@ -2365,6 +2368,7 @@ registerSingleton( class MonacoSearchService implements ISearchService { _serviceBrand: undefined constructor(@IModelService private modelService: IModelService) {} + schemeHasFileSearchProvider = () => false getAIName = async () => undefined @Unsupported aiTextSearch(): never { @@ -4204,6 +4208,7 @@ class TerminalGroupService implements ITerminalGroupService { registerSingleton(ITerminalGroupService, TerminalGroupService, InstantiationType.Delayed) class TerminalInstanceService implements ITerminalInstanceService { _serviceBrand: undefined + onDidRegisterBackend = Event.None getRegisteredBackends = () => [].values() onDidCreateInstance = Event.None @Unsupported @@ -4433,6 +4438,7 @@ registerSingleton(ITerminalQuickFixService, TerminalQuickFixService, Instantiati class UserDataSyncWorkbenchService implements IUserDataSyncWorkbenchService { _serviceBrand: undefined + onDidTurnOnSync = Event.None enabled = false authenticationProviders = [] all = [] @@ -6026,6 +6032,9 @@ registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService, Insta class ChatWidgetService implements IChatWidgetService { _serviceBrand: undefined + onDidAddWidget = Event.None + getAllWidgets = () => [] + getWidgetByLocation = () => [] getWidgetBySessionId = () => undefined lastFocusedWidget = undefined @Unsupported @@ -6562,6 +6571,7 @@ registerSingleton( class TestProfileService implements ITestProfileService { _serviceBrand: undefined + getDefaultProfileForTest = () => undefined onDidChange = Event.None @Unsupported addProfile(): never { @@ -6920,6 +6930,13 @@ registerSingleton( class TestExplorerFilterState implements ITestExplorerFilterState { _serviceBrand: undefined + onDidSelectTestInExplorer = Event.None + + @Unsupported + didSelectTestInExplorer(): never { + unsupported() + } + @Unsupported get text() { return unsupported() @@ -8079,6 +8096,8 @@ registerSingleton(IIssueFormService, IssueFormService, InstantiationType.Delayed class CodeMapperService implements ICodeMapperService { _serviceBrand: undefined + mapCodeFromResponse = async () => undefined + @Unsupported registerCodeMapperProvider(): never { unsupported() @@ -8090,6 +8109,38 @@ registerSingleton(ICodeMapperService, CodeMapperService, InstantiationType.Delay class ChatEditingService implements IChatEditingService { _serviceBrand: undefined + onDidChangeEditingSession = Event.None + + @Unsupported + get currentEditingSessionObs() { + return unsupported() + } + + currentAutoApplyOperation = null + editingSessionFileLimit = 0 + + @Unsupported + triggerEditComputation(): never { + unsupported() + } + + getEditingSession = () => null + + @Unsupported + createSnapshot(): never { + unsupported() + } + + @Unsupported + getSnapshotUri(): never { + unsupported() + } + + @Unsupported + restoreSnapshot(): never { + unsupported() + } + onDidCreateEditingSession = Event.None currentEditingSession = null @Unsupported @@ -8119,3 +8170,19 @@ registerSingleton( TreeSitterTokenizationFeature, InstantiationType.Delayed ) + +class LanguageModelIgnoredFilesService implements ILanguageModelIgnoredFilesService { + _serviceBrand: undefined + + fileIsIgnored = async () => false + + @Unsupported + registerIgnoredFileProvider(): never { + unsupported() + } +} +registerSingleton( + ILanguageModelIgnoredFilesService, + LanguageModelIgnoredFilesService, + InstantiationType.Delayed +) diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index 43205d0a..0f5a6c54 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -34,11 +34,13 @@ import { LanguageModelStatsService } from 'vs/workbench/contrib/chat/common/lang 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 { LanguageModelToolsService } from 'vs/workbench/contrib/chat/browser/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' +import { ChatEditingService } from 'vs/workbench/contrib/chat/browser/chatEditing/chatEditingService' +import { LanguageModelIgnoredFilesService } from 'vs/workbench/contrib/chat/common/ignoredFiles' +import { ILanguageModelIgnoredFilesService } from 'vs/workbench/contrib/chat/common/ignoredFiles.service' export default function getServiceOverride(): IEditorOverrideServices { return { [IChatService.toString()]: new SyncDescriptor(ChatService, [], true), @@ -70,6 +72,11 @@ export default function getServiceOverride(): IEditorOverrideServices { [], true ), + [ILanguageModelIgnoredFilesService.toString()]: new SyncDescriptor( + LanguageModelIgnoredFilesService, + [], + true + ), [IChatAgentNameService.toString()]: new SyncDescriptor(ChatAgentNameService, [], true), [ILanguageModelToolsService.toString()]: new SyncDescriptor( LanguageModelToolsService, diff --git a/src/service-override/extensions.ts b/src/service-override/extensions.ts index 5b42b519..f9a792c8 100644 --- a/src/service-override/extensions.ts +++ b/src/service-override/extensions.ts @@ -291,10 +291,10 @@ class ExtensionResourceLoaderServiceOverride extends ExtensionResourceLoaderServ let iframeAlternateDomains: string | undefined registerAssets({ - 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html': () => + 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain( new URL( - '../../vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html', + '../../vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html', import.meta.url ).href, iframeAlternateDomains @@ -318,7 +318,7 @@ export default function getServiceOverride( if (workerConfig != null) { registerAssets({ - 'vs/workbench/api/worker/extensionHostWorker.esm.js': () => workerConfig.url + 'vs/workbench/api/worker/extensionHostWorkerMain.js': () => workerConfig.url }) } diff --git a/src/service-override/search.ts b/src/service-override/search.ts index 1a06f2a4..6271e704 100644 --- a/src/service-override/search.ts +++ b/src/service-override/search.ts @@ -2,8 +2,8 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { ISearchService } from 'vs/workbench/services/search/common/search.service' import { SearchService } from 'vs/workbench/services/search/common/searchService' -import { SearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel' -import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchModel.service' +import { SearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchTreeModel/searchModel' +import { ISearchViewModelWorkbenchService } from 'vs/workbench/contrib/search/browser/searchTreeModel/searchViewModelWorkbenchService.service' import { SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService' import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService.service' import { IReplaceService } from 'vs/workbench/contrib/search/browser/replace.service' diff --git a/src/service-override/terminal.ts b/src/service-override/terminal.ts index 5f94e970..8165de8a 100644 --- a/src/service-override/terminal.ts +++ b/src/service-override/terminal.ts @@ -57,6 +57,10 @@ export { } from 'vs/workbench/contrib/terminal/browser/terminal.service' abstract class SimpleTerminalBackend implements ITerminalBackend { + installAutoReply = async (): Promise => {} + + uninstallAllAutoReplies = async (): Promise => {} + getLatency = async (): Promise => [] isResponsive = true diff --git a/src/workers/extensionHost.worker.ts b/src/workers/extensionHost.worker.ts index b57b0a52..6a259599 100644 --- a/src/workers/extensionHost.worker.ts +++ b/src/workers/extensionHost.worker.ts @@ -1 +1 @@ -import 'vs/workbench/api/worker/extensionHostWorker.esm.js' +import 'vs/workbench/api/worker/extensionHostWorkerMain.js' diff --git a/src/workers/languageDetection.worker.ts b/src/workers/languageDetection.worker.ts index 9b070e85..b2bb450b 100644 --- a/src/workers/languageDetection.worker.ts +++ b/src/workers/languageDetection.worker.ts @@ -1 +1 @@ -import 'vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.esm.js' +import 'vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.js' diff --git a/src/workers/localFileSearch.worker.ts b/src/workers/localFileSearch.worker.ts index f9f883dd..5d0a8925 100644 --- a/src/workers/localFileSearch.worker.ts +++ b/src/workers/localFileSearch.worker.ts @@ -1 +1 @@ -import 'vs/workbench/services/search/worker/localFileSearch.esm.js' +import 'vs/workbench/services/search/worker/localFileSearchMain.js' diff --git a/src/workers/notebook.worker.ts b/src/workers/notebook.worker.ts index 5d291673..a947aa57 100644 --- a/src/workers/notebook.worker.ts +++ b/src/workers/notebook.worker.ts @@ -1 +1 @@ -import 'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.esm.js' +import 'vs/workbench/contrib/notebook/common/services/notebookSimpleWorkerMain.js' diff --git a/src/workers/outputLinkComputer.worker.ts b/src/workers/outputLinkComputer.worker.ts index f2d8db7a..71690239 100644 --- a/src/workers/outputLinkComputer.worker.ts +++ b/src/workers/outputLinkComputer.worker.ts @@ -1 +1 @@ -import 'vs/workbench/contrib/output/common/outputLinkComputer.esm.js' +import 'vs/workbench/contrib/output/common/outputLinkComputerMain.js' diff --git a/src/workers/textmate.worker.ts b/src/workers/textmate.worker.ts index c182d656..359eb03d 100644 --- a/src/workers/textmate.worker.ts +++ b/src/workers/textmate.worker.ts @@ -1 +1 @@ -import 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.esm.js' +import 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.js' diff --git a/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch b/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch deleted file mode 100644 index e1d36806..00000000 --- a/vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch +++ /dev/null @@ -1,21 +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:40:57 +0100 -Subject: [PATCH] fix: allow importing vscode-oniguruma - ---- - .eslintrc.json | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/.eslintrc.json b/.eslintrc.json -index 879d547f9b5..6282847cafb 100644 ---- a/.eslintrc.json -+++ b/.eslintrc.json -@@ -731,6 +731,7 @@ - "v8-inspect-profiler", - "vscode-regexpp", - "vscode-textmate", -+ "vscode-oniguruma", - "worker_threads", - "@xterm/addon-clipboard", - "@xterm/addon-image", diff --git a/vscode-paches/0002-fix-fix-editor-api-types.patch b/vscode-paches/0001-fix-fix-editor-api-types.patch similarity index 90% rename from vscode-paches/0002-fix-fix-editor-api-types.patch rename to vscode-paches/0001-fix-fix-editor-api-types.patch index 01f54aec..120483fd 100644 --- a/vscode-paches/0002-fix-fix-editor-api-types.patch +++ b/vscode-paches/0001-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 0d55982a8aa..debdf037393 100644 +index 739c37fc677..ea10e2c1586 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js -@@ -239,7 +239,16 @@ function toExternalDTS(contents) { +@@ -229,7 +229,16 @@ function toExternalDTS(contents) { } if (line.indexOf('declare let MonacoEnvironment') === 0) { diff --git a/vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch b/vscode-paches/0002-cleanup-remove-amd-build-to-speed-up-editor-build.patch similarity index 87% rename from vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch rename to vscode-paches/0002-cleanup-remove-amd-build-to-speed-up-editor-build.patch index 87dc1cae..77db0c60 100644 --- a/vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch +++ b/vscode-paches/0002-cleanup-remove-amd-build-to-speed-up-editor-build.patch @@ -8,17 +8,17 @@ Subject: [PATCH] cleanup: remove amd build to speed up editor build 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js -index debdf037393..a5951d21d34 100644 +index ea10e2c1586..34576643c7d 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js -@@ -375,16 +375,9 @@ gulp.task('editor-distro', +@@ -365,16 +365,9 @@ gulp.task('editor-distro', util.rimraf('out-editor-min') ), extractEditorSrcTask, - task.parallel( - task.series( - compileEditorAMDTask, -- optimizeEditorAMDTask, +- bundleEditorAMDTask, - minifyEditorAMDTask - ), - task.series( diff --git a/vscode-paches/0004-feat-output-es2022.patch b/vscode-paches/0003-feat-output-es2022.patch similarity index 96% rename from vscode-paches/0004-feat-output-es2022.patch rename to vscode-paches/0003-feat-output-es2022.patch index 25e74c66..09f04dcd 100644 --- a/vscode-paches/0004-feat-output-es2022.patch +++ b/vscode-paches/0003-feat-output-es2022.patch @@ -20,7 +20,7 @@ index 9c7aacd4f11..9f6858a7801 100644 \ No newline at end of file +} diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json -index 1e138cf9085..a2a07d7b7d3 100644 +index d64d6bd8c8e..5d44f2b2e7c 100644 --- a/src/tsconfig.monaco.json +++ b/src/tsconfig.monaco.json @@ -8,8 +8,8 @@ diff --git a/vscode-paches/0005-fix-markdown-do-not-encode-i10l-location.patch b/vscode-paches/0004-fix-markdown-do-not-encode-i10l-location.patch similarity index 100% rename from vscode-paches/0005-fix-markdown-do-not-encode-i10l-location.patch rename to vscode-paches/0004-fix-markdown-do-not-encode-i10l-location.patch diff --git a/vscode-paches/0006-fix-typescript-handle-trailing-slash.patch b/vscode-paches/0005-fix-typescript-handle-trailing-slash.patch similarity index 100% rename from vscode-paches/0006-fix-typescript-handle-trailing-slash.patch rename to vscode-paches/0005-fix-typescript-handle-trailing-slash.patch diff --git a/vscode-paches/0007-fix-typescript-missing-default-value.patch b/vscode-paches/0006-fix-typescript-missing-default-value.patch similarity index 100% rename from vscode-paches/0007-fix-typescript-missing-default-value.patch rename to vscode-paches/0006-fix-typescript-missing-default-value.patch diff --git a/vscode-paches/0008-fix-typescript-handle-missing-case.patch b/vscode-paches/0007-fix-typescript-handle-missing-case.patch similarity index 100% rename from vscode-paches/0008-fix-typescript-handle-missing-case.patch rename to vscode-paches/0007-fix-typescript-handle-missing-case.patch diff --git a/vscode-paches/0009-feat-add-static-asset-url-mechanism.patch b/vscode-paches/0008-feat-add-static-asset-url-mechanism.patch similarity index 95% rename from vscode-paches/0009-feat-add-static-asset-url-mechanism.patch rename to vscode-paches/0008-feat-add-static-asset-url-mechanism.patch index db8c4d2e..bbe4e56c 100644 --- a/vscode-paches/0009-feat-add-static-asset-url-mechanism.patch +++ b/vscode-paches/0008-feat-add-static-asset-url-mechanism.patch @@ -4,15 +4,15 @@ Date: Mon, 11 Mar 2024 17:11:14 +0100 Subject: [PATCH] feat: add static asset url mechanism --- - src/vs/base/common/network.ts | 45 ++-- + src/vs/base/common/network.ts | 35 ++- .../api/browser/mainThreadExtensionService.ts | 7 + .../workbench/api/common/extHost.protocol.ts | 1 + .../workbench/api/common/extensionHostMain.ts | 5 + .../api/worker/extensionHostWorker.ts | 219 +++++++++++++----- - 5 files changed, 208 insertions(+), 69 deletions(-) + 5 files changed, 208 insertions(+), 59 deletions(-) diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts -index 7f141568abf..9eeda8b4633 100644 +index f220611a722..1fb5fca2b8a 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -8,6 +8,8 @@ import * as platform from './platform.js'; @@ -24,7 +24,7 @@ index 7f141568abf..9eeda8b4633 100644 export namespace Schemas { -@@ -248,6 +250,20 @@ export const VSCODE_AUTHORITY = 'vscode-app'; +@@ -253,6 +255,20 @@ export const VSCODE_AUTHORITY = 'vscode-app'; class FileAccessImpl { private static readonly FALLBACK_AUTHORITY = VSCODE_AUTHORITY; @@ -45,21 +45,16 @@ index 7f141568abf..9eeda8b4633 100644 /** * Returns a URI to use in contexts where the browser is responsible -@@ -256,12 +272,7 @@ class FileAccessImpl { +@@ -261,7 +277,7 @@ class FileAccessImpl { * **Note:** use `dom.ts#asCSSUrl` whenever the URL is to be used in CSS context. */ asBrowserUri(resourcePath: AppResourcePath | ''): URI { -- // ESM-comment-begin -- // const uri = this.toUri(resourcePath, require); -- // ESM-comment-end -- // ESM-uncomment-begin - const uri = this.toUri(resourcePath); -- // ESM-uncomment-end + const uri = this.toUri(resourcePath, { toUrl: this.toUrl.bind(this) }); return this.uriToBrowserUri(uri); } -@@ -300,7 +311,7 @@ class FileAccessImpl { +@@ -300,7 +316,7 @@ class FileAccessImpl { }); } @@ -68,21 +63,16 @@ index 7f141568abf..9eeda8b4633 100644 } /** -@@ -308,12 +319,7 @@ class FileAccessImpl { +@@ -308,7 +324,7 @@ class FileAccessImpl { * is responsible for loading. */ asFileUri(resourcePath: AppResourcePath | ''): URI { -- // ESM-comment-begin -- // const uri = this.toUri(resourcePath, require); -- // ESM-comment-end -- // ESM-uncomment-begin - const uri = this.toUri(resourcePath); -- // ESM-uncomment-end + const uri = this.toUri(resourcePath, { toUrl: this.toUrl.bind(this) }); return this.uriToFileUri(uri); } -@@ -358,6 +364,19 @@ class FileAccessImpl { +@@ -353,6 +369,19 @@ class FileAccessImpl { return URI.parse(moduleIdToUrl!.toUrl(uriOrModule)); } @@ -121,10 +111,10 @@ index faf19a0dce2..e83837db2db 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 4900f545fb4..15dc855752a 100644 +index 02b40ac0cbf..bc7724ef268 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts -@@ -1525,6 +1525,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { +@@ -1530,6 +1530,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { $onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void; $setPerformanceMarks(marks: performance.PerformanceMark[]): Promise; $asBrowserUri(uri: UriComponents): Promise; diff --git a/vscode-paches/0010-fix-remove-ttf-url-search-parameter-breaking-import.patch b/vscode-paches/0009-fix-remove-ttf-url-search-parameter-breaking-import.patch similarity index 100% rename from vscode-paches/0010-fix-remove-ttf-url-search-parameter-breaking-import.patch rename to vscode-paches/0009-fix-remove-ttf-url-search-parameter-breaking-import.patch diff --git a/vscode-paches/0011-fix-apply-style-only-on-standalone-editors.patch b/vscode-paches/0010-fix-apply-style-only-on-standalone-editors.patch similarity index 99% rename from vscode-paches/0011-fix-apply-style-only-on-standalone-editors.patch rename to vscode-paches/0010-fix-apply-style-only-on-standalone-editors.patch index d9efeeb6..7ab87370 100644 --- a/vscode-paches/0011-fix-apply-style-only-on-standalone-editors.patch +++ b/vscode-paches/0010-fix-apply-style-only-on-standalone-editors.patch @@ -116,7 +116,7 @@ index 59f027dd434..91703a85ce8 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 da2e28f1c44..41d9152f1e6 100644 +index 01688ab96bb..4d257011cd1 100644 --- a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts @@ -51,6 +51,12 @@ import { CSSStyle, ObservableElementSizeObserver, RefCounted, applyStyle, applyV diff --git a/vscode-paches/0012-fix-use-existing-method.patch b/vscode-paches/0011-fix-use-existing-method.patch similarity index 97% rename from vscode-paches/0012-fix-use-existing-method.patch rename to vscode-paches/0011-fix-use-existing-method.patch index eb6c298c..dafdf56e 100644 --- a/vscode-paches/0012-fix-use-existing-method.patch +++ b/vscode-paches/0011-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 085ca6352f2..e5c1e247082 100644 +index 0e6637019c1..7832e1b97bf 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/0013-refactor-split-code.patch b/vscode-paches/0012-refactor-split-code.patch similarity index 97% rename from vscode-paches/0013-refactor-split-code.patch rename to vscode-paches/0012-refactor-split-code.patch index 017eb348..31b8592b 100644 --- a/vscode-paches/0013-refactor-split-code.patch +++ b/vscode-paches/0012-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 e5c1e247082..260e404f3dd 100644 +index 7832e1b97bf..24cf3f506ff 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 e5c1e247082..260e404f3dd 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 671f9552963..de6fc38cd0a 100644 +index bb41a6d5705..04c5e87def0 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/0014-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch b/vscode-paches/0013-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch similarity index 97% rename from vscode-paches/0014-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch rename to vscode-paches/0013-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch index 015babb5..b35bb078 100644 --- a/vscode-paches/0014-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch +++ b/vscode-paches/0013-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch @@ -9,7 +9,7 @@ Subject: [PATCH] cleanup: remove code already done in 1 file changed, 12 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index 260e404f3dd..17f50fb819e 100644 +index 24cf3f506ff..7d40658401c 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 diff --git a/vscode-paches/0015-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch b/vscode-paches/0014-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch similarity index 71% rename from vscode-paches/0015-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch rename to vscode-paches/0014-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch index 53cfcaec..6fbb3016 100644 --- a/vscode-paches/0015-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch +++ b/vscode-paches/0014-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch @@ -4,46 +4,18 @@ Date: Mon, 11 Mar 2024 17:22:31 +0100 Subject: [PATCH] fix: replace amd imports by regular esm dynamic imports --- - .eslintrc.json | 9 +-------- - .../assignment/common/assignmentService.ts | 3 +-- - src/vs/platform/telemetry/common/1dsAppender.ts | 16 ++-------------- - .../contrib/terminal/browser/terminalInstance.ts | 3 +-- - .../terminal/browser/xterm/xtermTerminal.ts | 13 ++++++------- - .../browser/terminalStickyScrollOverlay.ts | 5 ++--- - .../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, 24 insertions(+), 56 deletions(-) + .../platform/assignment/common/assignmentService.ts | 3 +-- + src/vs/platform/telemetry/common/1dsAppender.ts | 9 ++------- + .../contrib/terminal/browser/terminalInstance.ts | 3 +-- + .../terminal/browser/xterm/xtermAddonImporter.ts | 13 ++++++------- + .../browser/terminalStickyScrollOverlay.ts | 5 ++--- + .../textMateWorkerTokenizerController.ts | 3 +-- + .../worker/textMateTokenizationWorker.worker.ts | 5 ++--- + .../worker/textMateWorkerTokenizer.ts | 3 +-- + .../browser/textMateTokenizationFeatureImpl.ts | 6 +++--- + .../workbench/services/textfile/common/encoding.ts | 9 ++++----- + 10 files changed, 23 insertions(+), 36 deletions(-) -diff --git a/.eslintrc.json b/.eslintrc.json -index 6282847cafb..795a5b934e8 100644 ---- a/.eslintrc.json -+++ b/.eslintrc.json -@@ -301,14 +301,6 @@ - "jsdoc/require-returns": "warn" - } - }, -- { -- "files": [ -- "src/**/{common,browser}/**/*.ts" -- ], -- "rules": { -- "local/code-amd-node-module": "warn" -- } -- }, - { - "files": [ - "src/**/{browser,electron-sandbox}/**/*.ts" -@@ -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 - { diff --git a/src/vs/platform/assignment/common/assignmentService.ts b/src/vs/platform/assignment/common/assignmentService.ts index 413bd60f7ff..2e7fcb3d31c 100644 --- a/src/vs/platform/assignment/common/assignmentService.ts @@ -66,7 +38,7 @@ index 413bd60f7ff..2e7fcb3d31c 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 bddf9da2530..e25b981dc45 100644 +index 7efb786c763..e25b981dc45 100644 --- a/src/vs/platform/telemetry/common/1dsAppender.ts +++ b/src/vs/platform/telemetry/common/1dsAppender.ts @@ -5,10 +5,8 @@ @@ -80,21 +52,14 @@ index bddf9da2530..e25b981dc45 100644 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'; +@@ -23,11 +21,8 @@ const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0'; const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping'; 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'); -- // 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'); -- // ESM-uncomment-end - + const oneDs = await import('@microsoft/1ds-core-js'); + const postPlugin = await import('@microsoft/1ds-post-js'); @@ -102,10 +67,10 @@ index bddf9da2530..e25b981dc45 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 f90969a2c60..8242cac8810 100644 +index 1401627f44a..10d55f0ebfb 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 '../../../services/history/common/history.js'; +@@ -79,7 +79,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'; @@ -113,7 +78,7 @@ index f90969a2c60..8242cac8810 100644 import type { IMarker, Terminal as XTermTerminal } from '@xterm/xterm'; import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js'; import { terminalStrings } from '../common/terminalStrings.js'; -@@ -729,7 +728,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { +@@ -725,7 +724,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { return xtermConstructor; } xtermConstructor = Promises.withAsyncBody(async (resolve) => { @@ -122,67 +87,37 @@ index f90969a2c60..8242cac8810 100644 // Localize strings 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 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 './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'; +diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts +index b78debc63c2..f27079b6956 100644 +--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts ++++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermAddonImporter.ts +@@ -9,7 +9,6 @@ import type { SearchAddon as SearchAddonType } from '@xterm/addon-search'; + import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize'; + import type { Unicode11Addon as Unicode11AddonType } from '@xterm/addon-unicode11'; + import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl'; -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) { -- ClipboardAddon = (await importAMDNodeModule('@xterm/addon-clipboard', 'lib/addon-clipboard.js')).ClipboardAddon; -+ ClipboardAddon = (await import('@xterm/addon-clipboard')).ClipboardAddon; - } - return ClipboardAddon; - } - - protected async _getImageAddonConstructor(): Promise { - if (!ImageAddon) { -- ImageAddon = (await importAMDNodeModule('@xterm/addon-image', 'lib/addon-image.js')).ImageAddon; -+ ImageAddon = (await import('@xterm/addon-image')).ImageAddon; - } - return ImageAddon; - } - - protected async _getSearchAddonConstructor(): Promise { - if (!SearchAddon) { -- SearchAddon = (await importAMDNodeModule('@xterm/addon-search', 'lib/addon-search.js')).SearchAddon; -+ SearchAddon = (await import('@xterm/addon-search')).SearchAddon; - } - return SearchAddon; - } - protected async _getUnicode11Constructor(): Promise { - if (!Unicode11Addon) { -- Unicode11Addon = (await importAMDNodeModule('@xterm/addon-unicode11', 'lib/addon-unicode11.js')).Unicode11Addon; -+ Unicode11Addon = (await import('@xterm/addon-unicode11')).Unicode11Addon; - } - return Unicode11Addon; - } - - protected async _getWebglAddonConstructor(): Promise { - if (!WebglAddon) { -- WebglAddon = (await importAMDNodeModule('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon; -+ WebglAddon = (await import('@xterm/addon-webgl')).WebglAddon; - } - return WebglAddon; - } - - protected async _getSerializeAddonConstructor(): Promise { - if (!SerializeAddon) { -- SerializeAddon = (await importAMDNodeModule('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon; -+ SerializeAddon = (await import('@xterm/addon-serialize')).SerializeAddon; - } - return SerializeAddon; - } + export interface IXtermAddonNameToCtor { + clipboard: typeof ClipboardAddonType; +@@ -37,12 +36,12 @@ export class XtermAddonImporter { + let addon = importedAddons.get(name); + if (!addon) { + switch (name) { +- case 'clipboard': addon = (await importAMDNodeModule('@xterm/addon-clipboard', 'lib/addon-clipboard.js')).ClipboardAddon as IXtermAddonNameToCtor[T]; break; +- case 'image': addon = (await importAMDNodeModule('@xterm/addon-image', 'lib/addon-image.js')).ImageAddon as IXtermAddonNameToCtor[T]; break; +- case 'search': addon = (await importAMDNodeModule('@xterm/addon-search', 'lib/addon-search.js')).SearchAddon as IXtermAddonNameToCtor[T]; break; +- case 'serialize': addon = (await importAMDNodeModule('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon as IXtermAddonNameToCtor[T]; break; +- case 'unicode11': addon = (await importAMDNodeModule('@xterm/addon-unicode11', 'lib/addon-unicode11.js')).Unicode11Addon as IXtermAddonNameToCtor[T]; break; +- case 'webgl': addon = (await importAMDNodeModule('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon as IXtermAddonNameToCtor[T]; break; ++ case 'clipboard': addon = (await import('@xterm/addon-clipboard')).ClipboardAddon as IXtermAddonNameToCtor[T]; break; ++ case 'image': addon = (await import('@xterm/addon-image')).ImageAddon as IXtermAddonNameToCtor[T]; break; ++ case 'search': addon = (await import('@xterm/addon-search')).SearchAddon as IXtermAddonNameToCtor[T]; break; ++ case 'serialize': addon = (await import('@xterm/addon-serialize')).SerializeAddon as IXtermAddonNameToCtor[T]; break; ++ case 'unicode11': addon = (await import('@xterm/addon-unicode11')).Unicode11Addon as IXtermAddonNameToCtor[T]; break; ++ case 'webgl': addon = (await import('@xterm/addon-webgl')).WebglAddon as IXtermAddonNameToCtor[T]; break; + } + if (!addon) { + throw new Error(`Could not load addon ${name}`); diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts index c85159b3b8b..139f18f535a 100644 --- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts @@ -276,19 +211,19 @@ index f3945c5e8fa..72ffd7ccb06 100644 } diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts -index f22a15bb599..e127415e11a 100644 +index 94a284248bf..bdb513e899b 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 '../../../../amdX.js'; -+import { resolveAmdNodeModulePath } from '../../../../amdX.js'; - import { canASAR, isESM } from '../../../../base/common/amd.js'; +-import { canASAR, importAMDNodeModule, resolveAmdNodeModulePath } from '../../../../amdX.js'; ++import { canASAR, resolveAmdNodeModulePath } from '../../../../amdX.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 + import { Color } from '../../../../base/common/color.js'; +@@ -245,7 +245,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate return this._grammarFactory; } @@ -297,7 +232,7 @@ index f22a15bb599..e127415e11a 100644 const onigLib: Promise = Promise.resolve({ createOnigScanner: (sources: string[]) => vscodeOniguruma.createOnigScanner(sources), createOnigString: (str: string) => vscodeOniguruma.createOnigString(str) -@@ -357,7 +357,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate +@@ -356,7 +356,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate private _getVSCodeOniguruma(): Promise { if (!this._vscodeOniguruma) { this._vscodeOniguruma = (async () => { @@ -307,21 +242,18 @@ index f22a15bb599..e127415e11a 100644 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 c6933952e65..647cb01f9c0 100644 +index b653dd7a847..647cb01f9c0 100644 --- a/src/vs/workbench/services/textfile/common/encoding.ts +++ b/src/vs/workbench/services/textfile/common/encoding.ts -@@ -5,10 +5,8 @@ +@@ -5,7 +5,6 @@ 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'; -@@ -83,7 +81,7 @@ class DecoderStream implements IDecoderStream { +@@ -82,7 +81,7 @@ class DecoderStream implements IDecoderStream { static async create(encoding: string): Promise { let decoder: IDecoderStream | undefined = undefined; if (encoding !== UTF8) { @@ -330,7 +262,7 @@ index c6933952e65..647cb01f9c0 100644 decoder = iconv.getDecoder(toNodeEncoding(encoding)); } else { const utf8TextDecoder = new TextDecoder(); -@@ -216,7 +214,7 @@ export function toDecodeStream(source: VSBufferReadableStream, options: IDecodeS +@@ -215,7 +214,7 @@ export function toDecodeStream(source: VSBufferReadableStream, options: IDecodeS } export async function toEncodeReadable(readable: Readable, encoding: string, options?: { addBOM?: boolean }): Promise { @@ -339,7 +271,7 @@ index c6933952e65..647cb01f9c0 100644 const encoder = iconv.getEncoder(toNodeEncoding(encoding), options); let bytesWritten = false; -@@ -265,7 +263,7 @@ export async function toEncodeReadable(readable: Readable, encoding: str +@@ -264,7 +263,7 @@ export async function toEncodeReadable(readable: Readable, encoding: str } export async function encodingExists(encoding: string): Promise { @@ -348,15 +280,11 @@ index c6933952e65..647cb01f9c0 100644 return iconv.encodingExists(toNodeEncoding(encoding)); } -@@ -321,11 +319,7 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-16', 'utf-32']; +@@ -320,7 +319,7 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-16', 'utf-32']; * Guesses the encoding from buffer. */ async function guessEncodingByBuffer(buffer: VSBuffer, candidateGuessEncodings?: string[]): Promise { -- -- // TODO@bpasero TODO@esm: this used to be `dist/jschardet.min.js`, but we are running into an issue that -- // https://github.com/aadsm/jschardet/pull/96 mitigates. Long-term we should just add minification -- // of dependencies into our build process so that we do not depend on how others are doing it. -- const jschardet = await importAMDNodeModule('jschardet', isESM ? 'dist/jschardet.js' : 'dist/jschardet.min.js'); +- const jschardet = await importAMDNodeModule('jschardet', 'dist/jschardet.min.js'); + const jschardet = await import('jschardet'); // ensure to limit buffer for guessing due to https://github.com/aadsm/jschardet/issues/53 diff --git a/vscode-paches/0016-feat-export-some-classes-and-make-some-methods-acces.patch b/vscode-paches/0015-feat-export-some-classes-and-make-some-methods-acces.patch similarity index 96% rename from vscode-paches/0016-feat-export-some-classes-and-make-some-methods-acces.patch rename to vscode-paches/0015-feat-export-some-classes-and-make-some-methods-acces.patch index 737e832d..b352104c 100644 --- a/vscode-paches/0016-feat-export-some-classes-and-make-some-methods-acces.patch +++ b/vscode-paches/0015-feat-export-some-classes-and-make-some-methods-acces.patch @@ -33,10 +33,10 @@ Subject: [PATCH] feat: export some classes and make some methods accessible 26 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/vs/platform/actions/browser/actionViewItemService.ts b/src/vs/platform/actions/browser/actionViewItemService.ts -index fa5739eec65..07f413b305f 100644 +index 851b6c9117e..99c9030692f 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 { +@@ -40,7 +40,7 @@ export class NullActionViewItemService implements IActionViewItemService { } } @@ -72,7 +72,7 @@ index bae2812c5f3..022b7ff6e54 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index 7290a2f7076..2e07af10fae 100644 +index 38a594c7d2f..64a254cfc51 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -51,7 +51,7 @@ import { CodeWindow, mainWindow } from '../../base/browser/window.js'; @@ -114,10 +114,10 @@ index 7290a2f7076..2e07af10fae 100644 readonly filesToDiff?: IPathToOpen[]; readonly filesToMerge?: IPathToOpen[]; diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index f081430e49f..cf237f2df62 100644 +index b40c9fa73a9..c6cefac928f 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts -@@ -82,7 +82,7 @@ export class Workbench extends Layout { +@@ -80,7 +80,7 @@ export class Workbench extends Layout { this.registerErrorHandler(logService); } @@ -126,7 +126,7 @@ index f081430e49f..cf237f2df62 100644 // Listen on unhandled rejection events // Note: intentionally not registered as disposable to handle -@@ -126,7 +126,7 @@ export class Workbench extends Layout { +@@ -99,7 +99,7 @@ export class Workbench extends Layout { } private previousUnexpectedError: { message: string | undefined; time: number } = { message: undefined, time: 0 }; @@ -135,7 +135,7 @@ index f081430e49f..cf237f2df62 100644 const message = toErrorMessage(error, true); if (!message) { return; -@@ -201,7 +201,7 @@ export class Workbench extends Layout { +@@ -174,7 +174,7 @@ export class Workbench extends Layout { } } @@ -144,7 +144,7 @@ index f081430e49f..cf237f2df62 100644 // Layout Service serviceCollection.set(IWorkbenchLayoutService, this); -@@ -240,7 +240,7 @@ export class Workbench extends Layout { +@@ -213,7 +213,7 @@ export class Workbench extends Layout { return instantiationService; } @@ -153,7 +153,7 @@ index f081430e49f..cf237f2df62 100644 // Configuration changes this._register(configurationService.onDidChangeConfiguration(e => this.updateFontAliasing(e, configurationService))); -@@ -329,7 +329,7 @@ export class Workbench extends Layout { +@@ -302,7 +302,7 @@ export class Workbench extends Layout { } } @@ -162,7 +162,7 @@ index f081430e49f..cf237f2df62 100644 // ARIA & Signals setARIAContainer(this.mainContainer); -@@ -396,7 +396,7 @@ export class Workbench extends Layout { +@@ -369,7 +369,7 @@ export class Workbench extends Layout { return part; } @@ -171,7 +171,7 @@ index f081430e49f..cf237f2df62 100644 // Instantiate Notification components const notificationsCenter = this._register(instantiationService.createInstance(NotificationsCenter, this.mainContainer, notificationService.model)); -@@ -427,7 +427,7 @@ export class Workbench extends Layout { +@@ -400,7 +400,7 @@ export class Workbench extends Layout { }); } @@ -337,10 +337,10 @@ index ac3c7ed5006..94663c3cde9 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 cecd70c21af..8141d1dfe02 100644 +index 54fc51bb873..5754f65d0c5 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 +@@ -77,7 +77,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath, 'webWorker'); } @@ -350,7 +350,7 @@ index cecd70c21af..8141d1dfe02 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 0479473dcaa..9fa2663f0e5 100644 +index b14b72523de..633a24cee32 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 @@ -366,7 +366,7 @@ index 0479473dcaa..9fa2663f0e5 100644 @IInstantiationService protected readonly _instantiationService: IInstantiationService, @INotificationService protected readonly _notificationService: INotificationService, @IWorkbenchEnvironmentService protected readonly _environmentService: IWorkbenchEnvironmentService, -@@ -224,7 +224,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx +@@ -228,7 +228,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx //#region deltaExtensions @@ -375,7 +375,7 @@ index 0479473dcaa..9fa2663f0e5 100644 this._deltaExtensionsQueue.push(item); if (this._inHandleDeltaExtensions) { // Let the current item finish, the new one will be picked up -@@ -1289,7 +1289,7 @@ export interface IExtensionHostFactory { +@@ -1293,7 +1293,7 @@ export interface IExtensionHostFactory { createExtensionHost(runningLocations: ExtensionRunningLocationTracker, runningLocation: ExtensionRunningLocation, isInitialStart: boolean): IExtensionHost | null; } @@ -385,7 +385,7 @@ index 0479473dcaa..9fa2663f0e5 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 de6fc38cd0a..320c2526b7a 100644 +index 04c5e87def0..f10b332d8e2 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 { @@ -489,7 +489,7 @@ index e976a8617ca..b855f41710f 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 65ca63829ec..0dd7d367fdd 100644 +index 1281d1f717b..96356254354 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 { diff --git a/vscode-paches/0017-fix-improve-extension-contribution-types.patch b/vscode-paches/0016-fix-improve-extension-contribution-types.patch similarity index 100% rename from vscode-paches/0017-fix-improve-extension-contribution-types.patch rename to vscode-paches/0016-fix-improve-extension-contribution-types.patch diff --git a/vscode-paches/0018-fix-fix-dependency-injection.patch b/vscode-paches/0017-fix-fix-dependency-injection.patch similarity index 100% rename from vscode-paches/0018-fix-fix-dependency-injection.patch rename to vscode-paches/0017-fix-fix-dependency-injection.patch diff --git a/vscode-paches/0019-fix-only-run-some-code-if-inside-the-worker.patch b/vscode-paches/0018-fix-only-run-some-code-if-inside-the-worker.patch similarity index 100% rename from vscode-paches/0019-fix-only-run-some-code-if-inside-the-worker.patch rename to vscode-paches/0018-fix-only-run-some-code-if-inside-the-worker.patch diff --git a/vscode-paches/0020-fix-override-log-services-even-in-main-thread.patch b/vscode-paches/0019-fix-override-log-services-even-in-main-thread.patch similarity index 100% rename from vscode-paches/0020-fix-override-log-services-even-in-main-thread.patch rename to vscode-paches/0019-fix-override-log-services-even-in-main-thread.patch diff --git a/vscode-paches/0021-feat-expose-extHostExtensionService.patch b/vscode-paches/0020-feat-expose-extHostExtensionService.patch similarity index 100% rename from vscode-paches/0021-feat-expose-extHostExtensionService.patch rename to vscode-paches/0020-feat-expose-extHostExtensionService.patch diff --git a/vscode-paches/0021-cleanup-remove-non-ESM-compatible-code.patch b/vscode-paches/0021-cleanup-remove-non-ESM-compatible-code.patch new file mode 100644 index 00000000..4dc779ef --- /dev/null +++ b/vscode-paches/0021-cleanup-remove-non-ESM-compatible-code.patch @@ -0,0 +1,98 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Mon, 11 Mar 2024 17:48:09 +0100 +Subject: [PATCH] cleanup: remove non-ESM compatible code + +--- + src/vs/base/common/worker/simpleWorker.ts | 10 +--------- + .../common/services/editorSimpleWorker.ts | 12 +----------- + .../workbench/api/node/extensionHostProcess.ts | 18 ------------------ + 3 files changed, 2 insertions(+), 38 deletions(-) + +diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts +index b04319bc9a3..db248563e3a 100644 +--- a/src/vs/base/common/worker/simpleWorker.ts ++++ b/src/vs/base/common/worker/simpleWorker.ts +@@ -7,7 +7,6 @@ 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'; +@@ -569,14 +568,7 @@ export class SimpleWorkerServer implements IWorkerServer { + (globalThis as any).require.config(loaderConfig); + } + +- const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true); +- return import(`${url}`).then((module: { create: IRequestHandlerFactory }) => { +- this._requestHandler = module.create(this); +- +- if (!this._requestHandler) { +- throw new Error(`No RequestHandler!`); +- } +- }); ++ return Promise.reject(new Error(`Unexpected usage`)); + } + } + +diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts +index 2432a8f657a..b0163997f9b 100644 +--- a/src/vs/editor/common/services/editorSimpleWorker.ts ++++ b/src/vs/editor/common/services/editorSimpleWorker.ts +@@ -25,7 +25,6 @@ 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'; +@@ -551,16 +550,7 @@ export class EditorSimpleWorker extends BaseEditorSimpleWorker { + return Promise.resolve(getAllMethodNames(this._foreignModule)); + } + +- return new Promise((resolve, reject) => { +- +- const onModuleCallback = (foreignModule: { create: IForeignModuleFactory }) => { +- this._foreignModule = foreignModule.create(ctx, createData); +- resolve(getAllMethodNames(this._foreignModule)); +- }; +- +- const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true); +- import(`${url}`).then(onModuleCallback).catch(reject); +- }); ++ return Promise.reject(new Error(`Unexpected usage`)); + } + + // foreign method request +diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts +index feaece95534..43e1cb46975 100644 +--- a/src/vs/workbench/api/node/extensionHostProcess.ts ++++ b/src/vs/workbench/api/node/extensionHostProcess.ts +@@ -58,24 +58,6 @@ const args = minimist(process.argv.slice(2), { + ] + }) as ParsedExtHostArgs; + +-// With Electron 2.x and node.js 8.x the "natives" module +-// can cause a native crash (see https://github.com/nodejs/node/issues/19891 and +-// https://github.com/electron/electron/issues/10905). To prevent this from +-// happening we essentially blocklist this module from getting loaded in any +-// extension by patching the node require() function. +-(function () { +- const Module = require('module'); +- const originalLoad = Module._load; +- +- Module._load = function (request: string) { +- if (request === 'natives') { +- throw new Error('Either the extension or an NPM dependency is using the [unsupported "natives" node module](https://go.microsoft.com/fwlink/?linkid=871887).'); +- } +- +- return originalLoad.apply(this, arguments); +- }; +-})(); +- + // custom process.exit logic... + const nativeExit: IExitFn = process.exit.bind(process); + const nativeOn = process.on.bind(process); diff --git a/vscode-paches/0022-cleanup-remove-non-ESM-compatible-code.patch b/vscode-paches/0022-cleanup-remove-non-ESM-compatible-code.patch deleted file mode 100644 index 72ea9b22..00000000 --- a/vscode-paches/0022-cleanup-remove-non-ESM-compatible-code.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Mon, 11 Mar 2024 17:48:09 +0100 -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 | 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 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 '../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; --// ESM-comment-end --// ESM-uncomment-begin --const isESM = true; --// ESM-uncomment-end -- - const DEFAULT_CHANNEL = 'default'; - const INITIALIZE = '$initialize'; - -@@ -576,38 +568,7 @@ export class SimpleWorkerServer implements IWorkerServer { - globalThis.require.config(loaderConfig); - } - -- if (isESM) { -- const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true); -- return import(`${url}`).then((module: { create: IRequestHandlerFactory }) => { -- this._requestHandler = module.create(this); -- -- if (!this._requestHandler) { -- throw new Error(`No RequestHandler!`); -- } -- }); -- } -- -- return new Promise((resolve, reject) => { -- // Use the global require to be sure to get the global config -- -- // ESM-comment-begin -- // const req = (globalThis.require || require); -- // ESM-comment-end -- // ESM-uncomment-begin -- const req = globalThis.require; -- // ESM-uncomment-end -- -- req([moduleId], (module: { create: IRequestHandlerFactory }) => { -- this._requestHandler = module.create(this); -- -- if (!this._requestHandler) { -- reject(new Error(`No RequestHandler!`)); -- return; -- } -- -- resolve(); -- }, reject); -- }); -+ return Promise.reject(new Error(`Unexpected usage`)); - } - } - -diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts -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.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; --// ESM-comment-end --// ESM-uncomment-begin --const isESM = true; --// ESM-uncomment-end -- - export interface IMirrorModel extends IMirrorTextModel { - readonly uri: URI; - readonly version: number; -@@ -558,20 +550,7 @@ export class EditorSimpleWorker extends BaseEditorSimpleWorker { - return Promise.resolve(getAllMethodNames(this._foreignModule)); - } - -- return new Promise((resolve, reject) => { -- -- const onModuleCallback = (foreignModule: { create: IForeignModuleFactory }) => { -- this._foreignModule = foreignModule.create(ctx, createData); -- resolve(getAllMethodNames(this._foreignModule)); -- }; -- -- if (!isESM) { -- require([`${moduleId}`], onModuleCallback, reject); -- } else { -- const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true); -- import(`${url}`).then(onModuleCallback).catch(reject); -- } -- }); -+ return Promise.reject(new Error(`Unexpected usage`)); - } - - // foreign method request -diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts -index 694559385c4..0be2f11f004 100644 ---- a/src/vs/workbench/api/node/extensionHostProcess.ts -+++ b/src/vs/workbench/api/node/extensionHostProcess.ts -@@ -60,24 +60,6 @@ const args = minimist(process.argv.slice(2), { - ] - }) as ParsedExtHostArgs; - --// With Electron 2.x and node.js 8.x the "natives" module --// can cause a native crash (see https://github.com/nodejs/node/issues/19891 and --// https://github.com/electron/electron/issues/10905). To prevent this from --// happening we essentially blocklist this module from getting loaded in any --// extension by patching the node require() function. --(function () { -- const Module = require('module'); -- const originalLoad = Module._load; -- -- Module._load = function (request: string) { -- if (request === 'natives') { -- throw new Error('Either the extension or an NPM dependency is using the [unsupported "natives" node module](https://go.microsoft.com/fwlink/?linkid=871887).'); -- } -- -- return originalLoad.apply(this, arguments); -- }; --})(); -- - // custom process.exit logic... - 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 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 @@ - - - -@@ -93,12 +93,7 @@ - workerUrl += '?vscode-coi=2'; // COEP - } - -- // ESM-comment-begin -- // const isESM = false; -- // ESM-comment-end -- // ESM-uncomment-begin - const isESM = true; -- // ESM-uncomment-end - - // 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/0023-feat-expose-api-factory.patch b/vscode-paches/0022-feat-expose-api-factory.patch similarity index 100% rename from vscode-paches/0023-feat-expose-api-factory.patch rename to vscode-paches/0022-feat-expose-api-factory.patch diff --git a/vscode-paches/0024-refactor-split-some-modules-to-be-able-to-import-the.patch b/vscode-paches/0023-refactor-split-some-modules-to-be-able-to-import-the.patch similarity index 99% rename from vscode-paches/0024-refactor-split-some-modules-to-be-able-to-import-the.patch rename to vscode-paches/0023-refactor-split-some-modules-to-be-able-to-import-the.patch index 153f597c..afe18511 100644 --- a/vscode-paches/0024-refactor-split-some-modules-to-be-able-to-import-the.patch +++ b/vscode-paches/0023-refactor-split-some-modules-to-be-able-to-import-the.patch @@ -567,7 +567,7 @@ index 69cfd27a424..484b77a02f7 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..b7d4ca80081 +index 00000000000..0b73d701664 --- /dev/null +++ b/src/vs/workbench/contrib/files/browser/files.contribution._configuration.ts @@ -0,0 +1,297 @@ @@ -847,7 +847,7 @@ index 00000000000..b7d4ca80081 + properties: { + 'editor.formatOnSave': { + 'type': 'boolean', -+ 'description': nls.localize('formatOnSave', "Format a file on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."), ++ 'markdownDescription': nls.localize('formatOnSave', "Format a file on save. A formatter must be available and the editor must not be shutting down. When {0} is set to `afterDelay`, the file will only be formatted when saved explicitly.", '`#files.autoSave#`'), + 'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE, + }, + 'editor.formatOnSaveMode': { @@ -1283,7 +1283,7 @@ 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 250bb0c060a..269fb34cadb 100644 +index 266995ddc6d..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 @@ @@ -1667,7 +1667,7 @@ index 250bb0c060a..269fb34cadb 100644 - properties: { - 'editor.formatOnSave': { - 'type': 'boolean', -- 'description': nls.localize('formatOnSave', "Format a file on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."), +- 'markdownDescription': nls.localize('formatOnSave', "Format a file on save. A formatter must be available and the editor must not be shutting down. When {0} is set to `afterDelay`, the file will only be formatted when saved explicitly.", '`#files.autoSave#`'), - 'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE, - }, - 'editor.formatOnSaveMode': { diff --git a/vscode-paches/0025-fix-replace-map-by-forEach.patch b/vscode-paches/0024-fix-replace-map-by-forEach.patch similarity index 94% rename from vscode-paches/0025-fix-replace-map-by-forEach.patch rename to vscode-paches/0024-fix-replace-map-by-forEach.patch index db0b72db..b78f8ec3 100644 --- a/vscode-paches/0025-fix-replace-map-by-forEach.patch +++ b/vscode-paches/0024-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 5e83a9458bd..1a3545c6e24 100644 +index 9af8928288c..450e6ad4835 100644 --- a/src/vs/workbench/browser/parts/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositeBar.ts -@@ -494,7 +494,7 @@ export class CompositeBar extends Widget implements ICompositeBar { +@@ -501,7 +501,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)); diff --git a/vscode-paches/0026-feat-only-apply-style-on-specific-class.patch b/vscode-paches/0025-feat-only-apply-style-on-specific-class.patch similarity index 98% rename from vscode-paches/0026-feat-only-apply-style-on-specific-class.patch rename to vscode-paches/0025-feat-only-apply-style-on-specific-class.patch index 6e889c12..c107919b 100644 --- a/vscode-paches/0026-feat-only-apply-style-on-specific-class.patch +++ b/vscode-paches/0025-feat-only-apply-style-on-specific-class.patch @@ -9,7 +9,7 @@ Subject: [PATCH] feat: only apply style on specific class 2 files changed, 89 insertions(+), 106 deletions(-) diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css -index 6c9dbb9a0c9..4b381ddf79c 100644 +index 1d7c7617ab4..547721a2afa 100644 --- a/src/vs/workbench/browser/media/style.css +++ b/src/vs/workbench/browser/media/style.css @@ -9,56 +9,38 @@ @@ -20,7 +20,7 @@ index 6c9dbb9a0c9..4b381ddf79c 100644 -.mac:lang(zh-Hans) { font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Hiragino Sans GB", sans-serif; } -.mac:lang(zh-Hant) { font-family: -apple-system, BlinkMacSystemFont, "PingFang TC", sans-serif; } -.mac:lang(ja) { font-family: -apple-system, BlinkMacSystemFont, "Hiragino Kaku Gothic Pro", sans-serif; } --.mac:lang(ko) { font-family: -apple-system, BlinkMacSystemFont, "Nanum Gothic", "Apple SD Gothic Neo", "AppleGothic", sans-serif; } +-.mac:lang(ko) { font-family: -apple-system, BlinkMacSystemFont, "Apple SD Gothic Neo", "Nanum Gothic", "AppleGothic", sans-serif; } - -.windows { font-family: "Segoe WPC", "Segoe UI", sans-serif; } -.windows:lang(zh-Hans) { font-family: "Segoe WPC", "Segoe UI", "Microsoft YaHei", sans-serif; } @@ -31,7 +31,7 @@ index 6c9dbb9a0c9..4b381ddf79c 100644 +.mac:lang(zh-Hans) .monaco-workbench-part, .mac:lang(zh-Hans).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Hiragino Sans GB", sans-serif; } +.mac:lang(zh-Hant) .monaco-workbench-part, .mac:lang(zh-Hant).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "PingFang TC", sans-serif; } +.mac:lang(ja) .monaco-workbench-part, .mac:lang(ja).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Hiragino Kaku Gothic Pro", sans-serif; } -+.mac:lang(ko) .monaco-workbench-part, .mac:lang(ko).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Nanum Gothic", "Apple SD Gothic Neo", "AppleGothic", sans-serif; } ++.mac:lang(ko) .monaco-workbench-part, .mac:lang(ko).monaco-workbench-part { font-family: -apple-system, BlinkMacSystemFont, "Apple SD Gothic Neo", "Nanum Gothic", "AppleGothic", sans-serif; } + +.windows .monaco-workbench-part, .windows.monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", sans-serif; } +.windows:lang(zh-Hans) .monaco-workbench-part, .windows:lang(zh-Hans).monaco-workbench-part { font-family: "Segoe WPC", "Segoe UI", "Microsoft YaHei", sans-serif; } diff --git a/vscode-paches/0027-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch b/vscode-paches/0026-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch similarity index 96% rename from vscode-paches/0027-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch rename to vscode-paches/0026-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch index aa511959..c519dd31 100644 --- a/vscode-paches/0027-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch +++ b/vscode-paches/0026-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch @@ -37,7 +37,7 @@ index f6873bf5524..b653ac57a36 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 e34a9006982..307fc647c57 100644 +index 1575be24d0d..2a239ae2620 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -19,7 +19,7 @@ import { @@ -59,7 +59,7 @@ index e34a9006982..307fc647c57 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 a3d6f047f65..310fd38c68f 100644 +index 0c7f3750cf3..2780c01bc15 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 '../../../../platform/telemetry/common/telemet @@ -68,10 +68,10 @@ index a3d6f047f65..310fd38c68f 100644 import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; -import { DefaultIconPath } from '../../../services/extensionManagement/common/extensionManagement.js'; +import { getDefaultIconPath } from '../../../services/extensionManagement/common/extensionManagement.js'; + import { IProductService } from '../../../../platform/product/common/productService.js'; export const HasMultipleNewFileEntries = new RawContextKey('hasMultipleNewFileEntries', false); - -@@ -395,7 +395,7 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ +@@ -408,7 +408,7 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ type: 'image', path: iconStr ? FileAccess.uriToBrowserUri(joinPath(extension.extensionLocation, iconStr)).toString(true) diff --git a/vscode-paches/0028-cleanup-remove-some-checks-and-warnings.patch b/vscode-paches/0027-cleanup-remove-some-checks-and-warnings.patch similarity index 98% rename from vscode-paches/0028-cleanup-remove-some-checks-and-warnings.patch rename to vscode-paches/0027-cleanup-remove-some-checks-and-warnings.patch index 9cee4389..bbebb9f5 100644 --- a/vscode-paches/0028-cleanup-remove-some-checks-and-warnings.patch +++ b/vscode-paches/0027-cleanup-remove-some-checks-and-warnings.patch @@ -71,10 +71,10 @@ index c7fe91bfe1e..608ca8f7ce2 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 8141d1dfe02..6793d6c6fab 100644 +index 5754f65d0c5..fb3c8cbfb57 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 +@@ -112,8 +112,6 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost res.searchParams.set('salt', stableOriginUUID); return res.toString(); } diff --git a/vscode-paches/0029-refactor-split-class-in-2.patch b/vscode-paches/0028-refactor-split-class-in-2.patch similarity index 100% rename from vscode-paches/0029-refactor-split-class-in-2.patch rename to vscode-paches/0028-refactor-split-class-in-2.patch diff --git a/vscode-paches/0030-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch b/vscode-paches/0029-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch similarity index 93% rename from vscode-paches/0030-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch rename to vscode-paches/0029-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch index 234baff2..f901faee 100644 --- a/vscode-paches/0030-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch +++ b/vscode-paches/0029-fix-mark-process-supported-as-soon-as-there-is-a-reg.patch @@ -10,7 +10,7 @@ Subject: [PATCH] fix: mark process supported as soon as there is a registered 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts -index a821d841916..5b7f5226641 100644 +index 34195bc820d..87a033aeea1 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -3,7 +3,7 @@ @@ -22,7 +22,7 @@ index a821d841916..5b7f5226641 100644 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 = { +@@ -1070,12 +1070,27 @@ export const TerminalExtensions = { Backend: 'workbench.contributions.terminal.processBackend' }; @@ -50,7 +50,7 @@ index a821d841916..5b7f5226641 100644 /** * Registers a terminal backend for a remote authority. */ -@@ -1077,21 +1092,20 @@ class TerminalBackendRegistry implements ITerminalBackendRegistry { +@@ -1092,21 +1107,20 @@ class TerminalBackendRegistry implements ITerminalBackendRegistry { get backends(): ReadonlyMap { return this._backends; } @@ -79,10 +79,10 @@ index a821d841916..5b7f5226641 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 b1da8a45dd8..9ec62d935d7 100644 +index 028b6d9ddd2..49a15db0eb5 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 '../../../../platform/contextkey +@@ -20,7 +20,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'; @@ -91,7 +91,7 @@ index b1da8a45dd8..9ec62d935d7 100644 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 +@@ -58,6 +58,7 @@ import { ITerminalCapabilityImplMap, TerminalCapability } from '../../../../plat import { createInstanceCapabilityEventMultiplexer } from './terminalEvents.js'; import { mainWindow } from '../../../../base/browser/window.js'; import { GroupIdentifier } from '../../../common/editor.js'; @@ -99,7 +99,7 @@ index b1da8a45dd8..9ec62d935d7 100644 export class TerminalService extends Disposable implements ITerminalService { declare _serviceBrand: undefined; -@@ -216,7 +217,14 @@ export class TerminalService extends Disposable implements ITerminalService { +@@ -217,7 +218,14 @@ export class TerminalService extends Disposable implements ITerminalService { this._handleInstanceContextKeys(); this._terminalShellTypeContextKey = TerminalContextKeys.shellType.bindTo(this._contextKeyService); this._processSupportContextKey = TerminalContextKeys.processSupported.bindTo(this._contextKeyService); @@ -115,7 +115,7 @@ index b1da8a45dd8..9ec62d935d7 100644 this._terminalHasBeenCreated = TerminalContextKeys.terminalHasBeenCreated.bindTo(this._contextKeyService); this._terminalCountContextKey = TerminalContextKeys.count.bindTo(this._contextKeyService); this._terminalEditorActive = TerminalContextKeys.terminalEditorActive.bindTo(this._contextKeyService); -@@ -880,7 +888,7 @@ export class TerminalService extends Disposable implements ITerminalService { +@@ -881,7 +889,7 @@ export class TerminalService extends Disposable implements ITerminalService { } registerProcessSupport(isSupported: boolean): void { diff --git a/vscode-paches/0031-fix-use-asBrowserUri-to-get-iframe-src.patch b/vscode-paches/0030-fix-use-asBrowserUri-to-get-iframe-src.patch similarity index 100% rename from vscode-paches/0031-fix-use-asBrowserUri-to-get-iframe-src.patch rename to vscode-paches/0030-fix-use-asBrowserUri-to-get-iframe-src.patch diff --git a/vscode-paches/0032-feat-add-some-parameter-to-webview-iframes.patch b/vscode-paches/0031-feat-add-some-parameter-to-webview-iframes.patch similarity index 100% rename from vscode-paches/0032-feat-add-some-parameter-to-webview-iframes.patch rename to vscode-paches/0031-feat-add-some-parameter-to-webview-iframes.patch diff --git a/vscode-paches/0033-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch b/vscode-paches/0032-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch similarity index 98% rename from vscode-paches/0033-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch rename to vscode-paches/0032-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch index 9cf3c23a..dffe63e1 100644 --- a/vscode-paches/0033-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch +++ b/vscode-paches/0032-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch @@ -8,7 +8,7 @@ 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 88d7b0db4c2..7499230f9ed 100644 +index 97436b6913e..4e8bdea6c4f 100644 --- a/src/vs/workbench/services/host/browser/browserHostService.ts +++ b/src/vs/workbench/services/host/browser/browserHostService.ts @@ -213,13 +213,18 @@ export class BrowserHostService extends Disposable implements IHostService { diff --git a/vscode-paches/0034-fix-only-use-open-model.patch b/vscode-paches/0033-fix-only-use-open-model.patch similarity index 100% rename from vscode-paches/0034-fix-only-use-open-model.patch rename to vscode-paches/0033-fix-only-use-open-model.patch diff --git a/vscode-paches/0035-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch b/vscode-paches/0034-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch similarity index 93% rename from vscode-paches/0035-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch rename to vscode-paches/0034-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch index c55d11bc..ffc9321b 100644 --- a/vscode-paches/0035-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch +++ b/vscode-paches/0034-fix-replace-CJS-require-by-FileAccess.toModuleConten.patch @@ -8,7 +8,7 @@ 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 a2e56672926..89372f739df 100644 +index 53e8a273940..1db9a86a7b0 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 '../../../../platform/notification/common/n @@ -19,7 +19,7 @@ index a2e56672926..89372f739df 100644 export class GettingStartedDetailsRenderer { -@@ -273,7 +274,7 @@ export class GettingStartedDetailsRenderer { +@@ -266,7 +267,7 @@ export class GettingStartedDetailsRenderer { } const transformUri = (src: string, base: URI) => { diff --git a/vscode-paches/0036-fix-allow-adding-a-local-folder-even-when-there-is-a.patch b/vscode-paches/0035-fix-allow-adding-a-local-folder-even-when-there-is-a.patch similarity index 100% rename from vscode-paches/0036-fix-allow-adding-a-local-folder-even-when-there-is-a.patch rename to vscode-paches/0035-fix-allow-adding-a-local-folder-even-when-there-is-a.patch diff --git a/vscode-paches/0037-feat-allow-to-switch-storage-service-workspace.patch b/vscode-paches/0036-feat-allow-to-switch-storage-service-workspace.patch similarity index 100% rename from vscode-paches/0037-feat-allow-to-switch-storage-service-workspace.patch rename to vscode-paches/0036-feat-allow-to-switch-storage-service-workspace.patch diff --git a/vscode-paches/0038-cleanup-remove-code-that-we-will-run-ourselves.patch b/vscode-paches/0037-cleanup-remove-code-that-we-will-run-ourselves.patch similarity index 93% rename from vscode-paches/0038-cleanup-remove-code-that-we-will-run-ourselves.patch rename to vscode-paches/0037-cleanup-remove-code-that-we-will-run-ourselves.patch index 46ec4046..043acc7b 100644 --- a/vscode-paches/0038-cleanup-remove-code-that-we-will-run-ourselves.patch +++ b/vscode-paches/0037-cleanup-remove-code-that-we-will-run-ourselves.patch @@ -8,10 +8,10 @@ Subject: [PATCH] cleanup: remove code that we will run ourselves 1 file changed, 20 deletions(-) diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts -index cf237f2df62..ca295f38ddb 100644 +index c6cefac928f..76cb744c11a 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'; +@@ -10,10 +10,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'; @@ -22,7 +22,7 @@ index cf237f2df62..ca295f38ddb 100644 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 +@@ -34,7 +31,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'; @@ -30,7 +30,7 @@ index cf237f2df62..ca295f38ddb 100644 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'; +@@ -42,9 +38,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'; @@ -40,7 +40,7 @@ index cf237f2df62..ca295f38ddb 100644 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 { +@@ -131,25 +124,12 @@ export class Workbench extends Layout { const storageService = accessor.get(IStorageService); const configurationService = accessor.get(IConfigurationService); const hostService = accessor.get(IHostService); diff --git a/vscode-paches/0039-fix-typescript-use-import-function-able-to-replace-i.patch b/vscode-paches/0038-fix-typescript-use-import-function-able-to-replace-i.patch similarity index 100% rename from vscode-paches/0039-fix-typescript-use-import-function-able-to-replace-i.patch rename to vscode-paches/0038-fix-typescript-use-import-function-able-to-replace-i.patch diff --git a/vscode-paches/0040-feat-add-a-way-to-detect-if-localization-were-alread.patch b/vscode-paches/0039-feat-add-a-way-to-detect-if-localization-were-alread.patch similarity index 100% rename from vscode-paches/0040-feat-add-a-way-to-detect-if-localization-were-alread.patch rename to vscode-paches/0039-feat-add-a-way-to-detect-if-localization-were-alread.patch diff --git a/vscode-paches/0041-fix-move-action-from-service-file-to-contribution.patch b/vscode-paches/0040-fix-move-action-from-service-file-to-contribution.patch similarity index 98% rename from vscode-paches/0041-fix-move-action-from-service-file-to-contribution.patch rename to vscode-paches/0040-fix-move-action-from-service-file-to-contribution.patch index 2d5829c8..995e043a 100644 --- a/vscode-paches/0041-fix-move-action-from-service-file-to-contribution.patch +++ b/vscode-paches/0040-fix-move-action-from-service-file-to-contribution.patch @@ -84,7 +84,7 @@ index 00000000000..3fc81fe28fc + } +}); diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts -index 310fd38c68f..0d7b7a10e1c 100644 +index 2780c01bc15..b0f9475c895 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -3,11 +3,10 @@ @@ -109,7 +109,7 @@ index 310fd38c68f..0d7b7a10e1c 100644 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; import { checkGlobFileExists } from '../../../services/extensions/common/workspaceContains.js'; import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; -@@ -668,48 +667,4 @@ const convertInternalMediaPathsToBrowserURIs = (path: string | { hc: string; hcL +@@ -681,48 +680,4 @@ const convertInternalMediaPathsToBrowserURIs = (path: string | { hc: string; hcL } }; diff --git a/vscode-paches/0042-refactor-split-workbench-contribution.patch b/vscode-paches/0041-refactor-split-workbench-contribution.patch similarity index 99% rename from vscode-paches/0042-refactor-split-workbench-contribution.patch rename to vscode-paches/0041-refactor-split-workbench-contribution.patch index 4d16a13a..32423b01 100644 --- a/vscode-paches/0042-refactor-split-workbench-contribution.patch +++ b/vscode-paches/0041-refactor-split-workbench-contribution.patch @@ -247,7 +247,7 @@ index d78e65afc3f..56bd057fb3e 100644 + +registerWorkbenchContribution2(TokenClassificationExtensionPointWorkbenchContribution.ID, TokenClassificationExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts -index 285fea2c50e..490e6ebae78 100644 +index c50af76d0bb..ed737c23572 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -32,9 +32,15 @@ import './browser/actions/widgetNavigationCommands.js'; diff --git a/vscode-paches/0043-refactor-split-service-and-extension-point.patch b/vscode-paches/0042-refactor-split-service-and-extension-point.patch similarity index 100% rename from vscode-paches/0043-refactor-split-service-and-extension-point.patch rename to vscode-paches/0042-refactor-split-service-and-extension-point.patch diff --git a/vscode-paches/0044-fix-weird-syntax.patch b/vscode-paches/0043-fix-weird-syntax.patch similarity index 100% rename from vscode-paches/0044-fix-weird-syntax.patch rename to vscode-paches/0043-fix-weird-syntax.patch diff --git a/vscode-paches/0045-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch b/vscode-paches/0044-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch similarity index 99% rename from vscode-paches/0045-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch rename to vscode-paches/0044-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch index 2971e75c..d4ebbe79 100644 --- a/vscode-paches/0045-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch +++ b/vscode-paches/0044-fix-do-not-export-stuff-from-web-workbench-or-the-ty.patch @@ -10,7 +10,7 @@ Subject: [PATCH] fix: do not export stuff from web workbench or the typescript 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 +index 0829476700c..f075ad5c39a 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 { diff --git a/vscode-paches/0046-fix-change-syntax-that-language-service-refactor-doe.patch b/vscode-paches/0045-fix-change-syntax-that-language-service-refactor-doe.patch similarity index 100% rename from vscode-paches/0046-fix-change-syntax-that-language-service-refactor-doe.patch rename to vscode-paches/0045-fix-change-syntax-that-language-service-refactor-doe.patch diff --git a/vscode-paches/0047-feat-add-build-tool-to-extract-service-identifiers.patch b/vscode-paches/0046-feat-add-build-tool-to-extract-service-identifiers.patch similarity index 100% rename from vscode-paches/0047-feat-add-build-tool-to-extract-service-identifiers.patch rename to vscode-paches/0046-feat-add-build-tool-to-extract-service-identifiers.patch diff --git a/vscode-paches/0048-fix-fix-editor-css.patch b/vscode-paches/0047-fix-fix-editor-css.patch similarity index 100% rename from vscode-paches/0048-fix-fix-editor-css.patch rename to vscode-paches/0047-fix-fix-editor-css.patch diff --git a/vscode-paches/0049-refactor-split-code-to-be-able-to-import-only-requir.patch b/vscode-paches/0048-refactor-split-code-to-be-able-to-import-only-requir.patch similarity index 98% rename from vscode-paches/0049-refactor-split-code-to-be-able-to-import-only-requir.patch rename to vscode-paches/0048-refactor-split-code-to-be-able-to-import-only-requir.patch index 428364e7..3df32a7e 100644 --- a/vscode-paches/0049-refactor-split-code-to-be-able-to-import-only-requir.patch +++ b/vscode-paches/0048-refactor-split-code-to-be-able-to-import-only-requir.patch @@ -4,25 +4,26 @@ 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 +- + .../treeSitter/treeSitterParserService.ts | 4 +- .../common/extensionsScannerService.ts | 294 +++++++++--------- src/vs/platform/files/common/fileService.ts | 111 ++++--- .../localization/browser/localeService.ts | 38 ++- - 4 files changed, 237 insertions(+), 209 deletions(-) + 4 files changed, 238 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 +index c865456f6a2..17e8430cdf0 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 +@@ -15,7 +15,7 @@ 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 { canASAR, importAMDNodeModule } from '../../../../amdX.js'; ++import { canASAR } 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 { +@@ -318,7 +318,7 @@ export class TreeSitterImporter { private _treeSitterImport: typeof import('@vscode/tree-sitter-wasm') | undefined; private async _getTreeSitterImport() { if (!this._treeSitterImport) { diff --git a/vscode-paches/0051-fix-just-use-regular-dynamic-import.patch b/vscode-paches/0049-fix-just-use-regular-dynamic-import.patch similarity index 68% rename from vscode-paches/0051-fix-just-use-regular-dynamic-import.patch rename to vscode-paches/0049-fix-just-use-regular-dynamic-import.patch index 2cae0ff0..776e0cc1 100644 --- a/vscode-paches/0051-fix-just-use-regular-dynamic-import.patch +++ b/vscode-paches/0049-fix-just-use-regular-dynamic-import.patch @@ -1,33 +1,29 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Thu, 12 Sep 2024 19:19:39 +0200 +Date: Wed, 30 Oct 2024 15:01:33 +0100 Subject: [PATCH] fix: just use regular dynamic import --- - .../services/keybinding/browser/keyboardLayoutService.ts | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) + .../services/keybinding/browser/keyboardLayoutService.ts | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -index 28f6ea57c03..0ab2ac0cdc0 100644 +index 8807b7ef370..0ab2ac0cdc0 100644 --- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts +++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -@@ -5,8 +5,6 @@ +@@ -5,7 +5,6 @@ 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 +@@ -456,7 +455,7 @@ export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBa const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux'; -- import(isESM ? -- FileAccess.asBrowserUri(`vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.${platform}.js` satisfies AppResourcePath).path : -- `vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.${platform}` -- ).then((m) => { +- import(FileAccess.asBrowserUri(`vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.${platform}.js` satisfies AppResourcePath).path).then((m) => { + import(`./keyboardLayouts/layout.contribution.${platform}.js`).then((m) => { const keymapInfos: IKeymapInfo[] = m.KeyboardLayoutContribution.INSTANCE.layoutInfos; this._keymapInfos.push(...keymapInfos.map(info => (new KeymapInfo(info.layout, info.secondaryLayouts, info.mapping, info.isUserKeyboardLayout)))); diff --git a/vscode-paches/0052-fix-fix-treeshaking-script.patch b/vscode-paches/0050-fix-fix-treeshaking-script.patch similarity index 100% rename from vscode-paches/0052-fix-fix-treeshaking-script.patch rename to vscode-paches/0050-fix-fix-treeshaking-script.patch diff --git a/vscode-paches/0054-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch b/vscode-paches/0051-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch similarity index 94% rename from vscode-paches/0054-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch rename to vscode-paches/0051-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch index 50f11fcc..41747740 100644 --- a/vscode-paches/0054-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch +++ b/vscode-paches/0051-fix-make-editor-types-build-until-it-s-fixed-by-MS.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: make editor types build until it's fixed by MS 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js -index a5951d21d34..44c61cb0dfd 100644 +index 34576643c7d..54fcbc79d69 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -77,7 +77,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { @@ -20,7 +20,7 @@ index a5951d21d34..44c61cb0dfd 100644 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', +@@ -356,19 +356,19 @@ gulp.task('extract-editor-src', gulp.task('editor-distro', task.series( diff --git a/vscode-paches/0055-fix-allow-data-urls-in-extension-host-worker.patch b/vscode-paches/0052-fix-allow-data-urls-in-extension-host-worker.patch similarity index 67% rename from vscode-paches/0055-fix-allow-data-urls-in-extension-host-worker.patch rename to vscode-paches/0052-fix-allow-data-urls-in-extension-host-worker.patch index 7f270d7e..f9a79d43 100644 --- a/vscode-paches/0055-fix-allow-data-urls-in-extension-host-worker.patch +++ b/vscode-paches/0052-fix-allow-data-urls-in-extension-host-worker.patch @@ -4,17 +4,17 @@ Date: Thu, 17 Oct 2024 16:24:45 +0200 Subject: [PATCH] fix: allow data urls in extension host worker --- - .../extensions/worker/webWorkerExtensionHostIframe.esm.html | 2 +- + .../extensions/worker/webWorkerExtensionHostIframe.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html -index 9a3c7cec21d..85505f08114 100644 ---- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html -+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html +diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html +index 88407e89f16..b5619cac823 100644 +--- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html ++++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html @@ -5,7 +5,7 @@ default-src 'none'; child-src 'self' data: blob:; - script-src 'self' 'unsafe-eval' 'sha256-fCnZ3iXydTZHO961jO3ioYDdWSfm8PZg/rI6zFX/SE0=' https: http://localhost:* blob:; + script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' https: http://localhost:* blob:; - connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/> + connect-src 'self' data: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/> diff --git a/vscode-paches/0053-fix-fix-build.patch b/vscode-paches/0053-fix-fix-build.patch deleted file mode 100644 index c044649b..00000000 --- a/vscode-paches/0053-fix-fix-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: 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/0058-fix-fix-missing-worker-factory.patch b/vscode-paches/0053-fix-fix-missing-worker-factory.patch similarity index 89% rename from vscode-paches/0058-fix-fix-missing-worker-factory.patch rename to vscode-paches/0053-fix-fix-missing-worker-factory.patch index 3af3f664..28182b23 100644 --- a/vscode-paches/0058-fix-fix-missing-worker-factory.patch +++ b/vscode-paches/0053-fix-fix-missing-worker-factory.patch @@ -4,14 +4,14 @@ Date: Tue, 29 Oct 2024 12:00:15 +0100 Subject: [PATCH] fix: fix missing worker factory --- - .../common/services/editorSimpleWorker.esm.ts | 5 +---- + .../common/services/editorSimpleWorkerMain.ts | 5 +---- .../common/services/editorWorkerBootstrap.ts | 15 +++------------ 2 files changed, 4 insertions(+), 16 deletions(-) -diff --git a/src/vs/editor/common/services/editorSimpleWorker.esm.ts b/src/vs/editor/common/services/editorSimpleWorker.esm.ts +diff --git a/src/vs/editor/common/services/editorSimpleWorkerMain.ts b/src/vs/editor/common/services/editorSimpleWorkerMain.ts index 8d0e18738f4..795f00d68c3 100644 ---- a/src/vs/editor/common/services/editorSimpleWorker.esm.ts -+++ b/src/vs/editor/common/services/editorSimpleWorker.esm.ts +--- a/src/vs/editor/common/services/editorSimpleWorkerMain.ts ++++ b/src/vs/editor/common/services/editorSimpleWorkerMain.ts @@ -3,7 +3,4 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ diff --git a/vscode-paches/0054-fix-stop-expecting-a-git-context.patch b/vscode-paches/0054-fix-stop-expecting-a-git-context.patch new file mode 100644 index 00000000..450b2fb3 --- /dev/null +++ b/vscode-paches/0054-fix-stop-expecting-a-git-context.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Wed, 30 Oct 2024 17:47:38 +0100 +Subject: [PATCH] fix: stop expecting a git context + +--- + build/npm/postinstall.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js +index 88e3c9eb1bb..1cf3bbde24e 100644 +--- a/build/npm/postinstall.js ++++ b/build/npm/postinstall.js +@@ -171,5 +171,5 @@ for (let dir of dirs) { + npmInstall(dir, opts); + } + +-cp.execSync('git config pull.rebase merges'); +-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); ++// cp.execSync('git config pull.rebase merges'); ++// cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); diff --git a/vscode-paches/0050-fix-rollback-typescript-as-the-last-version-breaks-t.patch b/vscode-paches/0055-fix-rollback-typescript-as-the-last-version-breaks-t.patch similarity index 75% rename from vscode-paches/0050-fix-rollback-typescript-as-the-last-version-breaks-t.patch rename to vscode-paches/0055-fix-rollback-typescript-as-the-last-version-breaks-t.patch index 6d7b9c28..33dfcdca 100644 --- a/vscode-paches/0050-fix-rollback-typescript-as-the-last-version-breaks-t.patch +++ b/vscode-paches/0055-fix-rollback-typescript-as-the-last-version-breaks-t.patch @@ -1,6 +1,6 @@ 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 +Date: Wed, 6 Nov 2024 19:49:31 +0100 Subject: [PATCH] fix: rollback typescript as the last version breaks the extractServices script @@ -11,25 +11,25 @@ Subject: [PATCH] fix: rollback typescript as the last version breaks the 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json -index 7b029961668..b0904ba0f51 100644 +index 0f737c5ec28..9d4faed922a 100644 --- a/package-lock.json +++ b/package-lock.json -@@ -154,7 +154,7 @@ +@@ -152,7 +152,7 @@ "ts-node": "^10.9.1", "tsec": "0.2.7", "tslib": "^2.6.3", -- "typescript": "^5.7.0-dev.20240903", +- "typescript": "^5.7.0-dev.20241021", + "typescript": "5.5.0-dev.20240408", + "typescript-eslint": "^8.8.0", "util": "^0.12.4", "webpack": "^5.94.0", - "webpack-cli": "^5.1.4", -@@ -18579,9 +18579,9 @@ +@@ -17212,9 +17212,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.7.0-dev.20241021", +- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.0-dev.20241021.tgz", +- "integrity": "sha512-nf5PGykGkdF2Palp0anP/jjLiqM7jdLaIyhpq1Y8bhHnClE1JR2eHXrame54dWeaX0ZMc3NF/TD59xtVhZiuMA==", + "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==", @@ -37,27 +37,27 @@ index 7b029961668..b0904ba0f51 100644 "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json -index 7e0de1810c6..ff1e24a30ba 100644 +index 0f1a06f3e20..f80abdfe8da 100644 --- a/package.json +++ b/package.json -@@ -216,7 +216,7 @@ +@@ -210,7 +210,7 @@ "ts-node": "^10.9.1", "tsec": "0.2.7", "tslib": "^2.6.3", -- "typescript": "^5.7.0-dev.20240903", +- "typescript": "^5.7.0-dev.20241021", + "typescript": "5.5.0-dev.20240408", + "typescript-eslint": "^8.8.0", "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 +index fe0fa0e7838..d8ac7155949 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 ++ // @ts-ignore const signal = options.timeout ? AbortSignal.any([ cancellation.signal, AbortSignal.timeout(options.timeout), diff --git a/vscode-paches/0056-fix-store-activeChatController-in-another-module.patch b/vscode-paches/0056-fix-store-activeChatController-in-another-module.patch deleted file mode 100644 index 1b7da08d..00000000 --- a/vscode-paches/0056-fix-store-activeChatController-in-another-module.patch +++ /dev/null @@ -1,280 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Tue, 22 Oct 2024 13:04:08 +0200 -Subject: [PATCH] fix: store activeChatController in another module - -so xterm and all the terminal stuff is not always pulled ---- - .../contrib/chat/browser/chatWidget.ts | 4 +-- - .../actions/voiceChatActions.ts | 6 ++-- - .../terminal/terminalContribExports.ts | 1 + - .../chat/browser/terminalChatActions.ts | 29 ++++++++++--------- - .../chat/browser/terminalChatController.ts | 10 ++----- - .../browser/terminalChatControllerHolder.ts | 15 ++++++++++ - 6 files changed, 39 insertions(+), 26 deletions(-) - create mode 100644 src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts - -diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts -index 612ae173d99..03ee869804c 100644 ---- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts -+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts -@@ -29,7 +29,7 @@ import { WorkbenchObjectTree } from '../../../../platform/list/browser/listServi - import { ILogService } from '../../../../platform/log/common/log.js'; - import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; - import { IThemeService } from '../../../../platform/theme/common/themeService.js'; --import { TerminalChatController } from '../../terminal/terminalContribExports.js'; -+import { activeChatController } from '../../terminal/terminalContribExports.js'; - import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, IChatWelcomeMessageContent, isChatWelcomeMessageContent } from '../common/chatAgents.js'; - import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_LAST_ITEM_ID, CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js'; - import { IChatEditingService, IChatEditingSession } from '../common/chatEditingService.js'; -@@ -1107,7 +1107,7 @@ export class ChatWidgetService implements IChatWidgetService { - private _lastFocusedWidget: ChatWidget | undefined = undefined; - - get lastFocusedWidget(): IChatWidget | undefined { -- return TerminalChatController.activeChatController?.chatWidget ?? this._lastFocusedWidget; -+ return activeChatController?.chatWidget ?? this._lastFocusedWidget; - } - - constructor() { } -diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts -index b64c4c90309..de87fbf79ab 100644 ---- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts -+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts -@@ -47,7 +47,7 @@ import { CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../. - import { NOTEBOOK_EDITOR_FOCUSED } from '../../../notebook/common/notebookContextKeys.js'; - import { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus, TextToSpeechStatus, TextToSpeechInProgress as GlobalTextToSpeechInProgress } from '../../../speech/common/speechService.js'; - import { ITerminalService } from '../../../terminal/browser/terminal.js'; --import { TerminalChatContextKeys, TerminalChatController } from '../../../terminal/terminalContribExports.js'; -+import { TerminalChatContextKeys, TerminalChatController, activeChatController } from '../../../terminal/terminalContribExports.js'; - import { IEditorService } from '../../../../services/editor/common/editorService.js'; - import { IHostService } from '../../../../services/host/browser/host.js'; - import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js'; -@@ -148,7 +148,7 @@ class VoiceChatSessionControllerFactory { - // 1.) probe terminal chat which is not part of chat widget service - const activeInstance = terminalService.activeInstance; - if (activeInstance) { -- const terminalChat = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const terminalChat = activeChatController || TerminalChatController.get(activeInstance); - if (terminalChat?.hasFocus()) { - return VoiceChatSessionControllerFactory.doCreateForTerminalChat(terminalChat); - } -@@ -747,7 +747,7 @@ class ChatSynthesizerSessionController { - // 1.) probe terminal chat which is not part of chat widget service - const activeInstance = terminalService.activeInstance; - if (activeInstance) { -- const terminalChat = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const terminalChat = activeChatController || TerminalChatController.get(activeInstance); - if (terminalChat?.hasFocus()) { - return { - onDidHideChat: terminalChat.onDidHide, -diff --git a/src/vs/workbench/contrib/terminal/terminalContribExports.ts b/src/vs/workbench/contrib/terminal/terminalContribExports.ts -index 165a8a6b817..7a66748847a 100644 ---- a/src/vs/workbench/contrib/terminal/terminalContribExports.ts -+++ b/src/vs/workbench/contrib/terminal/terminalContribExports.ts -@@ -4,6 +4,7 @@ - *--------------------------------------------------------------------------------------------*/ - - import { TerminalAccessibilityCommandId } from '../terminalContrib/accessibility/common/terminal.accessibility.js'; -+export { activeChatController } from '../terminalContrib/chat/browser/terminalChatControllerHolder.js'; - import { TerminalDeveloperCommandId } from '../terminalContrib/developer/common/terminal.developer.js'; - import { TerminalStickyScrollSettingId } from '../terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.js'; - import { TerminalSuggestSettingId } from '../terminalContrib/suggest/common/terminalSuggestConfiguration.js'; -diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts -index 82809d421e6..69664dc2b4b 100644 ---- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts -+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts -@@ -15,6 +15,7 @@ import { registerActiveXtermAction } from '../../../terminal/browser/terminalAct - import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js'; - import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js'; - import { TerminalChatController } from './terminalChatController.js'; -+import { activeChatController } from './terminalChatControllerHolder.js'; - - registerActiveXtermAction({ - id: TerminalChatCommandId.Start, -@@ -36,7 +37,7 @@ registerActiveXtermAction({ - return; - } - -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - - if (opts) { - opts = typeof opts === 'string' ? { query: opts } : opts; -@@ -76,7 +77,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.clear(); - } - }); -@@ -98,7 +99,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.chatWidget?.focusLastMessage(); - } - }); -@@ -121,7 +122,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.terminalChatWidget?.focus(); - } - }); -@@ -150,7 +151,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.clear(); - } - }); -@@ -182,7 +183,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.acceptCommand(true); - } - }); -@@ -212,7 +213,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.acceptCommand(true); - } - }); -@@ -243,7 +244,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.acceptCommand(false); - } - }); -@@ -273,7 +274,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.acceptCommand(false); - } - }); -@@ -302,7 +303,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.viewInChat(); - } - }); -@@ -331,7 +332,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.acceptInput(); - } - }); -@@ -352,7 +353,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.cancel(); - } - }); -@@ -371,7 +372,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.populateHistory(true); - } - }); -@@ -390,7 +391,7 @@ registerActiveXtermAction({ - if (isDetachedTerminalInstance(activeInstance)) { - return; - } -- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); -+ const contr = activeChatController || TerminalChatController.get(activeInstance); - contr?.populateHistory(false); - } - }); -diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts -index 6ed1f888c50..32bf5b8542f 100644 ---- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts -+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts -@@ -25,6 +25,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../../pla - import { assertType } from '../../../../../base/common/types.js'; - import { CancelablePromise, createCancelablePromise, DeferredPromise } from '../../../../../base/common/async.js'; - import { ChatAgentLocation } from '../../../chat/common/chatAgents.js'; -+import { setActiveChatController } from './terminalChatControllerHolder.js'; - - const enum Message { - NONE = 0, -@@ -43,11 +44,6 @@ export class TerminalChatController extends Disposable implements ITerminalContr - static get(instance: ITerminalInstance): TerminalChatController | null { - return instance.getContribution(TerminalChatController.ID); - } -- /** -- * The controller for the currently focused chat widget. This is used to track action context since 'active terminals' -- * are only tracked for non-detached terminal instanecs. -- */ -- static activeChatController?: TerminalChatController; - - private static _storageKey = 'terminal-inline-chat-history'; - private static _promptHistory: string[] = []; -@@ -149,13 +145,13 @@ export class TerminalChatController extends Disposable implements ITerminalContr - this._terminalChatWidget = new Lazy(() => { - const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._instance.domElement!, this._instance, xterm)); - this._register(chatWidget.focusTracker.onDidFocus(() => { -- TerminalChatController.activeChatController = this; -+ setActiveChatController(this); - if (!isDetachedTerminalInstance(this._instance)) { - this._terminalService.setActiveInstance(this._instance); - } - })); - this._register(chatWidget.focusTracker.onDidBlur(() => { -- TerminalChatController.activeChatController = undefined; -+ setActiveChatController(undefined); - this._instance.resetScrollbarVisibility(); - })); - if (!this._instance.domElement) { -diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts -new file mode 100644 -index 00000000000..bb67971614b ---- /dev/null -+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts -@@ -0,0 +1,15 @@ -+/*--------------------------------------------------------------------------------------------- -+ * Copyright (c) Microsoft Corporation. All rights reserved. -+ * Licensed under the MIT License. See License.txt in the project root for license information. -+ *--------------------------------------------------------------------------------------------*/ -+import { TerminalChatController } from './terminalChatController.js'; -+ -+/** -+ * The controller for the currently focused chat widget. This is used to track action context since 'active terminals' -+ * are only tracked for non-detached terminal instanecs. -+ */ -+export let activeChatController: TerminalChatController | undefined; -+ -+export function setActiveChatController(_activeChatController: TerminalChatController | undefined) { -+ activeChatController = _activeChatController; -+} diff --git a/vscode-paches/0057-fix-extract-constants-into-separate-module.patch b/vscode-paches/0057-fix-extract-constants-into-separate-module.patch deleted file mode 100644 index 92c5d5a4..00000000 --- a/vscode-paches/0057-fix-extract-constants-into-separate-module.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Tue, 22 Oct 2024 13:04:46 +0200 -Subject: [PATCH] fix: extract constants into separate module - -so that only the constant is pulled from the root instead of the whole module graph ---- - src/vs/workbench/api/browser/mainThreadChatAgents2.ts | 5 +++-- - .../contrib/chat/browser/actions/chatActions.ts | 5 ++--- - .../contrib/chat/browser/actions/chatConstants.ts | 10 ++++++++++ - .../chat/browser/actions/chatQuickInputActions.ts | 3 ++- - .../chat/browser/contrib/chatDynamicVariables.ts | 3 ++- - .../browser/contrib/chatDynamicVariablesConstant.ts | 6 ++++++ - .../contrib/quickaccess/browser/commandsQuickAccess.ts | 3 +-- - 7 files changed, 26 insertions(+), 9 deletions(-) - create mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts - create mode 100644 src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts - -diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -index a61d91c78e1..f5c72bcb0ee 100644 ---- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -@@ -24,13 +24,14 @@ import { ILogService } from '../../../platform/log/common/log.js'; - import { ExtHostChatAgentsShape2, ExtHostContext, IChatParticipantMetadata, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from '../common/extHost.protocol.js'; - import { IChatWidgetService } from '../../contrib/chat/browser/chat.js'; - import { ChatInputPart } from '../../contrib/chat/browser/chatInputPart.js'; --import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js'; -+import { IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js'; - import { ChatAgentLocation, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js'; - import { ChatRequestAgentPart } from '../../contrib/chat/common/chatParserTypes.js'; - import { ChatRequestParser } from '../../contrib/chat/common/chatRequestParser.js'; - import { IChatContentReference, IChatFollowup, IChatProgress, IChatService, IChatTask, IChatWarningMessage } from '../../contrib/chat/common/chatService.js'; - import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js'; - import { IExtensionService } from '../../services/extensions/common/extensions.js'; -+import { addDynamicVariableActionId } from '../../contrib/chat/browser/contrib/chatDynamicVariablesConstant.js'; - - interface AgentData { - dispose: () => void; -@@ -289,7 +290,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA - kind: CompletionItemKind.Text, - detail: v.detail, - documentation: v.documentation, -- command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value) as any, command: v.command } satisfies IAddDynamicVariableContext] } -+ command: { id: addDynamicVariableActionId, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value) as any, command: v.command } satisfies IAddDynamicVariableContext] } - } satisfies CompletionItem; - }); - -diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -index 5ed8892df37..8d84695b3a4 100644 ---- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -@@ -38,6 +38,8 @@ import { toAction } from '../../../../../base/common/actions.js'; - import { extractAgentAndCommand } from '../../common/chatParserTypes.js'; - import { Position } from '../../../../../editor/common/core/position.js'; - import { SuggestController } from '../../../../../editor/contrib/suggest/browser/suggestController.js'; -+import { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from './chatConstants.js'; -+export { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from './chatConstants.js'; - - export interface IChatViewTitleActionContext { - chatView: ChatViewPane; -@@ -47,9 +49,6 @@ export function isChatViewTitleActionContext(obj: unknown): obj is IChatViewTitl - return obj instanceof Object && 'chatView' in obj; - } - --export const CHAT_CATEGORY = localize2('chat.category', 'Chat'); --export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open'; -- - export interface IChatViewOpenOptions { - /** - * The query for quick chat. -diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts b/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts -new file mode 100644 -index 00000000000..6ce67486a58 ---- /dev/null -+++ b/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts -@@ -0,0 +1,10 @@ -+/*--------------------------------------------------------------------------------------------- -+ * Copyright (c) Microsoft Corporation. All rights reserved. -+ * Licensed under the MIT License. See License.txt in the project root for license information. -+ *--------------------------------------------------------------------------------------------*/ -+import { localize2 } from '../../../../../nls.js'; -+ -+export const CHAT_CATEGORY = localize2('chat.category', 'Chat'); -+export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open'; -+export const ASK_QUICK_QUESTION_ACTION_ID = 'workbench.action.quickchat.toggle'; -+ -diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts -index 05652beb196..1ced9c6afd4 100644 ---- a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts -+++ b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts -@@ -15,8 +15,9 @@ import { CHAT_CATEGORY } from './chatActions.js'; - import { IQuickChatOpenOptions, IQuickChatService } from '../chat.js'; - import { CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js'; - import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js'; -+import { ASK_QUICK_QUESTION_ACTION_ID } from './chatConstants.js'; -+export { ASK_QUICK_QUESTION_ACTION_ID } from './chatConstants.js'; - --export const ASK_QUICK_QUESTION_ACTION_ID = 'workbench.action.quickchat.toggle'; - export function registerQuickChatActions() { - registerAction2(QuickChatGlobalAction); - registerAction2(AskQuickChatAction); -diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts -index bd240abb61c..48db2999341 100644 ---- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts -+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts -@@ -23,6 +23,7 @@ import { IQuickInputService } from '../../../../../platform/quickinput/common/qu - import { IChatWidget } from '../chat.js'; - import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js'; - import { IChatRequestVariableValue, IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js'; -+import { addDynamicVariableActionId } from './chatDynamicVariablesConstant.js'; - - export const dynamicVariableDecorationType = 'chat-dynamic-variable'; - -@@ -230,7 +231,7 @@ function isAddDynamicVariableContext(context: any): context is IAddDynamicVariab - } - - export class AddDynamicVariableAction extends Action2 { -- static readonly ID = 'workbench.action.chat.addDynamicVariable'; -+ static readonly ID = addDynamicVariableActionId; - - constructor() { - super({ -diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts -new file mode 100644 -index 00000000000..df0794493a8 ---- /dev/null -+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts -@@ -0,0 +1,6 @@ -+/*--------------------------------------------------------------------------------------------- -+ * Copyright (c) Microsoft Corporation. All rights reserved. -+ * Licensed under the MIT License. See License.txt in the project root for license information. -+ *--------------------------------------------------------------------------------------------*/ -+ -+export const addDynamicVariableActionId = 'workbench.action.chat.addDynamicVariable'; -diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts -index 3ab1684b9ac..a91549c6daf 100644 ---- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts -+++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts -@@ -30,8 +30,7 @@ import { IQuickInputService, IQuickPickSeparator } from '../../../../platform/qu - import { IStorageService } from '../../../../platform/storage/common/storage.js'; - import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; - import { IWorkbenchQuickAccessConfiguration } from '../../../browser/quickaccess.js'; --import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js'; --import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js'; -+import { CHAT_OPEN_ACTION_ID, ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatConstants.js'; - import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js'; - import { CommandInformationResult, IAiRelatedInformationService, RelatedInformationType } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js'; - import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';