Update vite and vite-node, support Vite 6, drop support for Vite 4 (

#1529)
vanilla-extract-css · Jan 30, 2025 · d5b6e70 · d5b6e70
1 parent 8987d02
commit d5b6e70
Showing 13 changed files with 1,014 additions and 618 deletions.
diff --git a/.changeset/loud-peaches-compare.md b/.changeset/loud-peaches-compare.md
@@ -0,0 +1,5 @@
+---
+'@vanilla-extract/compiler': patch
+---
+
+Update `vite-node` dependency
diff --git a/.changeset/purple-snakes-notice.md b/.changeset/purple-snakes-notice.md
@@ -0,0 +1,7 @@
+---
+'@vanilla-extract/vite-plugin': major
+---
+
+Update `vite` peer dependency range to `^5.0.0 || ^6.0.0`
+
+BREAKING CHANGE: Vite 4 is no longer supported. Please upgrade to at least Vite 5.
diff --git a/.changeset/yellow-bats-shop.md b/.changeset/yellow-bats-shop.md
@@ -0,0 +1,5 @@
+---
+'@vanilla-extract/compiler': patch
+---
+
+Include `^6.0.0` in `vite` dependency range
diff --git a/examples/remix/package.json b/examples/remix/package.json
@@ -21,6 +21,6 @@
     "@remix-run/dev": "^2.8.0",
     "@types/react": "^18.2.55",
     "@vanilla-extract/vite-plugin": "workspace:*",
-    "vite": "^5.0.11"
+    "vite": "^5.0.0 || ^6.0.0"
   }
 }
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "rollup-plugin-node-externals": "^7.1.3",
     "tsx": "^4.17.0",
     "typescript": "^5.5.4",
-    "vitest": "^1.5.0"
+    "vitest": "^3.0.2"
   },
   "preconstruct": {
     "___experimentalFlags_WILL_CHANGE_IN_PATCH": {

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@vanilla-extract/css": "workspace:^",
     "@vanilla-extract/integration": "workspace:^",
-    "vite": "^5.0.11",
-    "vite-node": "^1.2.0"
+    "vite": "^5.0.0 || ^6.0.0",
+    "vite-node": "^3.0.4"
   }
 }
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
@@ -108,7 +108,15 @@ const createViteServer = async ({
     },
     logLevel: 'silent',
     optimizeDeps: {
-      disabled: true,
+      noDiscovery: true,
+    },
+    build: {
+      dynamicImportVarsOptions: {
+        // Temporary workaround for https://github.com/vitejs/vite/issues/19245.
+        // Shouldn't affect functionality as it's equivalent to the default value.
+        // Can be removed once https://github.com/vitejs/vite/pull/19247 is released.
+        exclude: [/node_modules/],
+      },
     },
     ssr: {
       noExternal: true,

diff --git a/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap b/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap
@@ -570,7 +570,7 @@ exports[`rollup-plugin should build with sourcemaps 1`] = `
   ],
   [
     "src/index.js",
-    "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",
+    "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",
   ],
   [
     "src/index.js.map",

diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json
@@ -20,9 +20,9 @@
     "@vanilla-extract/integration": "workspace:^"
   },
   "devDependencies": {
-    "vite": "^5.0.11"
+    "vite": "^5.0.0 || ^6.0.0"
   },
   "peerDependencies": {
-    "vite": "^4.0.3 || ^5.0.0"
+    "vite": "^5.0.0 || ^6.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-helpers/package.json b/test-helpers/package.json
@@ -42,7 +42,7 @@
     "prettier": "^2.8.8",
     "serve-handler": "^6.1.3",
     "style-loader": "^2.0.0",
-    "vite": "^5.0.11",
+    "vite": "^5.0.0 || ^6.0.0",
     "vite-plugin-inspect": "^0.8.1",
     "webpack": "^5.90.0",
     "webpack-dev-server": "^5.0.4",

diff --git a/tests/compiler/compiler.test.ts b/tests/compiler/compiler.test.ts
@@ -1,7 +1,6 @@
 import path from 'path';
 import { createCompiler } from '@vanilla-extract/compiler';
 import { normalizePath } from '@vanilla-extract/integration';
-import tsconfigPaths from 'vite-tsconfig-paths';
 
 expect.addSnapshotSerializer({
   test: (val) => typeof val === 'string',
@@ -29,6 +28,8 @@ describe('compiler', () => {
   >;
 
   beforeAll(async () => {
+    const tsconfigPaths = (await import('vite-tsconfig-paths')).default;
+
     compilers = {
       default: createCompiler({
         root: __dirname,

diff --git a/tests/package.json b/tests/package.json
@@ -16,6 +16,6 @@
     "@vanilla-extract/private": "workspace:*",
     "@vanilla-extract/recipes": "workspace:*",
     "@vanilla-extract/sprinkles": "workspace:*",
-    "vite-tsconfig-paths": "^4.3.1"
+    "vite-tsconfig-paths": "^5.1.4"
   }
 }