diff --git a/CHANGELOG.md b/CHANGELOG.md index 0877ddce8..44436c100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## [1.10.3-beta.3](https://github.com/analogjs/analog/compare/v1.10.3-beta.2...v1.10.3-beta.3) (2024-12-17) + +### Bug Fixes + +- **platform:** add front-matter for default optimization ([#1510](https://github.com/analogjs/analog/issues/1510)) ([faab0d5](https://github.com/analogjs/analog/commit/faab0d5d9c23ac571cc1be77efdbaf99b8db0a3c)) + +## [1.10.3-beta.2](https://github.com/analogjs/analog/compare/v1.10.3-beta.1...v1.10.3-beta.2) (2024-12-17) + +### Bug Fixes + +- **vitest-angular:** use vite overrides to pass test watch mode ([#1509](https://github.com/analogjs/analog/issues/1509)) ([438571f](https://github.com/analogjs/analog/commit/438571fc847ed9cf1594e7efac9c510b812c1cd0)) + +## [1.10.3-beta.1](https://github.com/analogjs/analog/compare/v1.10.2...v1.10.3-beta.1) (2024-12-17) + +### Bug Fixes + +- **vitest-angular:** set watch mode flag when passed from CLI args ([#1508](https://github.com/analogjs/analog/issues/1508)) ([f4fbe77](https://github.com/analogjs/analog/commit/f4fbe77b7c819bdb601cd4cfa2c041038f85ace5)) + ## [1.10.2](https://github.com/analogjs/analog/compare/v1.10.1...v1.10.2) (2024-12-16) ### Bug Fixes diff --git a/libs/card/project.json b/libs/card/project.json index 8ae9976eb..8516d17fc 100644 --- a/libs/card/project.json +++ b/libs/card/project.json @@ -5,7 +5,6 @@ "prefix": "lib", "projectType": "library", "tags": [], - "implicitDependencies": ["vitest-angular"], "targets": { "test": { "executor": "@nx/vite:test" diff --git a/package.json b/package.json index 18da9d272..5c1198a22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "analogjs-platform", - "version": "1.10.2", + "version": "1.10.3-beta.3", "license": "MIT", "type": "module", "scripts": { diff --git a/packages/astro-angular/package.json b/packages/astro-angular/package.json index 2fb789326..9db831dff 100644 --- a/packages/astro-angular/package.json +++ b/packages/astro-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/astro-angular", - "version": "1.10.2", + "version": "1.10.3-beta.3", "description": "Use Angular components within Astro", "type": "module", "author": "Brandon Roberts ", @@ -32,7 +32,7 @@ "url": "https://github.com/sponsors/brandonroberts" }, "dependencies": { - "@analogjs/vite-plugin-angular": "^1.10.2" + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3" }, "peerDependencies": { "@angular-devkit/build-angular": ">=16.0.0", diff --git a/packages/content/package.json b/packages/content/package.json index 754669b8d..af842ab06 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/content", - "version": "1.10.2", + "version": "1.10.3-beta.3", "description": "Content Rendering for Analog", "type": "module", "author": "Brandon Roberts ", diff --git a/packages/create-analog/package.json b/packages/create-analog/package.json index 78d1c4f04..0d5ab2cd3 100644 --- a/packages/create-analog/package.json +++ b/packages/create-analog/package.json @@ -1,6 +1,6 @@ { "name": "create-analog", - "version": "1.10.2", + "version": "1.10.3-beta.3", "type": "module", "license": "MIT", "author": "Brandon Roberts", diff --git a/packages/create-analog/template-angular-v16/package.json b/packages/create-analog/template-angular-v16/package.json index f874206fa..09809c2e4 100644 --- a/packages/create-analog/template-angular-v16/package.json +++ b/packages/create-analog/template-angular-v16/package.json @@ -15,8 +15,8 @@ "test": "ng test" }, "dependencies": { - "@analogjs/content": "^1.10.2", - "@analogjs/router": "^1.10.2", + "@analogjs/content": "^1.10.3-beta.3", + "@analogjs/router": "^1.10.3-beta.3", "@angular/animations": "^16.2.0", "@angular/common": "^16.2.0", "@angular/compiler": "^16.2.0", @@ -38,9 +38,9 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@analogjs/platform": "^1.10.2", - "@analogjs/vite-plugin-angular": "^1.10.2", - "@analogjs/vitest-angular": "^1.10.2", + "@analogjs/platform": "^1.10.3-beta.3", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vitest-angular": "^1.10.3-beta.3", "@angular-devkit/build-angular": "^16.2.0", "@angular/cli": "^16.2.0", "@angular/compiler-cli": "^16.2.0", diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json index 5999585b2..40aa21144 100644 --- a/packages/create-analog/template-angular-v17/package.json +++ b/packages/create-analog/template-angular-v17/package.json @@ -15,8 +15,8 @@ "test": "ng test" }, "dependencies": { - "@analogjs/content": "^1.10.2", - "@analogjs/router": "^1.10.2", + "@analogjs/content": "^1.10.3-beta.3", + "@analogjs/router": "^1.10.3-beta.3", "@angular/animations": "^17.2.0", "@angular/common": "^17.2.0", "@angular/compiler": "^17.2.0", @@ -38,9 +38,9 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@analogjs/platform": "^1.10.2", - "@analogjs/vite-plugin-angular": "^1.10.2", - "@analogjs/vitest-angular": "^1.10.2", + "@analogjs/platform": "^1.10.3-beta.3", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vitest-angular": "^1.10.3-beta.3", "@angular-devkit/build-angular": "^17.2.0", "@angular/cli": "^17.2.0", "@angular/compiler-cli": "^17.2.0", diff --git a/packages/create-analog/template-angular-v18/package.json b/packages/create-analog/template-angular-v18/package.json index e54e89282..38487537f 100644 --- a/packages/create-analog/template-angular-v18/package.json +++ b/packages/create-analog/template-angular-v18/package.json @@ -15,8 +15,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^1.9.5-beta.1", - "@analogjs/router": "^1.9.5-beta.1", + "@analogjs/content": "^1.10.3-beta.3", + "@analogjs/router": "^1.10.3-beta.3", "@angular/animations": "^18.0.0", "@angular/build": "^18.0.0", "@angular/common": "^18.0.0", @@ -38,9 +38,9 @@ "zone.js": "~0.14.3" }, "devDependencies": { - "@analogjs/platform": "^1.9.5-beta.1", - "@analogjs/vite-plugin-angular": "^1.9.5-beta.1", - "@analogjs/vitest-angular": "^1.9.5-beta.1", + "@analogjs/platform": "^1.10.3-beta.3", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vitest-angular": "^1.10.3-beta.3", "@angular/cli": "^18.0.0", "@angular/compiler-cli": "^18.0.0", "jsdom": "^22.0.0", diff --git a/packages/create-analog/template-blog/package.json b/packages/create-analog/template-blog/package.json index 5fc1e44ee..33821da71 100644 --- a/packages/create-analog/template-blog/package.json +++ b/packages/create-analog/template-blog/package.json @@ -15,8 +15,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^1.10.2", - "@analogjs/router": "^1.10.2", + "@analogjs/content": "^1.10.3-beta.3", + "@analogjs/router": "^1.10.3-beta.3", "@angular/animations": "^19.0.0", "@angular/common": "^19.0.0", "@angular/compiler": "^19.0.0", @@ -36,9 +36,9 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@analogjs/platform": "^1.10.2", - "@analogjs/vite-plugin-angular": "^1.10.2", - "@analogjs/vitest-angular": "^1.10.2", + "@analogjs/platform": "^1.10.3-beta.3", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vitest-angular": "^1.10.3-beta.3", "@angular-devkit/build-angular": "^19.0.0", "@angular/build": "^19.0.0", "@angular/cli": "^19.0.0", diff --git a/packages/create-analog/template-latest/package.json b/packages/create-analog/template-latest/package.json index 4029b1f42..cd803c717 100644 --- a/packages/create-analog/template-latest/package.json +++ b/packages/create-analog/template-latest/package.json @@ -15,8 +15,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^1.10.2", - "@analogjs/router": "^1.10.2", + "@analogjs/content": "^1.10.3-beta.3", + "@analogjs/router": "^1.10.3-beta.3", "@angular/animations": "^19.0.0", "@angular/common": "^19.0.0", "@angular/compiler": "^19.0.0", @@ -37,9 +37,9 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@analogjs/platform": "^1.10.2", - "@analogjs/vite-plugin-angular": "^1.10.2", - "@analogjs/vitest-angular": "^1.10.2", + "@analogjs/platform": "^1.10.3-beta.3", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vitest-angular": "^1.10.3-beta.3", "@angular-devkit/build-angular": "^19.0.0", "@angular/build": "^19.0.0", "@angular/cli": "^19.0.0", diff --git a/packages/create-analog/template-minimal/package.json b/packages/create-analog/template-minimal/package.json index 4029b1f42..cd803c717 100644 --- a/packages/create-analog/template-minimal/package.json +++ b/packages/create-analog/template-minimal/package.json @@ -15,8 +15,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^1.10.2", - "@analogjs/router": "^1.10.2", + "@analogjs/content": "^1.10.3-beta.3", + "@analogjs/router": "^1.10.3-beta.3", "@angular/animations": "^19.0.0", "@angular/common": "^19.0.0", "@angular/compiler": "^19.0.0", @@ -37,9 +37,9 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@analogjs/platform": "^1.10.2", - "@analogjs/vite-plugin-angular": "^1.10.2", - "@analogjs/vitest-angular": "^1.10.2", + "@analogjs/platform": "^1.10.3-beta.3", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vitest-angular": "^1.10.3-beta.3", "@angular-devkit/build-angular": "^19.0.0", "@angular/build": "^19.0.0", "@angular/cli": "^19.0.0", diff --git a/packages/platform/package.json b/packages/platform/package.json index ba5266a26..02674f147 100644 --- a/packages/platform/package.json +++ b/packages/platform/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/platform", - "version": "1.10.2", + "version": "1.10.3-beta.3", "description": "The fullstack meta-framework for Angular", "type": "module", "author": "Brandon Roberts ", @@ -29,8 +29,8 @@ }, "dependencies": { "nitropack": "^2.10.0", - "@analogjs/vite-plugin-angular": "^1.10.2", - "@analogjs/vite-plugin-nitro": "^1.10.2", + "@analogjs/vite-plugin-angular": "^1.10.3-beta.3", + "@analogjs/vite-plugin-nitro": "^1.10.3-beta.3", "vitefu": "^0.2.5" }, "peerDependencies": { diff --git a/packages/platform/src/lib/deps-plugin.ts b/packages/platform/src/lib/deps-plugin.ts index dadedb964..cea9f4a9d 100644 --- a/packages/platform/src/lib/deps-plugin.ts +++ b/packages/platform/src/lib/deps-plugin.ts @@ -29,6 +29,7 @@ export function depsPlugin(options?: Options): Plugin[] { ...(Number(VERSION.major) > 15 ? ['@angular/core/rxjs-interop'] : []), + 'front-matter', ], exclude: [ '@angular/platform-server', diff --git a/packages/router/package.json b/packages/router/package.json index 7166c921f..0e8d09f64 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/router", - "version": "1.10.2", + "version": "1.10.3-beta.3", "description": "Filesystem-based routing for Angular", "type": "module", "author": "Brandon Roberts ", @@ -24,7 +24,7 @@ "url": "https://github.com/sponsors/brandonroberts" }, "peerDependencies": { - "@analogjs/content": "^1.10.2", + "@analogjs/content": "^1.10.3-beta.3", "@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, diff --git a/packages/vite-plugin-angular/package.json b/packages/vite-plugin-angular/package.json index 9d7e55488..e74ecd6a8 100644 --- a/packages/vite-plugin-angular/package.json +++ b/packages/vite-plugin-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vite-plugin-angular", - "version": "1.10.2", + "version": "1.10.3-beta.3", "description": "Vite Plugin for Angular", "type": "module", "keywords": [ diff --git a/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts b/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts index a9e613a73..bba61b12c 100644 --- a/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts +++ b/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts @@ -214,7 +214,13 @@ export function angular(options?: PluginOptions): Plugin[] { }, configResolved(config) { resolvedConfig = config; - testWatchMode = !(config.server.watch === null); + + // set test watch mode + // - vite override from vitest-angular + // - @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; }, configureServer(server) { viteServer = server; diff --git a/packages/vite-plugin-nitro/package.json b/packages/vite-plugin-nitro/package.json index 33af4d95a..8b06c9ed1 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": "1.10.2", + "version": "1.10.3-beta.3", "description": "A Vite plugin for adding a nitro API server", "type": "module", "author": "Brandon Roberts ", diff --git a/packages/vitest-angular/package.json b/packages/vitest-angular/package.json index 8fa990da1..5942a05ed 100644 --- a/packages/vitest-angular/package.json +++ b/packages/vitest-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vitest-angular", - "version": "1.10.2", + "version": "1.10.3-beta.3", "description": "Vitest Builder for Angular", "type": "commonjs", "author": "Brandon Roberts ", diff --git a/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts b/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts index 8c9bd3819..00b837b53 100644 --- a/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts +++ b/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts @@ -21,14 +21,17 @@ async function vitestBuilder( context.target as unknown as string ); const extraArgs = await getExtraArgs(options); + const watch = options.watch === true; const config = { root: `${projectConfig['root'] || '.'}`, - watch: options.watch === true, + watch, config: options.configFile, ...extraArgs, }; - const server = await startVitest('test', options.testFiles ?? [], config); + const server = await startVitest('test', options.testFiles ?? [], config, { + test: { watch }, + }); let hasErrors = false; diff --git a/release.config.cjs b/release.config.cjs index f39a4ba01..293961793 100644 --- a/release.config.cjs +++ b/release.config.cjs @@ -8,6 +8,7 @@ const replacementFiles = [ 'packages/astro-angular/package.json', 'packages/create-analog/template-angular-v16/package.json', 'packages/create-analog/template-angular-v17/package.json', + 'packages/create-analog/template-angular-v18/package.json', 'packages/create-analog/template-blog/package.json', 'packages/create-analog/template-latest/package.json', 'packages/create-analog/template-minimal/package.json', @@ -16,7 +17,11 @@ const replacementFiles = [ ]; module.exports = { - branches: ['main', { name: 'beta', prerelease: true }], + branches: [ + 'main', + { name: 'beta', prerelease: true }, + { name: 'alpha', prerelease: true }, + ], plugins: [ '@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', @@ -126,6 +131,12 @@ module.exports = { ], }, ], + [ + '@semantic-release/exec', + { + publishCmd: `pnpm build && RELEASE_TAG=${tag} ./tools/publish.sh`, + }, + ], [ '@semantic-release/git', { @@ -137,6 +148,7 @@ module.exports = { 'packages/create-analog/package.json', 'packages/create-analog/template-angular-v16/package.json', 'packages/create-analog/template-angular-v17/package.json', + 'packages/create-analog/template-angular-v18/package.json', 'packages/create-analog/template-blog/package.json', 'packages/create-analog/template-latest/package.json', 'packages/create-analog/template-minimal/package.json', @@ -149,12 +161,6 @@ module.exports = { message: 'chore: release ${nextRelease.version} [skip ci]', }, ], - [ - '@semantic-release/exec', - { - publishCmd: `pnpm build && RELEASE_TAG=${tag} ./tools/publish.sh`, - }, - ], ], preset: 'angular', };