Merge branch 'develop' into timfish/time-side-effects

timfish · web-flow · commit 78c64335ab28 · 2025-01-13T20:24:57.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @aloisklink, @arturovt, @benjick and @maximepvrt. Thank you for your contributions!
+Work in this release was contributed by @nwalters512, @aloisklink, @arturovt, @benjick and @maximepvrt. Thank you for your contributions!
 
 - **feat(solidstart)!: Default to `--import` setup and add `autoInjectServerSentry` ([#14862](https://github.com/getsentry/sentry-javascript/pull/14862))**
 
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
@@ -44,7 +44,7 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "typescript": "^5.1.6",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "volta": {
diff --git a/dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json b/dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json
@@ -21,7 +21,7 @@
     "postcss": "^8.4.33",
     "solid-devtools": "^0.29.2",
     "tailwindcss": "^3.4.1",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-plugin-solid": "^2.8.2"
   },
   "dependencies": {
diff --git a/dev-packages/e2e-tests/test-applications/solid/package.json b/dev-packages/e2e-tests/test-applications/solid/package.json
@@ -21,7 +21,7 @@
     "postcss": "^8.4.33",
     "solid-devtools": "^0.29.2",
     "tailwindcss": "^3.4.1",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-plugin-solid": "^2.8.2"
   },
   "dependencies": {
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json b/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json
@@ -27,7 +27,7 @@
     "solid-js": "1.8.17",
     "typescript": "^5.4.5",
     "vinxi": "^0.4.0",
-    "vite": "^5.2.8",
+    "vite": "^5.4.11",
     "vite-plugin-solid": "^2.10.2",
     "vitest": "^1.5.0"
   },
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json b/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json
@@ -27,7 +27,7 @@
     "solid-js": "1.8.17",
     "typescript": "^5.4.5",
     "vinxi": "^0.4.0",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-plugin-solid": "^2.10.2",
     "vitest": "^1.5.0"
   },
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/package.json b/dev-packages/e2e-tests/test-applications/solidstart/package.json
@@ -27,7 +27,7 @@
     "solid-js": "1.8.17",
     "typescript": "^5.4.5",
     "vinxi": "^0.4.0",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-plugin-solid": "^2.10.2",
     "vitest": "^1.5.0"
   },
diff --git a/dev-packages/e2e-tests/test-applications/svelte-5/package.json b/dev-packages/e2e-tests/test-applications/svelte-5/package.json
@@ -22,7 +22,7 @@
     "svelte-check": "^3.6.7",
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
   "dependencies": {
     "@sentry/svelte": "latest || *"
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json
@@ -29,7 +29,7 @@
     "svelte-check": "^3.6.0",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
   "type": "module"
 }
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json
@@ -28,7 +28,7 @@
     "svelte-check": "^3.6.0",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
   "type": "module"
 }
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json
@@ -28,7 +28,7 @@
     "svelte": "^4.2.8",
     "svelte-check": "^3.6.0",
     "typescript": "^5.0.0",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
   "type": "module"
 }
diff --git a/dev-packages/e2e-tests/test-applications/tanstack-router/package.json b/dev-packages/e2e-tests/test-applications/tanstack-router/package.json
@@ -24,7 +24,7 @@
     "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "typescript": "^5.2.2",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "@playwright/test": "^1.44.1",
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },
diff --git a/dev-packages/e2e-tests/test-applications/vue-3/package.json b/dev-packages/e2e-tests/test-applications/vue-3/package.json
@@ -32,7 +32,7 @@
     "http-server": "^14.1.1",
     "npm-run-all2": "^6.2.0",
     "typescript": "~5.3.0",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vue-tsc": "^1.8.27"
   },
   "volta": {
diff --git a/package.json b/package.json
@@ -113,7 +113,7 @@
     "@types/jest": "^27.4.1",
     "@types/jsdom": "^21.1.6",
     "@types/node": "^18.19.1",
-    "@vitest/coverage-v8": "^1.6.0",
+    "@vitest/coverage-v8": "^2.1.8",
     "deepmerge": "^4.2.2",
     "downlevel-dts": "~0.11.0",
     "es-check": "^7.2.1",
@@ -135,7 +135,7 @@
     "ts-jest": "^27.1.4",
     "ts-node": "10.9.1",
     "typescript": "~5.0.0",
-    "vitest": "^1.6.0",
+    "vitest": "^2.1.8",
     "yalc": "^1.0.0-pre.53"
   },
   "//_resolutions_comment": [
diff --git a/packages/angular/vitest.config.ts b/packages/angular/vitest.config.ts
@@ -1,10 +1,9 @@
-import type { UserConfig } from 'vitest';
 import { defineConfig } from 'vitest/config';
 import baseConfig from '../../vite/vite.config';
 
 export default defineConfig({
   test: {
-    ...(baseConfig as UserConfig & { test: any }).test,
+    ...baseConfig.test,
     coverage: {},
     globals: true,
     setupFiles: ['./setup-test.ts'],
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -63,7 +63,7 @@
   },
   "devDependencies": {
     "astro": "^3.5.0",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -67,8 +67,7 @@
     "@remix-run/node": "^1.4.3",
     "@remix-run/react": "^1.4.3",
     "@types/express": "^4.17.14",
-    "vite": "^5.4.10",
-    "vitest": "^1.6.0"
+    "vite": "^5.4.11"
   },
   "peerDependencies": {
     "@remix-run/node": "1.x || 2.x",
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
@@ -50,10 +50,10 @@
     "sorcery": "1.0.0"
   },
   "devDependencies": {
-    "@babel/types": "7.20.7",
+    "@babel/types": "^7.26.3",
     "@sveltejs/kit": "^2.0.2",
     "svelte": "^4.2.8",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`"svelte-check": "^3.6.0",`
`30`	`30`	`"tslib": "^2.4.1",`
`31`	`31`	`"typescript": "^5.0.0",`
`32`		`- "vite": "^5.4.10"`
	`32`	`+ "vite": "^5.4.11"`
`33`	`33`	`},`
`34`	`34`	`"type": "module"`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"svelte-check": "^3.6.0",`
`29`	`29`	`"tslib": "^2.4.1",`
`30`	`30`	`"typescript": "^5.0.0",`
`31`		`- "vite": "^5.4.10"`
	`31`	`+ "vite": "^5.4.11"`
`32`	`32`	`},`
`33`	`33`	`"type": "module"`
`34`	`34`	`}`