summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-04-16 09:31:11 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-04-16 09:31:11 +0200
commit7bb4a1ab77339b7e69cbf6a73882b174772b1367 (patch)
tree5450147b1267608add2ddb958a596a4c104afde9
parentc90a98e3430c8047b17b12ca9646af6d4478d3ea (diff)
parent5ef0b18909856e0684cc7d259608a5067ad4c7d6 (diff)
downloadmullvadvpn-7bb4a1ab77339b7e69cbf6a73882b174772b1367.tar.xz
mullvadvpn-7bb4a1ab77339b7e69cbf6a73882b174772b1367.zip
Merge branch 'upgrade-vite-to-626-to-fix-cve-des-2037'
-rw-r--r--desktop/package-lock.json52
-rw-r--r--desktop/package.json2
-rw-r--r--desktop/packages/mullvad-vpn/package.json4
3 files changed, 29 insertions, 29 deletions
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index e60399a2f7..e684632afb 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -3143,17 +3143,17 @@
}
},
"node_modules/@vitejs/plugin-react": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
- "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.0.tgz",
+ "integrity": "sha512-x/EztcTKVj+TDeANY1WjNeYsvZjZdfWRMP/KXi5Yn8BoTzpa13ZltaQqKfvWYbX8CE10GOHHdC5v86jY9x8i/g==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/core": "^7.26.0",
+ "@babel/core": "^7.26.10",
"@babel/plugin-transform-react-jsx-self": "^7.25.9",
"@babel/plugin-transform-react-jsx-source": "^7.25.9",
"@types/babel__core": "^7.20.5",
- "react-refresh": "^0.14.2"
+ "react-refresh": "^0.17.0"
},
"engines": {
"node": "^14.18.0 || >=16.0.0"
@@ -12094,9 +12094,9 @@
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
},
"node_modules/react-refresh": {
- "version": "0.14.2",
- "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
- "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
+ "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -14975,9 +14975,9 @@
}
},
"node_modules/vite": {
- "version": "6.2.5",
- "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.5.tgz",
- "integrity": "sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==",
+ "version": "6.2.6",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
+ "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -15719,7 +15719,7 @@
"@types/sinon": "^10.0.13",
"@types/sprintf-js": "^1.1.2",
"@types/topojson-specification": "^1.0.2",
- "@vitejs/plugin-react": "^4.3.4",
+ "@vitejs/plugin-react": "^4.4.0",
"browserify": "^17.0.0",
"chai": "^4.3.6",
"chai-as-promised": "^7.1.1",
@@ -15744,7 +15744,7 @@
"tsc-watch": "^5.0.3",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
- "vite": "6.2.5",
+ "vite": "6.2.6",
"vite-plugin-electron": "^0.29.0",
"xvfb-maybe": "^0.2.1"
},
@@ -17922,16 +17922,16 @@
}
},
"@vitejs/plugin-react": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
- "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.0.tgz",
+ "integrity": "sha512-x/EztcTKVj+TDeANY1WjNeYsvZjZdfWRMP/KXi5Yn8BoTzpa13ZltaQqKfvWYbX8CE10GOHHdC5v86jY9x8i/g==",
"dev": true,
"requires": {
- "@babel/core": "^7.26.0",
+ "@babel/core": "^7.26.10",
"@babel/plugin-transform-react-jsx-self": "^7.25.9",
"@babel/plugin-transform-react-jsx-source": "^7.25.9",
"@types/babel__core": "^7.20.5",
- "react-refresh": "^0.14.2"
+ "react-refresh": "^0.17.0"
}
},
"@xmldom/xmldom": {
@@ -23947,7 +23947,7 @@
"@types/sinon": "^10.0.13",
"@types/sprintf-js": "^1.1.2",
"@types/topojson-specification": "^1.0.2",
- "@vitejs/plugin-react": "^4.3.4",
+ "@vitejs/plugin-react": "^4.4.0",
"argv-split": "^2.0.1",
"browserify": "^17.0.0",
"chai": "^4.3.6",
@@ -23987,7 +23987,7 @@
"tsc-watch": "^5.0.3",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
- "vite": "6.2.5",
+ "vite": "6.2.6",
"vite-plugin-electron": "^0.29.0",
"windows-utils": "0.0.0",
"xvfb-maybe": "^0.2.1"
@@ -24973,9 +24973,9 @@
}
},
"react-refresh": {
- "version": "0.14.2",
- "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
- "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
+ "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
"dev": true
},
"react-router": {
@@ -27222,9 +27222,9 @@
}
},
"vite": {
- "version": "6.2.5",
- "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.5.tgz",
- "integrity": "sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==",
+ "version": "6.2.6",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
+ "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
"dev": true,
"requires": {
"esbuild": "^0.25.0",
diff --git a/desktop/package.json b/desktop/package.json
index b021b817a6..cfcb4f7a78 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -33,7 +33,7 @@
"typescript-eslint": "^8.15.0"
},
"overrides": {
- "vite": "6.2.5"
+ "vite": "6.2.6"
},
"engines": {
"node": ">=16",
diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json
index 029e9c3aad..0f90933e4c 100644
--- a/desktop/packages/mullvad-vpn/package.json
+++ b/desktop/packages/mullvad-vpn/package.json
@@ -46,7 +46,7 @@
"@types/sinon": "^10.0.13",
"@types/sprintf-js": "^1.1.2",
"@types/topojson-specification": "^1.0.2",
- "@vitejs/plugin-react": "^4.3.4",
+ "@vitejs/plugin-react": "^4.4.0",
"browserify": "^17.0.0",
"chai": "^4.3.6",
"chai-as-promised": "^7.1.1",
@@ -71,7 +71,7 @@
"tsc-watch": "^5.0.3",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
- "vite": "6.2.5",
+ "vite": "6.2.6",
"vite-plugin-electron": "^0.29.0",
"xvfb-maybe": "^0.2.1"
},