Merge branch 'main' into beta

analogjs · Dec 12, 2023 · 97f002e · 97f002e
2 parents 7bbaae7 + 02bf253
commit 97f002e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 6 deletions.
diff --git a/apps/docs-app/docs/features/testing/vitest.md b/apps/docs-app/docs/features/testing/vitest.md
@@ -92,6 +92,7 @@ export default defineConfig(({ mode }) => ({
     setupFiles: ['src/test-setup.ts'],
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
   },
   define: {
     'import.meta.vitest': mode !== 'production',
@@ -210,6 +211,7 @@ export default defineConfig(({ mode }) => ({
     setupFiles: ['src/test-setup.ts'],
     // environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
     // Vitest browser config
     browser: {
       enabled: true,

diff --git a/packages/create-analog/package.json b/packages/create-analog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-analog",
-  "version": "0.2.63",
+  "version": "0.2.64",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Roberts",

diff --git a/packages/create-analog/template-angular-v16/vite.config.ts b/packages/create-analog/template-angular-v16/vite.config.ts
@@ -18,6 +18,7 @@ export default defineConfig(({ mode }) => ({
     environment: 'jsdom',
     setupFiles: ['src/test.ts'],
     include: ['**/*.spec.ts'],
+    reporters: ['default'],
   },
   define: {
     'import.meta.vitest': mode !== 'production',

diff --git a/packages/create-analog/template-angular-v17/_gitignore b/packages/create-analog/template-angular-v17/_gitignore
@@ -37,7 +37,6 @@ yarn-error.log
 /libpeerconnection.log
 testem.log
 /typings
-/.npmrc
 
 # System files
 .DS_Store

diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json
@@ -47,6 +47,6 @@
     "jsdom": "^22.1.0",
     "typescript": "~5.2.0",
     "vite": "^4.4.8",
-    "vitest": "^1.0.0"
+    "vitest": "^0.34.0"
   }
 }
diff --git a/packages/create-analog/template-angular-v17/vite.config.ts b/packages/create-analog/template-angular-v17/vite.config.ts
@@ -18,6 +18,7 @@ export default defineConfig(({ mode }) => ({
     environment: 'jsdom',
     setupFiles: ['src/test.ts'],
     include: ['**/*.spec.ts'],
+    reporters: ['default'],
   },
   define: {
     'import.meta.vitest': mode !== 'production',

diff --git a/packages/nx-plugin/src/generators/app/files/template-angular-v16/vite.config.ts__template__ b/packages/nx-plugin/src/generators/app/files/template-angular-v16/vite.config.ts__template__
@@ -40,6 +40,7 @@ export default defineConfig(({ mode }) => {
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],
       include: ['**/*.spec.ts'],
+      reporters: ['default'],
       cache: {
         dir: `<%= offsetFromRoot %>node_modules/.vitest`,
       },

diff --git a/packages/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__ b/packages/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__
@@ -38,6 +38,7 @@ export default defineConfig(({ mode }) => {
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],
       include: ['**/*.spec.ts'],
+      reporters: ['default'],
       cache: {
         dir: `<%= offsetFromRoot %>node_modules/.vitest`,
       },

diff --git a/packages/nx-plugin/src/generators/setup-vitest/files/vite.config.ts__template__ b/packages/nx-plugin/src/generators/setup-vitest/files/vite.config.ts__template__
@@ -1,17 +1,18 @@
 /// <reference types="vitest" />
 
-import analog from '@analogjs/platform';
+import angular from '@analogjs/vite-plugin-angular';
 import { defineConfig } from 'vite';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    plugins: [analog()],
+    plugins: [angular()],
     test: {
       globals: true,
       environment: 'jsdom',
       setupFiles: ['src/test-setup.ts'],
       include: ['**/*.spec.ts'],
+      reporters: ['default'],
     },
     define: {
       'import.meta.vitest': mode !== 'production',

diff --git a/packages/nx-plugin/src/generators/setup-vitest/versions/ng_17_X/versions.ts b/packages/nx-plugin/src/generators/setup-vitest/versions/ng_17_X/versions.ts
@@ -5,4 +5,4 @@ export const V17_X_ANALOG_JS_PLATFORM = '^1.0.0-beta.0';
 export const V17_X_NX_VITE = '^17.0.0';
 export const V17_X_JSDOM = '^22.0.0';
 export const V17_X_VITE_TSCONFIG_PATHS = '^4.2.0';
-export const V17_X_VITEST = '^1.0.0';
+export const V17_X_VITEST = '^0.34.0';