diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f418fd14..ef4726731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +## [2.0.4-beta.4](https://github.com/analogjs/analog/compare/v2.0.4-beta.3...v2.0.4-beta.4) (2025-11-11) + +### Bug Fixes + +- **nx-plugin:** pin to Vitest 3.x for Nx/Angular ([c0d5b10](https://github.com/analogjs/analog/commit/c0d5b10f0f40f2e5c4d718594ae3ea369a1e2284)) + +## [2.0.4-beta.3](https://github.com/analogjs/analog/compare/v2.0.4-beta.2...v2.0.4-beta.3) (2025-11-11) + +### Bug Fixes + +- **nx-plugin:** add Vitest 4 ui/browser deps ([#1947](https://github.com/analogjs/analog/issues/1947)) ([527addf](https://github.com/analogjs/analog/commit/527addf86043d6226147894653e138e7fbfc88b9)) + +## [2.0.4-beta.2](https://github.com/analogjs/analog/compare/v2.0.4-beta.1...v2.0.4-beta.2) (2025-11-11) + +### Bug Fixes + +- **nx-plugin:** bump Nx app generator to Vitest 4.x ([#1946](https://github.com/analogjs/analog/issues/1946)) ([97aad59](https://github.com/analogjs/analog/commit/97aad59fd40452e1d4452149b136689beb93e138)) + +## [2.0.4-beta.1](https://github.com/analogjs/analog/compare/v2.0.3...v2.0.4-beta.1) (2025-11-09) + +### Bug Fixes + +- **vite-plugin-angular:** remove Storybook ESM workaround plugin ([#1943](https://github.com/analogjs/analog/issues/1943)) ([52a3501](https://github.com/analogjs/analog/commit/52a350143005f669fe8e16db6ef8949ddcdf4b31)) + ## [2.0.3](https://github.com/analogjs/analog/compare/v2.0.2...v2.0.3) (2025-11-06) ### Performance Improvements diff --git a/apps/docs-app/docs/guides/compatibility.md b/apps/docs-app/docs/guides/compatibility.md index 140027d73..c5ba7462b 100644 --- a/apps/docs-app/docs/guides/compatibility.md +++ b/apps/docs-app/docs/guides/compatibility.md @@ -25,6 +25,7 @@ The table shows the minimum version of Nx, the supported Angular version, and th | Nx Version _(min)_ | Angular Version | Analog Version | Vite Version | | ------------------ | --------------- | -------------- | ------------ | +| 22.x.x | ^20.x.x | **latest** | ^7.0.0 | | 21.x.x | ^20.x.x | **latest** | ^7.0.0 | | 20.4.0 | ^19.1.0 | **latest** | ^6.0.0 | | 18.0.0 | ^17.0.0 | **latest** | ^5.0.0 | diff --git a/apps/docs-app/docs/integrations/storybook/index.md b/apps/docs-app/docs/integrations/storybook/index.md index 8606b658b..5b6c13004 100644 --- a/apps/docs-app/docs/integrations/storybook/index.md +++ b/apps/docs-app/docs/integrations/storybook/index.md @@ -16,6 +16,16 @@ This guides you through the process of switching to building and serving your St > This is a community integration not maintained by the Storybook team. If you have issues, > file an issue in our [GitHub repo](https://github.com/analogjs/analog/issues). +## Compatibility Guide + +The AnalogJS Storybook integration for using Angular and Vite supports multiple versions of Storybook. See the table below for which version to install based on the project dependencies. + +| Storybook Version | Analog Version | +| ----------------- | -------------- | +| ^10.0.0 | ^2.0.0 | +| ^9.0.0 | ^1.22.0 | +| ^8.6.0 | ^1.22.0 | + ## Setting up Storybook If you don't have Storybook setup already, run the following command to initialize Storybook for your project: diff --git a/apps/docs-app/docs/support.md b/apps/docs-app/docs/support.md index da2ddc497..f11ee05a9 100644 --- a/apps/docs-app/docs/support.md +++ b/apps/docs-app/docs/support.md @@ -6,7 +6,15 @@ sidebar_position: 5 Whether you're a solo developer or a large enterprise, different options are available! -## Discord +## Paid Support + +Private consulting, including retainers and enterprise support services are available for companies and projects at any scale, directly from the AnalogJS core team. + +- [Contact Us](mailto:brandon@analogjs.org?subject=Paid+Support) directly to discuss Paid Support opportunities! + +## Community Support + +### Discord There is a [Discord Server](https://chat.analogjs.org) available for: @@ -14,7 +22,7 @@ There is a [Discord Server](https://chat.analogjs.org) available for: - Q&A - General Chat -## GitHub +### GitHub The [source code](https://github.com/analogjs/analog) for Analog is MIT-licensed, free, and open source. General support can be requested in the form of: @@ -22,14 +30,3 @@ The [source code](https://github.com/analogjs/analog) for Analog is MIT-licensed - Feature Requests - Pull Requests - General [Contributions](/docs/contributing) - -## Dedicated Support - -Dedicated Support is available through: - -- Architecture Consulting -- Enterprise Support Contracts -- Retainers -- Workshops - -- Schedule a [Meeting](https://calendly.com/brandontroberts/session) or [Contact Us](mailto:support@analogjs.org?subject=Dedicated+Support) directly to disucss Dedicated Support opportunities! diff --git a/apps/docs-app/src/components/HomepageFeatures/index.tsx b/apps/docs-app/src/components/HomepageFeatures/index.tsx index 46e3cd12f..2f129d047 100644 --- a/apps/docs-app/src/components/HomepageFeatures/index.tsx +++ b/apps/docs-app/src/components/HomepageFeatures/index.tsx @@ -24,8 +24,8 @@ const FeatureList: FeatureItem[] = [ id="features.vite" description="The description of the feature 'Vite-powered'" > - Analog uses Vite for serving and building as well as Vitest for - testing. + Analog is powered by Vite and Vitest, and enables its full ecosystem + of plugins, integrations, and tools. ), @@ -44,7 +44,7 @@ const FeatureList: FeatureItem[] = [ id="features.hybridSSR" description="The description of the feature 'Hybrid SSR/SSG support'" > - Analog supports both Server-Side Rendering (SSR) and Static Site + Analog integrates Hybrid Server-Side Rendering (SSR) and Static Site Generation (SSG) of Angular applications. @@ -64,8 +64,8 @@ const FeatureList: FeatureItem[] = [ id="features.fileBasedRouting" description="The description of the feature 'File-based routing and API routes'" > - Analog uses file-based routing and supports API (server) routes for - Angular applications. + Analog uses file-based routing, API routes, server-side data-fetching, + and provides a seamless developer experience with Angular. ), diff --git a/apps/docs-app/src/pages/index.tsx b/apps/docs-app/src/pages/index.tsx index a3d3a2ff9..9f0bd4a0b 100644 --- a/apps/docs-app/src/pages/index.tsx +++ b/apps/docs-app/src/pages/index.tsx @@ -142,13 +142,13 @@ function SponsorSection() { 'button button--secondary button--lg', styles.sponsorButton, )} - href="https://github.com/sponsors/brandonroberts" + href="/docs/sponsoring#partnerships" > - Sponsor Analog + Partner with Analog diff --git a/package.json b/package.json index f944ac392..650a6daaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "analogjs-platform", - "version": "2.0.3", + "version": "2.0.4-beta.4", "license": "MIT", "type": "module", "scripts": { diff --git a/packages/astro-angular/package.json b/packages/astro-angular/package.json index e6f1a05de..6721e5dce 100644 --- a/packages/astro-angular/package.json +++ b/packages/astro-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/astro-angular", - "version": "2.0.3", + "version": "2.0.4-beta.4", "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": "^2.0.3" + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4" }, "peerDependencies": { "@angular/build": ">=20.0.0", diff --git a/packages/content/package.json b/packages/content/package.json index 06f9edef0..4201887d3 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/content", - "version": "2.0.3", + "version": "2.0.4-beta.4", "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 c1fb9ec63..84eed3e2b 100644 --- a/packages/create-analog/package.json +++ b/packages/create-analog/package.json @@ -1,6 +1,6 @@ { "name": "create-analog", - "version": "2.0.3", + "version": "2.0.4-beta.4", "type": "module", "license": "MIT", "author": "Brandon Roberts", diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json index 7ee6bb6af..d512fe66d 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": "^2.0.3", - "@analogjs/router": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", + "@analogjs/router": "^2.0.4-beta.4", "@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": "^2.0.3", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vitest-angular": "^2.0.3", + "@analogjs/platform": "^2.0.4-beta.4", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vitest-angular": "^2.0.4-beta.4", "@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 7061a1c26..1af2407ee 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": "^2.0.3", - "@analogjs/router": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", + "@analogjs/router": "^2.0.4-beta.4", "@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": "^2.0.3", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vitest-angular": "^2.0.3", + "@analogjs/platform": "^2.0.4-beta.4", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vitest-angular": "^2.0.4-beta.4", "@angular/cli": "^18.0.0", "@angular/compiler-cli": "^18.0.0", "jsdom": "^22.0.0", diff --git a/packages/create-analog/template-angular-v19/package.json b/packages/create-analog/template-angular-v19/package.json index 7fe76e71a..7671327a4 100644 --- a/packages/create-analog/template-angular-v19/package.json +++ b/packages/create-analog/template-angular-v19/package.json @@ -15,8 +15,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^2.0.3", - "@analogjs/router": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", + "@analogjs/router": "^2.0.4-beta.4", "@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": "^2.0.3", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vitest-angular": "^2.0.3", + "@analogjs/platform": "^2.0.4-beta.4", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vitest-angular": "^2.0.4-beta.4", "@angular-devkit/build-angular": "^19.0.0", "@angular/build": "^19.0.0", "@angular/cli": "^19.0.0", diff --git a/packages/create-analog/template-blog/package.json b/packages/create-analog/template-blog/package.json index ccbb1347e..811e61cbb 100644 --- a/packages/create-analog/template-blog/package.json +++ b/packages/create-analog/template-blog/package.json @@ -16,8 +16,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^2.0.3", - "@analogjs/router": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", + "@analogjs/router": "^2.0.4-beta.4", "@angular/animations": "^20.0.0", "@angular/common": "^20.0.0", "@angular/compiler": "^20.0.0", @@ -36,9 +36,9 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@analogjs/platform": "^2.0.3", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vitest-angular": "^2.0.3", + "@analogjs/platform": "^2.0.4-beta.4", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vitest-angular": "^2.0.4-beta.4", "@angular-devkit/build-angular": "^20.0.0", "@angular/build": "^20.0.0", "@angular/cli": "^20.0.0", diff --git a/packages/create-analog/template-latest/package.json b/packages/create-analog/template-latest/package.json index d27e973bd..2feac7728 100644 --- a/packages/create-analog/template-latest/package.json +++ b/packages/create-analog/template-latest/package.json @@ -16,8 +16,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^2.0.3", - "@analogjs/router": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", + "@analogjs/router": "^2.0.4-beta.4", "@angular/animations": "^20.0.0", "@angular/common": "^20.0.0", "@angular/compiler": "^20.0.0", @@ -37,9 +37,9 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@analogjs/platform": "^2.0.3", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vitest-angular": "^2.0.3", + "@analogjs/platform": "^2.0.4-beta.4", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vitest-angular": "^2.0.4-beta.4", "@angular-devkit/build-angular": "^20.0.0", "@angular/build": "^20.0.0", "@angular/cli": "^20.0.0", diff --git a/packages/create-analog/template-minimal/package.json b/packages/create-analog/template-minimal/package.json index d27e973bd..2feac7728 100644 --- a/packages/create-analog/template-minimal/package.json +++ b/packages/create-analog/template-minimal/package.json @@ -16,8 +16,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^2.0.3", - "@analogjs/router": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", + "@analogjs/router": "^2.0.4-beta.4", "@angular/animations": "^20.0.0", "@angular/common": "^20.0.0", "@angular/compiler": "^20.0.0", @@ -37,9 +37,9 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@analogjs/platform": "^2.0.3", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vitest-angular": "^2.0.3", + "@analogjs/platform": "^2.0.4-beta.4", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vitest-angular": "^2.0.4-beta.4", "@angular-devkit/build-angular": "^20.0.0", "@angular/build": "^20.0.0", "@angular/cli": "^20.0.0", diff --git a/packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts b/packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts index f92441978..e9e5b4ba3 100644 --- a/packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts +++ b/packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts @@ -2,11 +2,11 @@ // dependencies export const V18_X_NX_DEVKIT = '^20.0.0'; export const V18_X_NX_ANGULAR = '^20.0.0'; -export const V18_X_ANALOG_JS_CONTENT = '^2.0.3'; -export const V18_X_ANALOG_JS_ROUTER = '^2.0.3'; +export const V18_X_ANALOG_JS_CONTENT = '^2.0.4-beta.4'; +export const V18_X_ANALOG_JS_ROUTER = '^2.0.4-beta.4'; export const V18_X_ANALOG_JS_TRPC = '~0.4.0'; -export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.3'; -export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.3'; +export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.4-beta.4'; +export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.4-beta.4'; export const V18_X_TRPC_CLIENT = '^10.25.0'; export const V18_X_TRPC_SERVER = '^10.25.0'; export const V18_X_ISOMORPHIC_FETCH = '^3.0.0'; @@ -24,7 +24,7 @@ export const V18_X_POSTCSS = '^8.5.3'; export const V18_X_AUTOPREFIXER = '^10.4.0'; // devDependencies -export const V18_X_ANALOG_JS_PLATFORM = '^2.0.3'; +export const V18_X_ANALOG_JS_PLATFORM = '^2.0.4-beta.4'; export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0'; export const V18_X_NX_VITE = '^21.0.0'; export const V18_X_NX_LINTER = '^21.0.0'; diff --git a/packages/nx-plugin/src/utils/versions/dev-dependencies.ts b/packages/nx-plugin/src/utils/versions/dev-dependencies.ts index 24e3adfcb..14974f704 100644 --- a/packages/nx-plugin/src/utils/versions/dev-dependencies.ts +++ b/packages/nx-plugin/src/utils/versions/dev-dependencies.ts @@ -39,6 +39,8 @@ const devDependencyKeys = [ 'vitest', '@nx/vite', 'vite', + '@vitest/coverage-v8', + '@vitest/ui', ] as const; export type AnalogDevDependency = (typeof devDependencyKeys)[number]; @@ -77,6 +79,8 @@ const getDevDependencies = ( 'vite-tsconfig-paths': V17_X_VITE_TSCONFIG_PATHS, vite: V19_X_VITE, vitest: V17_X_VITEST, + '@vitest/coverage-v8': V17_X_VITEST, + '@vitest/ui': V17_X_VITEST, }; } @@ -91,6 +95,8 @@ const getDevDependencies = ( 'vite-tsconfig-paths': V18_X_VITE_TSCONFIG_PATHS, vite: V19_X_VITE, vitest: V18_X_VITEST, + '@vitest/coverage-v8': V18_X_VITEST, + '@vitest/ui': V17_X_VITEST, }; } @@ -110,5 +116,13 @@ const getDevDependencies = ( escapedNxVersion && lt(escapedNxVersion, '20.5.0') ? V19_X_VITEST : NX_X_LATEST_VITEST, + '@vitest/coverage-v8': + escapedNxVersion && lt(escapedNxVersion, '20.5.0') + ? V19_X_VITEST + : NX_X_LATEST_VITEST, + '@vitest/ui': + escapedNxVersion && lt(escapedNxVersion, '20.5.0') + ? V19_X_VITEST + : NX_X_LATEST_VITEST, }; }; diff --git a/packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts b/packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts index dbd08f253..25d5c74be 100644 --- a/packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts +++ b/packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts @@ -1,6 +1,6 @@ // V19_X -export const V19_X_ANALOG_JS_ROUTER = '^2.0.3'; -export const V19_X_ANALOG_JS_CONTENT = '^2.0.3'; +export const V19_X_ANALOG_JS_ROUTER = '^2.0.4-beta.4'; +export const V19_X_ANALOG_JS_CONTENT = '^2.0.4-beta.4'; export const V19_X_MARKED = '^15.0.7'; export const V19_X_MARKED_GFM_HEADING_ID = '^4.1.1'; export const V19_X_MARKED_HIGHLIGHT = '^2.2.1'; @@ -8,9 +8,9 @@ export const V19_X_MARKED_MANGLE = '^1.1.10'; export const V19_X_PRISMJS = '^1.29.0'; // devDependencies -export const V19_X_ANALOG_JS_PLATFORM = '^2.0.3'; -export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.3'; -export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.3'; +export const V19_X_ANALOG_JS_PLATFORM = '^2.0.4-beta.4'; +export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.4-beta.4'; +export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.4-beta.4'; export const V19_X_NX_ANGULAR = '^22.0.0'; export const V19_X_NX_VITE = '^22.0.0'; export const V19_X_JSDOM = '^22.0.0'; diff --git a/packages/platform/package.json b/packages/platform/package.json index 7cc8d02e4..4aa59aa49 100644 --- a/packages/platform/package.json +++ b/packages/platform/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/platform", - "version": "2.0.3", + "version": "2.0.4-beta.4", "description": "The fullstack meta-framework for Angular", "type": "module", "author": "Brandon Roberts ", @@ -29,8 +29,8 @@ }, "dependencies": { "nitropack": "^2.11.0", - "@analogjs/vite-plugin-angular": "^2.0.3", - "@analogjs/vite-plugin-nitro": "^2.0.3", + "@analogjs/vite-plugin-angular": "^2.0.4-beta.4", + "@analogjs/vite-plugin-nitro": "^2.0.4-beta.4", "vitefu": "^1.0.0" }, "peerDependencies": { diff --git a/packages/router/package.json b/packages/router/package.json index 6cdbf86b8..7b0696c20 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/router", - "version": "2.0.3", + "version": "2.0.4-beta.4", "description": "Filesystem-based routing for Angular", "type": "module", "author": "Brandon Roberts ", @@ -24,7 +24,7 @@ "url": "https://github.com/sponsors/brandonroberts" }, "peerDependencies": { - "@analogjs/content": "^2.0.3", + "@analogjs/content": "^2.0.4-beta.4", "@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0", "@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0" }, diff --git a/packages/storybook-angular/package.json b/packages/storybook-angular/package.json index 28e331ee5..0c21cc0ff 100644 --- a/packages/storybook-angular/package.json +++ b/packages/storybook-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/storybook-angular", - "version": "2.0.3", + "version": "2.0.4-beta.4", "description": "Storybook Integration for Angular & Vite", "type": "module", "keywords": [ diff --git a/packages/vite-plugin-angular/package.json b/packages/vite-plugin-angular/package.json index 3ebf0fc69..4fb049260 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": "2.0.3", + "version": "2.0.4-beta.4", "description": "Vite Plugin for Angular", "type": "module", "keywords": [ diff --git a/packages/vite-plugin-angular/src/lib/angular-storybook-plugin.ts b/packages/vite-plugin-angular/src/lib/angular-storybook-plugin.ts deleted file mode 100644 index 236fe0975..000000000 --- a/packages/vite-plugin-angular/src/lib/angular-storybook-plugin.ts +++ /dev/null @@ -1,35 +0,0 @@ -import fs from 'node:fs'; -import { resolve } from 'node:path'; - -export function angularStorybookPlugin(workspaceRoot: string) { - const esmPath = resolve( - workspaceRoot, - 'node_modules/@storybook/angular/dist/client/index.mjs', - ); - const hasESM = fs.existsSync(esmPath); - - return { - name: 'analogjs-storybook-import-plugin', - transform(code: string, id: string) { - if (id.includes('node_modules')) { - return; - } - - if (code.includes('"@storybook/angular"')) { - return code.replace( - /\"@storybook\/angular\"/g, - `"@storybook/angular/dist/client/index.${hasESM ? 'm' : ''}js"`, - ); - } - - if (code.includes("'@storybook/angular'")) { - return code.replace( - /\'@storybook\/angular\'/g, - `'@storybook/angular/dist/client/index.${hasESM ? 'm' : ''}js'`, - ); - } - - return; - }, - }; -} 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 56aca0303..eefbb16d1 100644 --- a/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts +++ b/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts @@ -38,7 +38,6 @@ import { mergeTransformers, } from './host.js'; -import { angularStorybookPlugin } from './angular-storybook-plugin.js'; import { angularVitestPlugins } from './angular-vitest-plugin.js'; import { angularMajor, @@ -143,11 +142,6 @@ export function angular(options?: PluginOptions): Plugin[] { const isVitestVscode = !!process.env['VITEST_VSCODE']; const isStackBlitz = !!process.versions['webcontainer']; const isAstroIntegration = process.env['ANALOG_ASTRO'] === 'true'; - const isStorybook = - process.env['npm_lifecycle_script']?.includes('storybook') || - process.env['_']?.includes('storybook') || - process.env['NX_TASK_TARGET_TARGET']?.includes('storybook') || - process.env['ANALOG_STORYBOOK'] === 'true'; const jit = typeof pluginOptions?.jit !== 'undefined' ? pluginOptions.jit : isTest; @@ -606,8 +600,6 @@ export function angular(options?: PluginOptions): Plugin[] { supportedBrowsers: pluginOptions.supportedBrowsers, jit, }), - (isStorybook && - angularStorybookPlugin(pluginOptions.workspaceRoot)) as Plugin, routerPlugin(), pendingTasksPlugin(), nxFolderPlugin(), diff --git a/packages/vite-plugin-nitro/package.json b/packages/vite-plugin-nitro/package.json index ca5cd5a6a..1d7599c02 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": "2.0.3", + "version": "2.0.4-beta.4", "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 500682661..38907fa22 100644 --- a/packages/vitest-angular/package.json +++ b/packages/vitest-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vitest-angular", - "version": "2.0.3", + "version": "2.0.4-beta.4", "description": "Vitest Builder for Angular", "type": "module", "author": "Brandon Roberts ",