@nx/angular 22.1.0-beta.6 → 22.1.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "22.1.0-beta.6",
+  "version": "22.1.0-beta.8",
   "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": {
@@ -58,14 +58,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.1.0-beta.6",
-    "@nx/eslint": "22.1.0-beta.6",
-    "@nx/js": "22.1.0-beta.6",
-    "@nx/module-federation": "22.1.0-beta.6",
-    "@nx/rspack": "22.1.0-beta.6",
-    "@nx/web": "22.1.0-beta.6",
-    "@nx/webpack": "22.1.0-beta.6",
-    "@nx/workspace": "22.1.0-beta.6",
+    "@nx/devkit": "22.1.0-beta.8",
+    "@nx/eslint": "22.1.0-beta.8",
+    "@nx/js": "22.1.0-beta.8",
+    "@nx/module-federation": "22.1.0-beta.8",
+    "@nx/rspack": "22.1.0-beta.8",
+    "@nx/web": "22.1.0-beta.8",
+    "@nx/webpack": "22.1.0-beta.8",
+    "@nx/workspace": "22.1.0-beta.8",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/generators/component-test/component-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBA2C7B;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAuC7B;AAED,eAAe,sBAAsB,CAAC"}

package/src/generators/component-test/component-test.js

@@ -6,8 +6,6 @@ const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { assertMinimumCypressVersion } = require('@nx/cypress/src/utils/versions');
-    assertMinimumCypressVersion(10);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);
     const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirPath, `${options.componentFileName}.ts`);

package/src/generators/ng-add/migrators/projects/e2e.migrator.d.ts

@@ -8,7 +8,6 @@ export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
     private appConfig;
     private appName;
     private isProjectUsingEsLint;
-    private cypressInstalledVersion;
     private cypressPreset;
     constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, lintTargetName: string | undefined, logger?: Logger);
     migrate(): Promise<void>;
@@ -19,11 +18,10 @@ export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
     private updateOrCreateCypressConfigFile;
     private updateCypressProjectConfiguration;
     private updateE2eCypressTarget;
-    private updateCypressConfigFilePaths;
     private cypressConfigGlobToNewGlob;
     private cypressConfigSrcPathToNewPath;
     private cypressConfigDistPathToNewPath;
-    private updateCypress10ConfigFile;
+    private updateCypressConfigFile;
     private updateCypressComponentConfig;
     private updateCypressE2EConfig;
     private updateCypressConfigNodeValue;

package/src/generators/ng-add/migrators/projects/e2e.migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,IAAI,EACL,MAAM,YAAY,CAAC;AAyBpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,MAAM,EACN,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,KAAK,gBAAgB,GAAG,KAAK,CAAC;AA+B9B,qBAAa,WAAY,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAW9D,OAAO,CAAC,cAAc;IAVxB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAU;IACtC,OAAO,CAAC,uBAAuB,CAAS;IACxC,OAAO,CAAC,aAAa,CAAsB;gBAGzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,6BAA6B,EAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1C,MAAM,CAAC,EAAE,MAAM;IAeF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC9B,QAAQ,IAAI,gBAAgB;IAoGrC,OAAO,CAAC,UAAU;YAyCJ,2BAA2B;YAoD3B,wBAAwB;IAsDtC,OAAO,CAAC,+BAA+B;IAgBvC,OAAO,CAAC,iCAAiC;IAiCzC,OAAO,CAAC,sBAAsB;IAyB9B,OAAO,CAAC,4BAA4B;IAqDpC,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,6BAA6B;IAcrC,OAAO,CAAC,8BAA8B;IAetC,OAAO,CAAC,yBAAyB;IAoDjC,OAAO,CAAC,4BAA4B;IA0BpC,OAAO,CAAC,sBAAsB;IA0I9B,OAAO,CAAC,4BAA4B;IAwCpC,OAAO,CAAC,6CAA6C;IAiDrD,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,2BAA2B;IAcnC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,yBAAyB;IAuBjC,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,sBAAsB;CAM/B"}
+{"version":3,"file":"e2e.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,MAAM,EACN,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,KAAK,gBAAgB,GAAG,KAAK,CAAC;AAwB9B,qBAAa,WAAY,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAU9D,OAAO,CAAC,cAAc;IATxB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAU;IACtC,OAAO,CAAC,aAAa,CAAsB;gBAGzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,6BAA6B,EAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1C,MAAM,CAAC,EAAE,MAAM;IAeF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC9B,QAAQ,IAAI,gBAAgB;IAiGrC,OAAO,CAAC,UAAU;YAqCJ,2BAA2B;YAoD3B,wBAAwB;IAsDtC,OAAO,CAAC,+BAA+B;IAgBvC,OAAO,CAAC,iCAAiC;IAiCzC,OAAO,CAAC,sBAAsB;IAyB9B,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,6BAA6B;IAcrC,OAAO,CAAC,8BAA8B;IAetC,OAAO,CAAC,uBAAuB;IAoD/B,OAAO,CAAC,4BAA4B;IA0BpC,OAAO,CAAC,sBAAsB;IA0I9B,OAAO,CAAC,4BAA4B;IAwCpC,OAAO,CAAC,6CAA6C;IAiDrD,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,2BAA2B;IAcnC,OAAO,CAAC,+BAA+B;IAIvC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,sBAAsB;CAM/B"}

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -19,16 +19,9 @@ const supportedTargets = {
     },
 };
 const cypressConfig = {
-    v9OrLess: {
-        srcPaths: ['supportFile', 'supportFolder', 'fixturesFolder'],
-        distPaths: ['videosFolder', 'screenshotsFolder', 'downloadsFolder'],
-        globPatterns: ['excludeSpecPattern', 'specPattern'],
-    },
-    v10OrMore: {
-        srcPaths: ['supportFile', 'supportFolder', 'fixturesFolder'],
-        distPaths: ['videosFolder', 'screenshotsFolder', 'downloadsFolder'],
-        globPatterns: ['excludeSpecPattern', 'specPattern'],
-    },
+    srcPaths: ['supportFile', 'supportFolder', 'fixturesFolder'],
+    distPaths: ['videosFolder', 'screenshotsFolder', 'downloadsFolder'],
+    globPatterns: ['excludeSpecPattern', 'specPattern'],
 };
 class E2eMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project, lintTargetName, logger) {
@@ -112,9 +105,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (this.isCypressE2eProject()) {
             const configFile = this.projectConfig.targets[this.targetNames.e2e].options?.configFile;
             if (configFile === undefined && !this.getOldCypressConfigFilePath()) {
-                const expectedConfigFile = this.cypressInstalledVersion < 10
-                    ? 'cypress.json'
-                    : 'cypress.config.{ts,js,mjs,cjs}';
+                const expectedConfigFile = 'cypress.config.{ts,js,mjs,cjs}';
                 return [
                     {
                         message: `The "e2e" target is using the "@cypress/schematic:cypress" builder but the "configFile" option is not specified ` +
@@ -173,8 +164,6 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
         else if (this.isCypressE2eProject()) {
             (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            const { getInstalledCypressMajorVersion, } = require('@nx/cypress/src/utils/versions');
-            this.cypressInstalledVersion = getInstalledCypressMajorVersion(this.tree);
             this.project = {
                 ...this.project,
                 name,
@@ -264,7 +253,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             return this.getDefaultCypressConfigFilePath();
         }
         const cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configFile));
-        this.updateCypressConfigFilePaths(configFile);
+        this.updateCypressConfigFile(configFile);
         this.tree.delete(cypressConfigFilePath);
         this.moveFile(configFile, cypressConfigFilePath);
         return cypressConfigFilePath;
@@ -312,44 +301,6 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
         return updatedTarget;
     }
-    updateCypressConfigFilePaths(configFilePath) {
-        if (this.cypressInstalledVersion >= 10) {
-            this.updateCypress10ConfigFile(configFilePath);
-            return;
-        }
-        const srcPaths = [
-            'integrationFolder',
-            'supportFile',
-            'pluginsFile',
-            'fixturesFolder',
-        ];
-        const distPaths = ['videosFolder', 'screenshotsFolder'];
-        const globPatterns = ['ignoreTestFiles', 'testFiles'];
-        const cypressConfig = (0, devkit_1.readJson)(this.tree, configFilePath);
-        cypressConfig.fileServerFolder = '.';
-        srcPaths.forEach((path) => {
-            if (cypressConfig[path]) {
-                cypressConfig[path] = this.cypressConfigSrcPathToNewPath(cypressConfig[path]);
-            }
-        });
-        distPaths.forEach((path) => {
-            if (cypressConfig[path]) {
-                cypressConfig[path] = this.cypressConfigDistPathToNewPath(cypressConfig[path]);
-            }
-        });
-        globPatterns.forEach((stringOrArrayGlob) => {
-            if (!cypressConfig[stringOrArrayGlob]) {
-                return;
-            }
-            if (Array.isArray(cypressConfig[stringOrArrayGlob])) {
-                cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => this.cypressConfigGlobToNewGlob(glob));
-            }
-            else {
-                cypressConfig[stringOrArrayGlob] = this.cypressConfigGlobToNewGlob(cypressConfig[stringOrArrayGlob]);
-            }
-        });
-        (0, devkit_1.writeJson)(this.tree, configFilePath, cypressConfig);
-    }
     cypressConfigGlobToNewGlob(globPattern) {
         return globPattern
             ? globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${(0, path_1.relative)(this.project.oldRoot, this.project.oldSourceRoot)}\\/`), 'src/')
@@ -365,7 +316,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             ? (0, devkit_1.joinPathFragments)('../../dist/cypress/', this.project.newRoot, (0, path_1.relative)(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.oldRoot, path)))
             : undefined;
     }
-    updateCypress10ConfigFile(configFilePath) {
+    updateCypressConfigFile(configFilePath) {
         const { isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
         const { tsquery } = require('@phenomnomnominal/tsquery');
         const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
@@ -455,15 +406,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
                     }
                     return { type: 'replace', value: newValue };
                 };
-                if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.srcPaths)) {
+                if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.srcPaths)) {
                     const newValue = this.cypressConfigSrcPathToNewPath(oldValue);
                     change = createChange(newValue);
                 }
-                else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.distPaths)) {
+                else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.distPaths)) {
                     const newValue = this.cypressConfigDistPathToNewPath(oldValue);
                     change = createChange(newValue);
                 }
-                else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.globPatterns)) {
+                else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.globPatterns)) {
                     const newValue = this.cypressConfigGlobToNewGlob(oldValue);
                     change = createChange(newValue);
                 }
@@ -504,13 +455,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
     updateCypressConfigNodeValue(recorder, node, configCollected) {
         let newValue;
         const oldValue = this.normalizeNodeText(node.initializer.getText());
-        if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.srcPaths)) {
+        if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.srcPaths)) {
             newValue = this.cypressConfigSrcPathToNewPath(oldValue);
         }
-        else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.distPaths)) {
+        else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.distPaths)) {
             newValue = this.cypressConfigDistPathToNewPath(oldValue);
         }
-        else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.globPatterns)) {
+        else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.globPatterns)) {
             newValue = this.cypressConfigGlobToNewGlob(oldValue);
         }
         if (newValue) {
@@ -568,16 +519,9 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         return cypressConfig;
     }
     getDefaultCypressConfigFilePath() {
-        return this.cypressInstalledVersion < 10
-            ? (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json')
-            : (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.config.ts');
+        return (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.config.ts');
     }
     findCypressConfigFilePath(dir) {
-        if (this.cypressInstalledVersion < 10) {
-            return this.tree.exists((0, devkit_1.joinPathFragments)(dir, 'cypress.json'))
-                ? (0, devkit_1.joinPathFragments)(dir, 'cypress.json')
-                : null;
-        }
         // https://docs.cypress.io/guides/references/configuration#Configuration-File
         const possibleFiles = [
             (0, devkit_1.joinPathFragments)(dir, 'cypress.config.ts'),

package/src/generators/utils/add-vitest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,SAAS,CAC7B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
+{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,SAAS,CAC7B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAyBf"}

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

@@ -1,12 +1,46 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVitest = addVitest;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("./version-utils");
 async function addVitest(tree, options) {
-    const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-    await vitestGenerator(tree, {
+    (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+    const { configurationGenerator } = await Promise.resolve().then(() => __importStar(require('@nx/vitest/generators')));
+    await configurationGenerator(tree, {
         project: options.name,
         uiFramework: 'angular',
         testEnvironment: 'jsdom',