diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json index c070d903b3c..c65e3dc85f1 100644 --- a/web/vtadmin/package-lock.json +++ b/web/vtadmin/package-lock.json @@ -3549,7 +3549,7 @@ "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^2.68.0||^3.0.0" + "rollup": "^3.29.5" }, "peerDependenciesMeta": { "rollup": { @@ -3571,7 +3571,11 @@ "node": ">=14.0.0" }, "peerDependencies": { +<<<<<<< HEAD "rollup": "^1.20.0||^2.0.0||^3.0.0" +======= + "rollup": "^3.29.5" +>>>>>>> 712ed8e9f7 (VTAdmin: Upgrade deps to address security vulns (#16843)) }, "peerDependenciesMeta": { "rollup": { @@ -4902,7 +4906,7 @@ "node": "^14.18.0 || >=16.0.0" }, "peerDependencies": { - "vite": "^4.1.0-beta.0" + "vite": "^4.5.4" } }, "node_modules/@vitest/expect": { @@ -15333,10 +15337,17 @@ } }, "node_modules/rollup": { +<<<<<<< HEAD "version": "3.20.2", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz", "integrity": "sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==", +======= + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", +>>>>>>> 712ed8e9f7 (VTAdmin: Upgrade deps to address security vulns (#16843)) "dev": true, + "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -16829,15 +16840,28 @@ } }, "node_modules/vite": { +<<<<<<< HEAD "version": "4.2.3", "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.3.tgz", "integrity": "sha512-kLU+m2q0Y434Y1kCy3TchefAdtFso0ILi0dLyFV8Us3InXTU11H/B5ZTqCKIQHzSKNxVG/yEx813EA9f1imQ9A==", +======= + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", +>>>>>>> 712ed8e9f7 (VTAdmin: Upgrade deps to address security vulns (#16843)) "dev": true, + "license": "MIT", "dependencies": { +<<<<<<< HEAD "esbuild": "^0.17.5", "postcss": "^8.4.21", "resolve": "^1.22.1", "rollup": "^3.18.0" +======= + "esbuild": "^0.18.10", + "postcss": "^8.4.27", + "rollup": "^3.29.5" +>>>>>>> 712ed8e9f7 (VTAdmin: Upgrade deps to address security vulns (#16843)) }, "bin": { "vite": "bin/vite.js" @@ -16888,7 +16912,7 @@ "mlly": "^1.1.0", "pathe": "^1.1.0", "picocolors": "^1.0.0", - "vite": "^3.0.0 || ^4.0.0" + "vite": "^4.5.4" }, "bin": { "vite-node": "vite-node.mjs" @@ -16908,11 +16932,11 @@ "dependencies": { "@rollup/pluginutils": "^4.2.1", "@types/eslint": "^8.4.5", - "rollup": "^2.77.2" + "rollup": "^3.29.5" }, "peerDependencies": { "eslint": ">=7", - "vite": ">=2" + "vite": ">=4.5.4" } }, "node_modules/vite-plugin-eslint/node_modules/@rollup/pluginutils": { @@ -16928,21 +16952,6 @@ "node": ">= 8.0.0" } }, - "node_modules/vite-plugin-eslint/node_modules/rollup": { - "version": "2.79.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", - "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", - "dev": true, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=10.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, "node_modules/vite-plugin-svgr": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-2.4.0.tgz", @@ -16953,7 +16962,7 @@ "@svgr/core": "^6.5.1" }, "peerDependencies": { - "vite": "^2.6.0 || 3 || 4" + "vite": "^4.5.4" } }, "node_modules/vitest": { @@ -16983,7 +16992,7 @@ "tinybench": "^2.3.1", "tinypool": "^0.4.0", "tinyspy": "^1.0.2", - "vite": "^3.0.0 || ^4.0.0", + "vite": "^4.5.4", "vite-node": "0.29.8", "why-is-node-running": "^2.2.2" },