@nx/angular 20.3.0-beta.0 → 20.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.3.0-beta.0",
+  "version": "20.3.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -71,13 +71,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.3.0-beta.0",
-    "@nx/js": "20.3.0-beta.0",
-    "@nx/eslint": "20.3.0-beta.0",
-    "@nx/webpack": "20.3.0-beta.0",
-    "@nx/module-federation": "20.3.0-beta.0",
-    "@nx/web": "20.3.0-beta.0",
-    "@nx/workspace": "20.3.0-beta.0",
+    "@nx/devkit": "20.3.0-beta.1",
+    "@nx/js": "20.3.0-beta.1",
+    "@nx/eslint": "20.3.0-beta.1",
+    "@nx/webpack": "20.3.0-beta.1",
+    "@nx/module-federation": "20.3.0-beta.1",
+    "@nx/web": "20.3.0-beta.1",
+    "@nx/workspace": "20.3.0-beta.1",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/builders/dev-server/lib/normalize-options.js

@@ -15,7 +15,7 @@ function normalizeOptions(schema) {
         host: schema.host ?? 'localhost',
         port: schema.port ?? 4200,
         liveReload: schema.liveReload ?? true,
-        hmr: angularMajorVersion < 19 ? schema.hmr ?? false : undefined,
+        hmr: schema.hmr ?? (angularMajorVersion < 19 ? false : undefined),
         open: schema.open ?? false,
         ssl: schema.ssl ?? false,
     };

package/src/generators/utils/add-vitest.js

@@ -4,46 +4,12 @@ exports.addVitest = addVitest;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 async function addVitest(tree, options) {
-    if (!options.skipPackageJson) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@analogjs/vitest-angular': versions_1.analogVitestAngular,
-            '@analogjs/vite-plugin-angular': versions_1.analogVitestAngular,
-        }, undefined, true);
-    }
-    const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-    const relativeTestSetupPath = (0, devkit_1.joinPathFragments)('src', 'test-setup.ts');
-    const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, relativeTestSetupPath);
-    if (!tree.exists(setupFile)) {
-        tree.write(setupFile, `import '@analogjs/vitest-angular/setup-zone';
-
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-import { getTestBed } from '@angular/core/testing';
-
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-`);
-        await vitestGenerator(tree, {
-            project: options.name,
-            uiFramework: 'none',
-            skipViteConfig: true,
-            testEnvironment: 'jsdom',
-            coverageProvider: 'v8',
-            addPlugin: false,
-        });
-        createOrEditViteConfig(tree, {
-            project: options.name,
-            includeLib: false,
-            includeVitest: true,
-            inSourceTests: false,
-            imports: [`import angular from '@analogjs/vite-plugin-angular'`],
-            plugins: ['angular()'],
-            setupFile: relativeTestSetupPath,
-            useEsmExtension: true,
-        }, true);
-    }
+    const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+    await vitestGenerator(tree, {
+        project: options.name,
+        uiFramework: 'angular',
+        testEnvironment: 'jsdom',
+        coverageProvider: 'v8',
+        addPlugin: false,
+    });
 }

package/src/migrations/update-20-2-0/add-localize-polyfill-to-targets.js

@@ -33,7 +33,14 @@ async function default_1(tree) {
             for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
                 if (options['localize']) {
                     target.options ??= {};
-                    target.options['polyfills'] ??= [];
+                    const polyfills = target.options['polyfills'];
+                    // Ensure polyfills is an array before pushing
+                    if (typeof polyfills === 'string') {
+                        target.options['polyfills'] = [polyfills];
+                    }
+                    else if (!Array.isArray(polyfills)) {
+                        target.options['polyfills'] = [];
+                    }
                     target.options['polyfills'].push('@angular/localize/init');
                     isUpdated = true;
                     break;

package/src/utils/backward-compatible-versions.d.ts

@@ -4,7 +4,7 @@ type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion
 type CompatPackageVersionNames = LatestPackageVersionNames;
 export type PackageVersionNames = LatestPackageVersionNames | CompatPackageVersionNames;
 export type VersionMap = {
-    angularV17: Record<Exclude<CompatPackageVersionNames, 'analogVitestAngular' | 'typescriptEslintVersion'>, string>;
+    angularV17: Record<Exclude<CompatPackageVersionNames, 'typescriptEslintVersion'>, string>;
     angularV18: Record<CompatPackageVersionNames, string>;
 };
 export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;

package/src/utils/backward-compatible-versions.js

@@ -55,7 +55,6 @@ exports.backwardCompatibleVersions = {
         jestPresetAngularVersion: '~14.1.0',
         typesNodeVersion: '18.16.9',
         jasmineMarblesVersion: '^0.9.2',
-        analogVitestAngular: '~1.9.1',
         jsoncEslintParserVersion: '^2.1.0',
     },
 };

package/src/utils/versions.d.ts

@@ -24,5 +24,4 @@ export declare const tsNodeVersion = "10.9.1";
 export declare const jestPresetAngularVersion = "~14.4.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const jasmineMarblesVersion = "^0.9.2";
-export declare const analogVitestAngular = "~1.10.0";
 export declare const jsoncEslintParserVersion = "^2.1.0";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.analogVitestAngular = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~19.0.0';
 exports.angularDevkitVersion = '~19.0.0';
@@ -27,5 +27,4 @@ exports.tsNodeVersion = '10.9.1';
 exports.jestPresetAngularVersion = '~14.4.0';
 exports.typesNodeVersion = '18.16.9';
 exports.jasmineMarblesVersion = '^0.9.2';
-exports.analogVitestAngular = '~1.10.0';
 exports.jsoncEslintParserVersion = '^2.1.0';