From bdc216c51353d32304a59f83591aba63636949ab Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Tue, 12 Dec 2023 07:17:11 -0600 Subject: [PATCH 1/2] fix: add default reporters to vitest configuration (#791) --- apps/docs-app/docs/features/testing/vitest.md | 2 ++ packages/create-analog/template-angular-v16/vite.config.ts | 1 + packages/create-analog/template-angular-v17/vite.config.ts | 1 + .../files/template-angular-v16/vite.config.ts__template__ | 1 + .../files/template-angular-v17/vite.config.ts__template__ | 1 + .../generators/setup-vitest/files/vite.config.ts__template__ | 5 +++-- 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/docs-app/docs/features/testing/vitest.md b/apps/docs-app/docs/features/testing/vitest.md index 19c6a540b..7b78c8c6e 100644 --- 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/template-angular-v16/vite.config.ts b/packages/create-analog/template-angular-v16/vite.config.ts index dce5e5166..6faced7aa 100644 --- 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/vite.config.ts b/packages/create-analog/template-angular-v17/vite.config.ts index dce5e5166..6faced7aa 100644 --- 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__ index 76ec2c68b..90042f592 100644 --- 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__ index d60640a06..34f0c263f 100644 --- 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__ index d2b48ff05..7f65792a1 100644 --- 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 @@ /// -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', From 02bf253e685e24c57259e79b17d087086c3f48ad Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Tue, 12 Dec 2023 07:38:59 -0600 Subject: [PATCH 2/2] chore: release 0.2.25 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- packages/astro-angular/package.json | 4 ++-- packages/content/package.json | 2 +- packages/create-analog/package.json | 2 +- packages/create-analog/template-angular-v17/_gitignore | 1 - packages/create-analog/template-angular-v17/package.json | 2 +- .../generators/setup-vitest/versions/ng_17_X/versions.ts | 2 +- packages/platform/package.json | 6 +++--- packages/router/package.json | 4 ++-- packages/trpc/package.json | 2 +- packages/vite-plugin-angular/package.json | 2 +- packages/vite-plugin-nitro/package.json | 2 +- 13 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d3f17e98..3e57c0a34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [0.2.25](https://github.com/analogjs/analog/compare/0.2.24...0.2.25) (2023-12-12) + +### Bug Fixes + +- add default reporters to vitest configuration ([#791](https://github.com/analogjs/analog/issues/791)) ([bdc216c](https://github.com/analogjs/analog/commit/bdc216c51353d32304a59f83591aba63636949ab)) + ## [0.2.24](https://github.com/analogjs/analog/compare/0.2.23...0.2.24) (2023-12-08) ### Bug Fixes diff --git a/package.json b/package.json index 77f2a15f7..77644a395 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "analogjs-platform", - "version": "0.2.24", + "version": "0.2.25", "license": "MIT", "scripts": { "dev": "nx serve", diff --git a/packages/astro-angular/package.json b/packages/astro-angular/package.json index ebbd8efe3..29fa3f4ec 100644 --- a/packages/astro-angular/package.json +++ b/packages/astro-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/astro-angular", - "version": "0.2.24", + "version": "0.2.25", "description": "Use Angular components within Astro", "type": "module", "author": "Brandon Roberts ", @@ -28,7 +28,7 @@ "url": "https://github.com/analogjs/analog.git" }, "dependencies": { - "@analogjs/vite-plugin-angular": "^0.2.24" + "@analogjs/vite-plugin-angular": "^0.2.25" }, "peerDependencies": { "@angular-devkit/build-angular": ">=16.0.0", diff --git a/packages/content/package.json b/packages/content/package.json index a2e04c4e0..c325bf0d5 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/content", - "version": "0.2.24", + "version": "0.2.25", "description": "Content Rendering for Analog", "author": "Brandon Roberts ", "keywords": [ diff --git a/packages/create-analog/package.json b/packages/create-analog/package.json index 22d724a1a..fa975653b 100644 --- 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-v17/_gitignore b/packages/create-analog/template-angular-v17/_gitignore index e64aef272..b82045d79 100644 --- 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 index 0ed4d412d..7a7518339 100644 --- a/packages/create-analog/template-angular-v17/package.json +++ b/packages/create-analog/template-angular-v17/package.json @@ -46,6 +46,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/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 index 374a336b4..20b89f164 100644 --- 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 = '^0.2.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'; diff --git a/packages/platform/package.json b/packages/platform/package.json index 352426e97..3647ec3ff 100644 --- a/packages/platform/package.json +++ b/packages/platform/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/platform", - "version": "0.2.24", + "version": "0.2.25", "type": "commonjs", "description": "The fullstack meta-framework for Angular", "author": "Brandon Roberts ", @@ -25,8 +25,8 @@ }, "dependencies": { "nitropack": "^2.6.0", - "@analogjs/vite-plugin-angular": "^0.2.24", - "@analogjs/vite-plugin-nitro": "^0.2.24" + "@analogjs/vite-plugin-angular": "^0.2.25", + "@analogjs/vite-plugin-nitro": "^0.2.25" }, "peerDependencies": { "@nx/devkit": "^16.0.0 || ^17.0.0", diff --git a/packages/router/package.json b/packages/router/package.json index 878099899..3cb0ffa36 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/router", - "version": "0.2.24", + "version": "0.2.25", "description": "Filesystem-based routing for Angular", "author": "Brandon Roberts ", "keywords": [ @@ -23,7 +23,7 @@ "@angular/router": "^15.0.0 || >=16.0.0" }, "optionalDependencies": { - "@analogjs/content": "^0.2.24" + "@analogjs/content": "^0.2.25" }, "dependencies": { "tslib": "^2.0.0" diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 5d677528f..82dc8cbc6 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/trpc", - "version": "0.2.24", + "version": "0.2.25", "description": "Angular/Nitro-based tRPC integration", "author": "Brandon Roberts ", "keywords": [ diff --git a/packages/vite-plugin-angular/package.json b/packages/vite-plugin-angular/package.json index 3a73458b5..64c979f7d 100644 --- a/packages/vite-plugin-angular/package.json +++ b/packages/vite-plugin-angular/package.json @@ -1,7 +1,7 @@ { "name": "@analogjs/vite-plugin-angular", "description": "Vite Plugin for Angular", - "version": "0.2.24", + "version": "0.2.25", "keywords": [ "vite", "vitest", diff --git a/packages/vite-plugin-nitro/package.json b/packages/vite-plugin-nitro/package.json index 5040ca940..ea61c177a 100644 --- a/packages/vite-plugin-nitro/package.json +++ b/packages/vite-plugin-nitro/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vite-plugin-nitro", - "version": "0.2.24", + "version": "0.2.25", "type": "commonjs", "description": "A Vite plugin for adding a nitro API server", "author": "Brandon Roberts ",