feat: upgrade to Vite 6.x

BREAKING CHANGE: The base version of Vite is updated. BEFORE: Vite 5.x is the base version. AFTER: Vite 6.x is the base version.
analogjs · Dec 17, 2024 · 5ce9829 · 5ce9829
1 parent d955698
commit 5ce9829
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 66 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - beta
       - main
+      - alpha
 
 permissions:
   contents: read # for checkout
@@ -41,4 +42,4 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           TAG="$(${{ github.ref_name == 'main' }} && echo 'latest' || echo '${{ github.ref_name }}')"
-          RELEASE_TAG=$TAG npx semantic-release
+          RELEASE_TAG=$TAG npx semantic-release --dry-run
diff --git a/package.json b/package.json
@@ -173,7 +173,7 @@
     "ts-node": "10.9.1",
     "typescript": "~5.5.0",
     "vfile": "^6.0.3",
-    "vite": "^5.4.0",
+    "vite": "^6.0.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "4.2.0",
     "vitefu": "^0.2.5",

diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json
@@ -48,7 +48,7 @@
     "nx": "~18.0.0",
     "jsdom": "^22.1.0",
     "typescript": "~5.3.0",
-    "vite": "^5.0.0",
+    "vite": "^6.0.0",
     "vitest": "^1.3.1"
   }
 }
diff --git a/packages/create-analog/template-angular-v18/package.json b/packages/create-analog/template-angular-v18/package.json
@@ -45,7 +45,7 @@
     "@angular/compiler-cli": "^18.0.0",
     "jsdom": "^22.0.0",
     "typescript": "~5.4.2",
-    "vite": "^5.0.0",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^1.3.1"
   }

diff --git a/packages/create-analog/template-blog/package.json b/packages/create-analog/template-blog/package.json
@@ -45,7 +45,7 @@
     "@angular/compiler-cli": "^19.0.0",
     "jsdom": "^22.0.0",
     "typescript": "~5.5.0",
-    "vite": "^5.0.0",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^2.0.0"
   }

diff --git a/packages/create-analog/template-latest/package.json b/packages/create-analog/template-latest/package.json
@@ -46,7 +46,7 @@
     "@angular/compiler-cli": "^19.0.0",
     "jsdom": "^22.0.0",
     "typescript": "~5.5.0",
-    "vite": "^5.0.0",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^2.0.0"
   }

diff --git a/packages/create-analog/template-minimal/package.json b/packages/create-analog/template-minimal/package.json
@@ -46,7 +46,7 @@
     "@angular/compiler-cli": "^19.0.0",
     "jsdom": "^22.0.0",
     "typescript": "~5.5.0",
-    "vite": "^5.0.0",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "^2.0.0"
   }

diff --git a/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts b/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts
@@ -220,7 +220,8 @@ export function angular(options?: PluginOptions): Plugin[] {
         // - @nx/vite executor set server.watch explicitly to undefined (watch)/null (watch=false)
         // - vite config for test.watch variable
         testWatchMode =
-          !(config.server.watch === null) || config.test?.watch === true;
+          !(config.server.watch === null) ||
+          (config as any).test?.watch === true;
       },
       configureServer(server) {
         viteServer = server;

diff --git a/packages/vite-plugin-angular/src/lib/angular-vitest-plugin.ts b/packages/vite-plugin-angular/src/lib/angular-vitest-plugin.ts
@@ -21,7 +21,7 @@ export function angularVitestPlugin(): Plugin {
           noExternal: [/cdk\/fesm2022/],
         },
         test: {
-          pool: userConfig.test?.pool ?? 'vmThreads',
+          pool: (userConfig as any).test?.pool ?? 'vmThreads',
           server: {
             deps: {
               inline: [/fesm2022(.*?)testing/],

diff --git a/packages/vitest-angular/src/lib/builders/build/vitest.impl.ts b/packages/vitest-angular/src/lib/builders/build/vitest.impl.ts
@@ -1,8 +1,7 @@
 import { createBuilder } from '@angular-devkit/architect';
 import * as path from 'path';
-import type { Vitest } from 'vitest/node';
-import type { Plugin, UserConfig } from 'vite';
-import type { UserConfig as VitestConfig } from 'vitest';
+import type { Vitest, UserConfig as VitestConfig } from 'vitest/node';
+import type { Plugin } from 'vite';
 
 import { VitestSchema } from './schema';
 import { createAngularMemoryPlugin } from './plugins/angular-memory-plugin';
@@ -71,7 +70,7 @@ async function* vitestApplicationBuilder(
 
   const outputFiles = new Map();
 
-  const viteConfig: UserConfig = {
+  const viteConfig: any = {
     plugins: [
       (await createAngularMemoryPlugin({
         angularVersion,

diff --git a/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts b/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts
@@ -28,10 +28,16 @@ async function vitestBuilder(
     config: options.configFile,
     ...extraArgs,
   };
-
-  const server = await startVitest('test', options.testFiles ?? [], config, {
+  const viteOverrides: any = {
     test: { watch },
-  });
+  };
+
+  const server = await startVitest(
+    'test',
+    options.testFiles ?? [],
+    config,
+    viteOverrides
+  );
 
   let hasErrors = false;
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml