Skip to content

Commit 0df2c77

Browse files
feat: add support for Vite 6 and Vitest 3 (#1573)
1 parent fc83205 commit 0df2c77

File tree

12 files changed

+448
-138
lines changed

12 files changed

+448
-138
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@
173173
"ts-node": "10.9.1",
174174
"typescript": "~5.5.0",
175175
"vfile": "^6.0.3",
176-
"vite": "^5.4.0",
176+
"vite": "^6.0.0",
177177
"vite-plugin-eslint": "^1.8.1",
178178
"vite-plugin-inspect": "~0.8",
179179
"vite-tsconfig-paths": "4.2.0",
180180
"vitefu": "^0.2.5",
181-
"vitest": "^2.0.0",
181+
"vitest": "^3.0.0",
182182
"webpack-bundle-analyzer": "^4.7.0",
183183
"xmlbuilder2": "^3.0.2"
184184
}

packages/create-analog/template-blog/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"@angular/compiler-cli": "^19.0.0",
4646
"jsdom": "^22.0.0",
4747
"typescript": "~5.5.0",
48-
"vite": "^5.0.0",
48+
"vite": "^6.0.0",
4949
"vite-tsconfig-paths": "^4.2.0",
50-
"vitest": "^2.0.0"
50+
"vitest": "^3.0.0"
5151
}
5252
}

packages/create-analog/template-latest/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"@angular/compiler-cli": "^19.0.0",
4747
"jsdom": "^22.0.0",
4848
"typescript": "~5.5.0",
49-
"vite": "^5.0.0",
49+
"vite": "^6.0.0",
5050
"vite-tsconfig-paths": "^4.2.0",
51-
"vitest": "^2.0.0"
51+
"vitest": "^3.0.0"
5252
}
5353
}

packages/create-analog/template-minimal/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"@angular/compiler-cli": "^19.0.0",
4747
"jsdom": "^22.0.0",
4848
"typescript": "~5.5.0",
49-
"vite": "^5.0.0",
49+
"vite": "^6.0.0",
5050
"vite-tsconfig-paths": "^4.2.0",
51-
"vitest": "^2.0.0"
51+
"vitest": "^3.0.0"
5252
}
5353
}

packages/nx-plugin/src/generators/app/generator.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ describe('nx-plugin generator', () => {
147147
expect(devDependencies['@analogjs/vitest-angular']).toBeDefined();
148148
expect(devDependencies['@nx/vite']).toBe('^20.0.0');
149149
expect(devDependencies['jsdom']).toBe('^22.1.0');
150-
expect(devDependencies['vite']).toBe('^5.0.0');
150+
expect(devDependencies['vite']).toBeDefined();
151151
expect(devDependencies['vite-tsconfig-paths']).toBe('^4.2.0');
152-
expect(devDependencies['vitest']).toBe('^2.0.0');
152+
expect(devDependencies['vitest']).toBeDefined();
153153
};
154154

155155
const verifyConfig = (

packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
2828
export const V18_X_NX_VITE = '^20.0.0';
2929
export const V18_X_NX_LINTER = '^20.0.0';
3030
export const V18_X_JSDOM = '^22.1.0';
31-
export const V18_X_VITE = '^5.0.0';
31+
export const V18_X_VITE = '^6.0.0';
3232
export const V18_X_VITE_TSCONFIG_PATHS = '^4.2.0';
33-
export const V18_X_VITEST = '^2.0.0';
33+
export const V18_X_VITEST = '^3.0.0';
3434
export const V18_X_ZOD = '^3.21.4';

packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ export const V19_X_NX_ANGULAR = '^20.0.0';
1515
export const V19_X_NX_VITE = '^20.0.0';
1616
export const V19_X_JSDOM = '^22.0.0';
1717
export const V19_X_VITE_TSCONFIG_PATHS = '^4.2.0';
18-
export const V19_X_VITEST = '^2.0.0';
19-
export const V19_X_VITE = '^5.0.0';
18+
export const V19_X_VITEST = '^3.0.0';
19+
export const V19_X_VITE = '^6.0.0';

packages/platform/package.json

+5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
"marked-shiki": "^1.1.0",
4545
"shiki": "^1.6.1"
4646
},
47+
"overrides": {
48+
"@nx/vite": {
49+
"vite": "$vite"
50+
}
51+
},
4752
"peerDependenciesMeta": {
4853
"shiki": {
4954
"optional": true

packages/router/project.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"executor": "@nx/eslint:lint"
2727
},
2828
"test": {
29-
"executor": "@nx/vite:test"
29+
"executor": "@nx/vite:test",
30+
"dependsOn": ["^build"]
3031
},
3132
"version": {
3233
"executor": "@jscutlery/semver:version",

packages/router/src/lib/routes.spec.ts

+4
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,10 @@ describe('routes', () => {
608608
});
609609

610610
describe('a route without default export', () => {
611+
afterEach(() => {
612+
vi.restoreAllMocks();
613+
});
614+
611615
it('should log a warning when default export is falsy', async () => {
612616
const fileName = '/app/routes/index.ts';
613617
const files: Files = {

packages/vitest-angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"peerDependencies": {
3535
"@analogjs/vite-plugin-angular": "*",
3636
"@angular-devkit/architect": "^0.1500.0 || ^0.1600.0 || ^0.1700.0 || ^0.1800.0 || ^0.1900.0 || next",
37-
"vitest": "^1.3.1 || ^2.0.0"
37+
"vitest": "^1.3.1 || ^2.0.0 || ^3.0.0"
3838
},
3939
"ng-update": {
4040
"packageGroup": [

0 commit comments

Comments
 (0)