Skip to content

Commit 97f002e

Browse files
Merge branch 'main' into beta
2 parents 7bbaae7 + 02bf253 commit 97f002e

File tree

10 files changed

+12
-6
lines changed

10 files changed

+12
-6
lines changed

apps/docs-app/docs/features/testing/vitest.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ export default defineConfig(({ mode }) => ({
9292
setupFiles: ['src/test-setup.ts'],
9393
environment: 'jsdom',
9494
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
95+
reporters: ['default'],
9596
},
9697
define: {
9798
'import.meta.vitest': mode !== 'production',
@@ -210,6 +211,7 @@ export default defineConfig(({ mode }) => ({
210211
setupFiles: ['src/test-setup.ts'],
211212
// environment: 'jsdom',
212213
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
214+
reporters: ['default'],
213215
// Vitest browser config
214216
browser: {
215217
enabled: true,

packages/create-analog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-analog",
3-
"version": "0.2.63",
3+
"version": "0.2.64",
44
"type": "module",
55
"license": "MIT",
66
"author": "Brandon Roberts",

packages/create-analog/template-angular-v16/vite.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export default defineConfig(({ mode }) => ({
1818
environment: 'jsdom',
1919
setupFiles: ['src/test.ts'],
2020
include: ['**/*.spec.ts'],
21+
reporters: ['default'],
2122
},
2223
define: {
2324
'import.meta.vitest': mode !== 'production',

packages/create-analog/template-angular-v17/_gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ yarn-error.log
3737
/libpeerconnection.log
3838
testem.log
3939
/typings
40-
/.npmrc
4140

4241
# System files
4342
.DS_Store

packages/create-analog/template-angular-v17/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"jsdom": "^22.1.0",
4848
"typescript": "~5.2.0",
4949
"vite": "^4.4.8",
50-
"vitest": "^1.0.0"
50+
"vitest": "^0.34.0"
5151
}
5252
}

packages/create-analog/template-angular-v17/vite.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export default defineConfig(({ mode }) => ({
1818
environment: 'jsdom',
1919
setupFiles: ['src/test.ts'],
2020
include: ['**/*.spec.ts'],
21+
reporters: ['default'],
2122
},
2223
define: {
2324
'import.meta.vitest': mode !== 'production',

packages/nx-plugin/src/generators/app/files/template-angular-v16/vite.config.ts__template__

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export default defineConfig(({ mode }) => {
4040
environment: 'jsdom',
4141
setupFiles: ['src/test-setup.ts'],
4242
include: ['**/*.spec.ts'],
43+
reporters: ['default'],
4344
cache: {
4445
dir: `<%= offsetFromRoot %>node_modules/.vitest`,
4546
},

packages/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export default defineConfig(({ mode }) => {
3838
environment: 'jsdom',
3939
setupFiles: ['src/test-setup.ts'],
4040
include: ['**/*.spec.ts'],
41+
reporters: ['default'],
4142
cache: {
4243
dir: `<%= offsetFromRoot %>node_modules/.vitest`,
4344
},

packages/nx-plugin/src/generators/setup-vitest/files/vite.config.ts__template__

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
/// <reference types="vitest" />
22

3-
import analog from '@analogjs/platform';
3+
import angular from '@analogjs/vite-plugin-angular';
44
import { defineConfig } from 'vite';
55

66
// https://vitejs.dev/config/
77
export default defineConfig(({ mode }) => {
88
return {
9-
plugins: [analog()],
9+
plugins: [angular()],
1010
test: {
1111
globals: true,
1212
environment: 'jsdom',
1313
setupFiles: ['src/test-setup.ts'],
1414
include: ['**/*.spec.ts'],
15+
reporters: ['default'],
1516
},
1617
define: {
1718
'import.meta.vitest': mode !== 'production',

packages/nx-plugin/src/generators/setup-vitest/versions/ng_17_X/versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ export const V17_X_ANALOG_JS_PLATFORM = '^1.0.0-beta.0';
55
export const V17_X_NX_VITE = '^17.0.0';
66
export const V17_X_JSDOM = '^22.0.0';
77
export const V17_X_VITE_TSCONFIG_PATHS = '^4.2.0';
8-
export const V17_X_VITEST = '^1.0.0';
8+
export const V17_X_VITEST = '^0.34.0';

0 commit comments

Comments
 (0)