diff --git a/.rebase/CHANGELOG.md b/.rebase/CHANGELOG.md index 60552a624b08..6019a747caf8 100644 --- a/.rebase/CHANGELOG.md +++ b/.rebase/CHANGELOG.md @@ -13,6 +13,18 @@ https://github.com/che-incubator/che-code/pull/813 - code/extensions/npm/package.json --- +#### @sbouchet +https://github.com/che-incubator/che-code/pull/812 + +- code/package.json +- code/build/package.json +- code/build/rspack/package.json +- code/build/agent-sdk/agents/claude/package.json +- code/extensions/copilot/package.json +- code/test/monaco/package.json +- code/test/mcp/package.json +--- + #### @sbouchet https://github.com/che-incubator/che-code/pull/811 diff --git a/.rebase/add/code/build/agent-sdk/agents/claude/package.json b/.rebase/add/code/build/agent-sdk/agents/claude/package.json index 7fb50a75143a..fe288ce06702 100644 --- a/.rebase/add/code/build/agent-sdk/agents/claude/package.json +++ b/.rebase/add/code/build/agent-sdk/agents/claude/package.json @@ -1,5 +1,8 @@ { "overrides": { - "ip-address": "^10.5.0" + "ip-address": "^10.5.0", + "ajv": { + "fast-uri": "^3.1.8" + } } } diff --git a/.rebase/add/code/build/package.json b/.rebase/add/code/build/package.json index 81160eacdc8e..fcd023aa82a6 100644 --- a/.rebase/add/code/build/package.json +++ b/.rebase/add/code/build/package.json @@ -11,6 +11,9 @@ "js-yaml": "^4.3.2", "markdown-it": { "linkify-it": "^5.0.2" + }, + "ajv": { + "fast-uri": "^3.1.8" } } } diff --git a/.rebase/add/code/build/rspack/package.json b/.rebase/add/code/build/rspack/package.json new file mode 100644 index 000000000000..1977a7c70414 --- /dev/null +++ b/.rebase/add/code/build/rspack/package.json @@ -0,0 +1,7 @@ +{ + "overrides": { + "ajv": { + "fast-uri": "^3.1.8" + } + } +} diff --git a/.rebase/add/code/extensions/copilot/package.json b/.rebase/add/code/extensions/copilot/package.json index 0ac988575c5e..b55d73ca7d05 100644 --- a/.rebase/add/code/extensions/copilot/package.json +++ b/.rebase/add/code/extensions/copilot/package.json @@ -19,6 +19,9 @@ }, "markdown-it": { "linkify-it": "^5.0.2" + }, + "ajv": { + "fast-uri": "^3.1.8" } } } diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json index 2e8f817a9ffd..36e16fcea904 100644 --- a/.rebase/add/code/package.json +++ b/.rebase/add/code/package.json @@ -24,6 +24,9 @@ "axios": "^1.20.0" }, "js-yaml@4": "^4.3.2", - "js-yaml@3": "^3.15.2" + "js-yaml@3": "^3.15.2", + "ajv": { + "fast-uri": "^3.1.8" + } } } diff --git a/.rebase/add/code/test/mcp/package.json b/.rebase/add/code/test/mcp/package.json index 580e84f032f2..03baa40444ad 100644 --- a/.rebase/add/code/test/mcp/package.json +++ b/.rebase/add/code/test/mcp/package.json @@ -5,6 +5,9 @@ "ip-address": "^10.5.0", "@types/node-fetch": { "form-data": "^4.0.6" + }, + "ajv": { + "fast-uri": "^3.1.8" } } } diff --git a/.rebase/add/code/test/monaco/package.json b/.rebase/add/code/test/monaco/package.json index 6be27a2edf71..e40bb708fabf 100644 --- a/.rebase/add/code/test/monaco/package.json +++ b/.rebase/add/code/test/monaco/package.json @@ -1,5 +1,8 @@ { "overrides": { - "lodash": "^4.18.1" + "lodash": "^4.18.1", + "ajv": { + "fast-uri": "^3.1.8" + } } } diff --git a/code/build/agent-sdk/agents/claude/package-lock.json b/code/build/agent-sdk/agents/claude/package-lock.json index 8cbf703ae641..8ea6e2544e95 100644 --- a/code/build/agent-sdk/agents/claude/package-lock.json +++ b/code/build/agent-sdk/agents/claude/package-lock.json @@ -645,9 +645,9 @@ "peer": true }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "funding": [ { "type": "github", diff --git a/code/build/agent-sdk/agents/claude/package.json b/code/build/agent-sdk/agents/claude/package.json index ebedd2166205..9dd9935e9e06 100644 --- a/code/build/agent-sdk/agents/claude/package.json +++ b/code/build/agent-sdk/agents/claude/package.json @@ -6,6 +6,9 @@ "@anthropic-ai/claude-agent-sdk": "0.3.198" }, "overrides": { - "ip-address": "^10.5.0" + "ip-address": "^10.5.0", + "ajv": { + "fast-uri": "^3.1.8" + } } } diff --git a/code/build/package-lock.json b/code/build/package-lock.json index afb8829590e4..65d8b79ac09f 100644 --- a/code/build/package-lock.json +++ b/code/build/package-lock.json @@ -3475,9 +3475,9 @@ "dev": true }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "dev": true, "funding": [ { diff --git a/code/build/package.json b/code/build/package.json index 1206a2d745cf..a2d62d9d9192 100644 --- a/code/build/package.json +++ b/code/build/package.json @@ -91,6 +91,9 @@ "js-yaml": "^4.3.2", "markdown-it": { "linkify-it": "^5.0.2" + }, + "ajv": { + "fast-uri": "^3.1.8" } } } diff --git a/code/build/rspack/package-lock.json b/code/build/rspack/package-lock.json index d61ad6f74a67..6bd8ed0dab81 100644 --- a/code/build/rspack/package-lock.json +++ b/code/build/rspack/package-lock.json @@ -56,53 +56,53 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" - }, - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz" + } }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=6.0.0" - }, - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz" + } }, "node_modules/@jridgewell/source-map": { "version": "0.3.11", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25" - }, - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz" + } }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz" + "peer": true }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" - }, - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz" + } }, "node_modules/@napi-rs/wasm-runtime": { "version": "1.1.6", @@ -411,113 +411,114 @@ }, "node_modules/@types/eslint": { "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" - }, - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz" + } }, "node_modules/@types/eslint-scope": { "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@types/eslint": "*", "@types/estree": "*" - }, - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz" + } }, "node_modules/@types/estree": { "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz" + "peer": true }, "node_modules/@types/json-schema": { "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz" + "peer": true }, "node_modules/@types/node": { "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "undici-types": "~7.18.0" - }, - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz" + } }, "node_modules/@vscode/component-explorer": { "version": "0.2.1-58", + "resolved": "https://registry.npmjs.org/@vscode/component-explorer/-/component-explorer-0.2.1-58.tgz", "license": "MIT", "dependencies": { "react": "^18.3.1", "react-dom": "^18.3.1" - }, - "resolved": "https://registry.npmjs.org/@vscode/component-explorer/-/component-explorer-0.2.1-58.tgz" + } }, "node_modules/@vscode/component-explorer-webpack-plugin": { "version": "0.3.1-53", + "resolved": "https://registry.npmjs.org/@vscode/component-explorer-webpack-plugin/-/component-explorer-webpack-plugin-0.3.1-53.tgz", "license": "MIT", "dependencies": { "tinyglobby": "^0.2.16" }, "peerDependencies": { "@vscode/component-explorer": "*" - }, - "resolved": "https://registry.npmjs.org/@vscode/component-explorer-webpack-plugin/-/component-explorer-webpack-plugin-0.3.1-53.tgz" + } }, "node_modules/@vscode/esm-url-webpack-plugin": { "version": "1.0.1-5", + "resolved": "https://registry.npmjs.org/@vscode/esm-url-webpack-plugin/-/esm-url-webpack-plugin-1.0.1-5.tgz", "dev": true, "license": "MIT", "peerDependencies": { "webpack": "^5.0.0" - }, - "resolved": "https://registry.npmjs.org/@vscode/esm-url-webpack-plugin/-/esm-url-webpack-plugin-1.0.1-5.tgz" + } }, "node_modules/@webassemblyjs/ast": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@webassemblyjs/helper-numbers": "1.13.2", "@webassemblyjs/helper-wasm-bytecode": "1.13.2" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz" + } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz" + "peer": true }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz" + "peer": true }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz" + "peer": true }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", "dev": true, "license": "MIT", "peer": true, @@ -525,18 +526,18 @@ "@webassemblyjs/floating-point-hex-parser": "1.13.2", "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz" + } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz" + "peer": true }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -545,38 +546,38 @@ "@webassemblyjs/helper-buffer": "1.14.1", "@webassemblyjs/helper-wasm-bytecode": "1.13.2", "@webassemblyjs/wasm-gen": "1.14.1" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz" + } }, "node_modules/@webassemblyjs/ieee754": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz" + } }, "node_modules/@webassemblyjs/leb128": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", "dev": true, "license": "Apache-2.0", "peer": true, "dependencies": { "@xtuc/long": "4.2.2" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz" + } }, "node_modules/@webassemblyjs/utf8": { "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz" + "peer": true }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -589,11 +590,11 @@ "@webassemblyjs/wasm-opt": "1.14.1", "@webassemblyjs/wasm-parser": "1.14.1", "@webassemblyjs/wast-printer": "1.14.1" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz" + } }, "node_modules/@webassemblyjs/wasm-gen": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -603,11 +604,11 @@ "@webassemblyjs/ieee754": "1.13.2", "@webassemblyjs/leb128": "1.13.2", "@webassemblyjs/utf8": "1.13.2" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz" + } }, "node_modules/@webassemblyjs/wasm-opt": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -616,11 +617,11 @@ "@webassemblyjs/helper-buffer": "1.14.1", "@webassemblyjs/wasm-gen": "1.14.1", "@webassemblyjs/wasm-parser": "1.14.1" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz" + } }, "node_modules/@webassemblyjs/wasm-parser": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -631,36 +632,36 @@ "@webassemblyjs/ieee754": "1.13.2", "@webassemblyjs/leb128": "1.13.2", "@webassemblyjs/utf8": "1.13.2" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz" + } }, "node_modules/@webassemblyjs/wast-printer": { "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" - }, - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz" + } }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "dev": true, "license": "BSD-3-Clause", - "peer": true, - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz" + "peer": true }, "node_modules/@xtuc/long": { "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "dev": true, "license": "Apache-2.0", - "peer": true, - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" + "peer": true }, "node_modules/acorn": { "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", "dev": true, "license": "MIT", "peer": true, @@ -669,11 +670,11 @@ }, "engines": { "node": ">=0.4.0" - }, - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz" + } }, "node_modules/acorn-import-phases": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz", "dev": true, "license": "MIT", "peer": true, @@ -682,11 +683,11 @@ }, "peerDependencies": { "acorn": "^8.14.0" - }, - "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz" + } }, "node_modules/ajv": { "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "dev": true, "license": "MIT", "peer": true, @@ -699,11 +700,11 @@ "funding": { "type": "github", "url": "https://github.com/sponsors/epoberezkin" - }, - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz" + } }, "node_modules/ajv-formats": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -717,11 +718,11 @@ "ajv": { "optional": true } - }, - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz" + } }, "node_modules/ajv-keywords": { "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", "dev": true, "license": "MIT", "peer": true, @@ -730,11 +731,11 @@ }, "peerDependencies": { "ajv": "^8.8.2" - }, - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz" + } }, "node_modules/baseline-browser-mapping": { "version": "2.10.27", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.27.tgz", "dev": true, "license": "Apache-2.0", "peer": true, @@ -743,11 +744,11 @@ }, "engines": { "node": ">=6.0.0" - }, - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.27.tgz" + } }, "node_modules/browserslist": { "version": "4.28.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", "dev": true, "funding": [ { @@ -777,18 +778,18 @@ }, "engines": { "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz" + } }, "node_modules/buffer-from": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" + "peer": true }, "node_modules/caniuse-lite": { "version": "1.0.30001791", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz", "dev": true, "funding": [ { @@ -805,28 +806,28 @@ } ], "license": "CC-BY-4.0", - "peer": true, - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz" + "peer": true }, "node_modules/chrome-trace-event": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=6.0" - }, - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz" + } }, "node_modules/electron-to-chromium": { "version": "1.5.345", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.345.tgz", "dev": true, "license": "ISC", - "peer": true, - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.345.tgz" + "peer": true }, "node_modules/enhanced-resolve": { "version": "5.21.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz", "dev": true, "license": "MIT", "peer": true, @@ -836,28 +837,28 @@ }, "engines": { "node": ">=10.13.0" - }, - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz" + } }, "node_modules/es-module-lexer": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz" + "peer": true }, "node_modules/escalade": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=6" - }, - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz" + } }, "node_modules/eslint-scope": { "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -867,11 +868,11 @@ }, "engines": { "node": ">=8.0.0" - }, - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" + } }, "node_modules/esrecurse": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -880,48 +881,49 @@ }, "engines": { "node": ">=4.0" - }, - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" + } }, "node_modules/esrecurse/node_modules/estraverse": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "dev": true, "license": "BSD-2-Clause", "peer": true, "engines": { "node": ">=4.0" - }, - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" + } }, "node_modules/estraverse": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "dev": true, "license": "BSD-2-Clause", "peer": true, "engines": { "node": ">=4.0" - }, - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" + } }, "node_modules/events": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=0.8.x" - }, - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz" + } }, "node_modules/fast-deep-equal": { "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" + "peer": true }, "node_modules/fast-uri": { - "version": "3.1.2", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "dev": true, "funding": [ { @@ -934,11 +936,11 @@ } ], "license": "BSD-3-Clause", - "peer": true, - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz" + "peer": true }, "node_modules/fdir": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", "license": "MIT", "engines": { "node": ">=12.0.0" @@ -950,35 +952,35 @@ "picomatch": { "optional": true } - }, - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz" + } }, "node_modules/glob-to-regexp": { "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "dev": true, "license": "BSD-2-Clause", - "peer": true, - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" + "peer": true }, "node_modules/graceful-fs": { "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "dev": true, "license": "ISC", - "peer": true, - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz" + "peer": true }, "node_modules/has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=8" - }, - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" + } }, "node_modules/jest-worker": { "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -989,23 +991,23 @@ }, "engines": { "node": ">= 10.13.0" - }, - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz" + } }, "node_modules/js-tokens": { "version": "4.0.0", - "license": "MIT", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz" + "peer": true }, "node_modules/loader-runner": { "version": "4.3.2", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1015,82 +1017,82 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" - }, - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz" + } }, "node_modules/loose-envify": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "license": "MIT", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" - }, - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" + } }, "node_modules/merge-stream": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" + "peer": true }, "node_modules/mime-db": { "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">= 0.6" - }, - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz" + } }, "node_modules/neo-async": { "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" + "peer": true }, "node_modules/node-releases": { "version": "2.0.38", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz" + "peer": true }, "node_modules/picocolors": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "dev": true, "license": "ISC", - "peer": true, - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz" + "peer": true }, "node_modules/picomatch": { "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", "license": "MIT", "engines": { "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" - }, - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz" + } }, "node_modules/react": { "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" }, "engines": { "node": ">=0.10.0" - }, - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz" + } }, "node_modules/react-dom": { "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "license": "MIT", "dependencies": { "loose-envify": "^1.1.0", @@ -1098,35 +1100,35 @@ }, "peerDependencies": { "react": "^18.3.1" - }, - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz" + } }, "node_modules/require-from-string": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=0.10.0" - }, - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" + } }, "node_modules/safer-buffer": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "dev": true, - "license": "MIT", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + "license": "MIT" }, "node_modules/scheduler": { "version": "0.23.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" - }, - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz" + } }, "node_modules/schema-utils": { "version": "4.3.3", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1142,30 +1144,30 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" - }, - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz" + } }, "node_modules/source-map": { "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "dev": true, "license": "BSD-3-Clause", "peer": true, "engines": { "node": ">=0.10.0" - }, - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + } }, "node_modules/source-map-js": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" - }, - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz" + } }, "node_modules/source-map-loader": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz", "dev": true, "license": "MIT", "dependencies": { @@ -1181,11 +1183,11 @@ }, "peerDependencies": { "webpack": "^5.72.1" - }, - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz" + } }, "node_modules/source-map-loader/node_modules/iconv-lite": { "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "dev": true, "license": "MIT", "dependencies": { @@ -1193,22 +1195,22 @@ }, "engines": { "node": ">=0.10.0" - }, - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" + } }, "node_modules/source-map-support": { "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "dev": true, "license": "MIT", "peer": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" - }, - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz" + } }, "node_modules/supports-color": { "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1220,11 +1222,11 @@ }, "funding": { "url": "https://github.com/chalk/supports-color?sponsor=1" - }, - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + } }, "node_modules/tapable": { "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1234,11 +1236,11 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" - }, - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz" + } }, "node_modules/terser": { "version": "5.46.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -1253,11 +1255,11 @@ }, "engines": { "node": ">=10" - }, - "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz" + } }, "node_modules/terser-webpack-plugin": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1287,18 +1289,18 @@ "uglify-js": { "optional": true } - }, - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz" + } }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" + "peer": true }, "node_modules/tinyglobby": { "version": "0.2.16", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -1309,25 +1311,25 @@ }, "funding": { "url": "https://github.com/sponsors/SuperchupuDev" - }, - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz" + } }, "node_modules/tslib": { "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "dev": true, "license": "0BSD", - "optional": true, - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz" + "optional": true }, "node_modules/undici-types": { "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", "dev": true, "license": "MIT", - "peer": true, - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz" + "peer": true }, "node_modules/update-browserslist-db": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", "dev": true, "funding": [ { @@ -1354,11 +1356,11 @@ }, "peerDependencies": { "browserslist": ">= 4.21.0" - }, - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz" + } }, "node_modules/watchpack": { "version": "2.5.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1368,11 +1370,11 @@ }, "engines": { "node": ">=10.13.0" - }, - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz" + } }, "node_modules/webpack": { "version": "5.106.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz", "dev": true, "license": "MIT", "peer": true, @@ -1416,18 +1418,17 @@ "webpack-cli": { "optional": true } - }, - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz" + } }, "node_modules/webpack-sources": { "version": "3.4.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz", "dev": true, "license": "MIT", "peer": true, "engines": { "node": ">=10.13.0" - }, - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz" + } } } } diff --git a/code/build/rspack/package.json b/code/build/rspack/package.json index a812e140bb22..7a6cd6b758bd 100644 --- a/code/build/rspack/package.json +++ b/code/build/rspack/package.json @@ -16,5 +16,10 @@ "dependencies": { "@vscode/component-explorer": "^0.2.1-58", "@vscode/component-explorer-webpack-plugin": "^0.3.1-53" + }, + "overrides": { + "ajv": { + "fast-uri": "^3.1.8" + } } } diff --git a/code/extensions/copilot/package-lock.json b/code/extensions/copilot/package-lock.json index c5fe82045e2d..ed2a9efce89b 100644 --- a/code/extensions/copilot/package-lock.json +++ b/code/extensions/copilot/package-lock.json @@ -9971,9 +9971,9 @@ } }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "funding": [ { "type": "github", diff --git a/code/extensions/copilot/package.json b/code/extensions/copilot/package.json index 3bd2d69c6212..fa3820fb9f15 100644 --- a/code/extensions/copilot/package.json +++ b/code/extensions/copilot/package.json @@ -7267,6 +7267,9 @@ }, "markdown-it": { "linkify-it": "^5.0.2" + }, + "ajv": { + "fast-uri": "^3.1.8" } }, "vscodeCommit": "94c8e2adc50e26ef70af85a0de3a9efed757acaa", diff --git a/code/package-lock.json b/code/package-lock.json index 69a7eeb8b260..35eb661d9b3c 100644 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -8376,9 +8376,9 @@ "dev": true }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "dev": true, "funding": [ { diff --git a/code/package.json b/code/package.json index 7f22a237d20e..1a219af3f5bc 100644 --- a/code/package.json +++ b/code/package.json @@ -299,7 +299,10 @@ "axios": "^1.20.0" }, "js-yaml@4": "^4.3.2", - "js-yaml@3": "^3.15.2" + "js-yaml@3": "^3.15.2", + "ajv": { + "fast-uri": "^3.1.8" + } }, "repository": { "type": "git", diff --git a/code/test/mcp/package-lock.json b/code/test/mcp/package-lock.json index 253f7a425ac4..2a862552bea5 100644 --- a/code/test/mcp/package-lock.json +++ b/code/test/mcp/package-lock.json @@ -513,9 +513,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "funding": [ { "type": "github", diff --git a/code/test/mcp/package.json b/code/test/mcp/package.json index 04766b1b3b06..cd559e5c68db 100644 --- a/code/test/mcp/package.json +++ b/code/test/mcp/package.json @@ -29,6 +29,9 @@ "ip-address": "^10.5.0", "@types/node-fetch": { "form-data": "^4.0.6" + }, + "ajv": { + "fast-uri": "^3.1.8" } } } diff --git a/code/test/monaco/package-lock.json b/code/test/monaco/package-lock.json index 7aa2eac25193..34dae048ff67 100644 --- a/code/test/monaco/package-lock.json +++ b/code/test/monaco/package-lock.json @@ -883,9 +883,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "dev": true, "funding": [ { diff --git a/code/test/monaco/package.json b/code/test/monaco/package.json index 9bfb1bc5c70e..541100e03a64 100644 --- a/code/test/monaco/package.json +++ b/code/test/monaco/package.json @@ -25,6 +25,9 @@ "postcss": "^8.5.26" }, "overrides": { - "lodash": "^4.18.1" + "lodash": "^4.18.1", + "ajv": { + "fast-uri": "^3.1.8" + } } } diff --git a/launcher/package-lock.json b/launcher/package-lock.json index aed3c98abc52..06961001836c 100644 --- a/launcher/package-lock.json +++ b/launcher/package-lock.json @@ -2692,10 +2692,21 @@ "dev": true }, "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", - "dev": true + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" }, "node_modules/fb-watchman": { "version": "2.0.2", diff --git a/launcher/package.json b/launcher/package.json index 9ec45a8aa7b7..5cddea38dbd1 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -61,7 +61,8 @@ "form-data": "^4.0.6" }, "brace-expansion@1": "^1.1.18", - "js-yaml@3": "^3.15.2" + "js-yaml@3": "^3.15.2", + "fast-uri": "^3.1.8" }, "jest": { "collectCoverage": true, diff --git a/rebase.sh b/rebase.sh index d00682dffc5e..b9076ac5fba5 100755 --- a/rebase.sh +++ b/rebase.sh @@ -491,6 +491,10 @@ resolve_conflicts() { apply_changes_multi_line "$conflictingFile" elif [[ "$conflictingFile" == "code/extensions/copilot/.esbuild.mts" ]]; then apply_changes_multi_line "$conflictingFile" + elif [[ "$conflictingFile" == "code/build/rspack/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/build/agent-sdk/agents/claude/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" elif [[ "$conflictingFile" == "code/extensions/copilot/package.json" ]]; then apply_package_changes_by_path "$conflictingFile" elif [[ "$conflictingFile" == "code/extensions/copilot/chat-lib/package.json" ]]; then