Merge branch 'analogjs:beta' into beta

Author: benpsnyder

CHANGELOG.md

@@ -1,3 +1,38 @@
+# [2.4.0](https://github.com/analogjs/analog/compare/v2.3.1...v2.4.0) (2026-03-30)
+
+### Bug Fixes
+
+- **astro-angular:** style tag ordering for multiple islands ([#2210](https://github.com/analogjs/analog/issues/2210)) ([b306097](https://github.com/analogjs/analog/commit/b306097442be5f1f38f7b47762c67c09febec628))
+- **astro-angular:** support astro v6 using vite environment api ([#2133](https://github.com/analogjs/analog/issues/2133)) ([e9fd9c6](https://github.com/analogjs/analog/commit/e9fd9c6134fa33aa0283bda7efb3c8f54cef15ab))
+- **content:** resolve content files by bare slug lookup ([#2205](https://github.com/analogjs/analog/issues/2205)) ([7e79d24](https://github.com/analogjs/analog/commit/7e79d24a9cd2a8e70dea5b458db59cd4e5ae31ff))
+- **create-analog:** bump to Vitest 4.1, update CI workflow versions ([54b5112](https://github.com/analogjs/analog/commit/54b51125130e897faf787db2b918d5ae16e4802f))
+- fix build and unit tests ([dc6842c](https://github.com/analogjs/analog/commit/dc6842cd9ef79cc1274d92b908f25ec80bbca9d3))
+- fix vitest build and ci workflows ([a4b129a](https://github.com/analogjs/analog/commit/a4b129a589090043d0b06f6e72bbbc259aa23f9e))
+- **nx-plugin:** remove full path to main.ts for Nx projects ([#2164](https://github.com/analogjs/analog/issues/2164)) ([39f0d7c](https://github.com/analogjs/analog/commit/39f0d7ce411cf4c59b5b446337affaa818a4e48f))
+- **nx-plugin:** restore builders configuration ([1d2e4e8](https://github.com/analogjs/analog/commit/1d2e4e8b115da2fb1b63c67f017f861dac7b2f4c))
+- **nx-plugin:** restore schematics configuration ([#2167](https://github.com/analogjs/analog/issues/2167)) ([e74fa68](https://github.com/analogjs/analog/commit/e74fa6829c340976403ba46ca933bd72be2dde2d))
+- **platform:** allow using custom vite plugins for Angular compilation ([#2102](https://github.com/analogjs/analog/issues/2102)) ([8bb4fb4](https://github.com/analogjs/analog/commit/8bb4fb44c4ccb1a0d9c51dcd6fe8c9ab840f0e4e))
+- **platform:** separate disabling highlighting from content discovery ([#2110](https://github.com/analogjs/analog/issues/2110)) ([618c42c](https://github.com/analogjs/analog/commit/618c42cf7bc859e552cb1a3b02c6092c18e99e21))
+- **router:** fix and add unit tests for route module invalidation on file changes ([b9325af](https://github.com/analogjs/analog/commit/b9325af0f0748c7a69610de5782e1fe12461164e))
+- **router:** use non-greedy regex for path normalization ([#2093](https://github.com/analogjs/analog/issues/2093)) ([fa5dd9b](https://github.com/analogjs/analog/commit/fa5dd9b7e6f9e245f5c6379f2f35ee35c7be75e3))
+- update dependencies and package manager versions across projects ([#2106](https://github.com/analogjs/analog/issues/2106)) ([429536c](https://github.com/analogjs/analog/commit/429536c7e5f479aa06eb61a3df51cf4223e30e14)), closes [#2040](https://github.com/analogjs/analog/issues/2040)
+- **vite-plugin-angular:** ensure sequential compilation for client and ssr bundles ([#2109](https://github.com/analogjs/analog/issues/2109)) ([008bd1c](https://github.com/analogjs/analog/commit/008bd1c20daa4c16fe92da036e99219056da4ff3))
+- **vite-plugin-angular:** hash styleId to prevent filename exceeding max length ([#2090](https://github.com/analogjs/analog/issues/2090)) ([2aa2114](https://github.com/analogjs/analog/commit/2aa211479e16cc106f957d5e373ea3a1386abfc6))
+- **vite-plugin-angular:** normalize paths across plugin & live reload ([#2126](https://github.com/analogjs/analog/issues/2126)) ([cc98bf7](https://github.com/analogjs/analog/commit/cc98bf727b181077c87a536f29d7128414d8904d))
+- **vite-plugin-angular:** skip esm transform with Rolldown for Vitest ([#2169](https://github.com/analogjs/analog/issues/2169)) ([20c720b](https://github.com/analogjs/analog/commit/20c720bc8178174041002f400ed4d694dabb30c1))
+- **vitest-angular:** fix imports for snapshot serializers ([#2211](https://github.com/analogjs/analog/issues/2211)) ([8e9f73d](https://github.com/analogjs/analog/commit/8e9f73dfde0e03e0943512dd18f432f20307f3f5))
+- **vitest-angular:** support environment providers ([#2129](https://github.com/analogjs/analog/issues/2129)) ([a90aa12](https://github.com/analogjs/analog/commit/a90aa1272ed64d626386283ae7b9a09775a07287))
+
+### Features
+
+- **astro-angular:** add option to move component styles to document head ([#2162](https://github.com/analogjs/analog/issues/2162)) ([2361afa](https://github.com/analogjs/analog/commit/2361afaa31247e61483517d321f541c7419bc79b))
+- **content:** extract TOC to be property on contentFile ([#2091](https://github.com/analogjs/analog/issues/2091)) ([4e870cc](https://github.com/analogjs/analog/commit/4e870cc99e74c889743503522ae4c6f3be5d9247))
+- **create-analog:** add snapshot serializers ([3318263](https://github.com/analogjs/analog/commit/33182636a130e4c7b3f213aece7a020cf0981c3e))
+- update vite to stable v8.0.0 ([#2111](https://github.com/analogjs/analog/issues/2111)) ([cf35c65](https://github.com/analogjs/analog/commit/cf35c658a3966a514e95aa2c0e4c9c514999c4bd))
+- **vite-plugin-angular:** working fileReplacements and liveReload for Angular Compilation API ([7adf8c1](https://github.com/analogjs/analog/commit/7adf8c18b7786047dc6156eb6c2eaeff0961e5f4))
+- **vitest-angular:** add `teardown.destroyAfterEach` option and deprecate `browserMode` option ([#2054](https://github.com/analogjs/analog/issues/2054)) ([2fe2e1c](https://github.com/analogjs/analog/commit/2fe2e1c9304a933b0070fb2e28c8e92def68f077))
+- **vitest-angular:** add reusable snapshot serializers ([#2163](https://github.com/analogjs/analog/issues/2163)) ([9089c8d](https://github.com/analogjs/analog/commit/9089c8d8f315aad4792d6b37b18db62d951301b2))
+
 # [2.4.0-beta.27](https://github.com/analogjs/analog/compare/v2.4.0-beta.26...v2.4.0-beta.27) (2026-03-30)
 
 ### Bug Fixes

apps/analog-app-e2e/playwright.config.ts

@@ -22,5 +22,6 @@ export default defineConfig({
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env['CI'],
     cwd: '../..',
+    timeout: 120000,
   },
 });

apps/astro-app/.astro/types.d.ts

@@ -19,3 +19,4 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
+.astro

apps/astro-app/.gitignore

@@ -6,6 +6,15 @@ import mdx from '@astrojs/mdx';
 // https://astro.build/config
 export default defineConfig({
   outDir: '../../dist/apps/astro-app',
+  vite: {
+    server: {
+      watch: {
+        // Polling is more reliable for this mounted workspace than native FS events.
+        usePolling: true,
+        interval: 100,
+      },
+    },
+  },
   integrations: [
     angular({ strictStylePlacement: true }),
     react(),

apps/astro-app/astro.config.mjs

@@ -22,5 +22,6 @@ export default defineConfig({
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env['CI'],
     cwd: '../..',
+    timeout: 160000,
   },
 });

apps/blog-app-e2e/playwright.config.ts

@@ -1,6 +1,6 @@
 {
   "name": "analogjs-platform",
-  "version": "2.4.0-beta.27",
+  "version": "2.4.0",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -55,8 +55,8 @@
     "@angular/platform-server": "21.1.1",
     "@angular/router": "21.1.1",
     "@angular/ssr": "21.1.1",
-    "@astrojs/mdx": "^4.3.13",
-    "@astrojs/react": "^4.4.2",
+    "@astrojs/mdx": "^5.0.0",
+    "@astrojs/react": "^5.0.0",
     "@babel/core": "^7.29.0",
     "@mdx-js/react": "3.1.1",
     "@nx/angular": "22.6.0-beta.11",
@@ -144,7 +144,7 @@
     "@vitest/coverage-v8": "4.0.18",
     "@vitest/ui": "4.0.18",
     "all-contributors-cli": "^6.26.1",
-    "astro": "4.16.18",
+    "astro": "6.0.4",
     "autoprefixer": "^10.4.27",
     "conventional-changelog": "^7.2.0",
     "conventional-changelog-cli": "^5.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/astro-angular",
-  "version": "2.4.0-beta.27",
+  "version": "2.4.0",
   "description": "Use Angular components within Astro",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -32,7 +32,7 @@
     "url": "https://github.com/sponsors/brandonroberts"
   },
   "dependencies": {
-    "@analogjs/vite-plugin-angular": "^2.4.0-beta.27",
+    "@analogjs/vite-plugin-angular": "^2.4.0",
     "rehype": "^13.0.2"
   },
   "peerDependencies": {

packages/astro-angular/package.json

@@ -0,0 +1,66 @@
+import type { Plugin } from 'vite';
+import astroPlugin from './index';
+
+function getVitePlugins(): Plugin[] {
+  const integration = astroPlugin();
+  let plugins: Plugin[] = [];
+
+  const setup = integration.hooks['astro:config:setup'] as (args: {
+    addRenderer: () => void;
+    updateConfig: (cfg: { vite: { plugins?: Plugin[] } }) => void;
+  }) => void;
+
+  setup({
+    addRenderer: () => undefined,
+    updateConfig: (cfg) => {
+      plugins = cfg.vite.plugins ?? [];
+    },
+  });
+
+  return plugins;
+}
+
+describe('angularVitePlugin', () => {
+  it('should return astro configurations', () => {
+    expect(astroPlugin().name).toEqual('@analogjs/astro-angular');
+    expect(astroPlugin().hooks).toStrictEqual({
+      'astro:config:setup': expect.anything(),
+      'astro:config:done': expect.anything(),
+    });
+  });
+
+  describe('analogjs-astro-client-ngservermode plugin', () => {
+    it('should set ngServerMode to false for the client environment', () => {
+      const plugins = getVitePlugins();
+      const plugin = plugins.find(
+        (p) => (p as Plugin).name === 'analogjs-astro-client-ngservermode',
+      ) as Plugin & {
+        configEnvironment: (
+          name: string,
+        ) => Record<string, unknown> | undefined;
+      };
+
+      expect(plugin).toBeDefined();
+
+      const result = plugin.configEnvironment('client');
+
+      expect(result).toEqual({
+        define: { ngServerMode: 'false' },
+      });
+    });
+
+    it('should return undefined for non-client environments', () => {
+      const plugins = getVitePlugins();
+      const plugin = plugins.find(
+        (p) => (p as Plugin).name === 'analogjs-astro-client-ngservermode',
+      ) as Plugin & {
+        configEnvironment: (
+          name: string,
+        ) => Record<string, unknown> | undefined;
+      };
+
+      expect(plugin.configEnvironment('server')).toBeUndefined();
+      expect(plugin.configEnvironment('ssr')).toBeUndefined();
+    });
+  });
+});