@nx/angular 18.1.0 → 18.2.0-canary.20240316-b69047e

package/migrations.json

@@ -371,6 +371,12 @@
       },
       "description": "Update the @angular/cli package version to ~17.2.0.",
       "factory": "./src/migrations/update-18-1-0/update-angular-cli"
+    },
+    "fix-target-defaults-for-webpack-browser": {
+      "cli": "nx",
+      "version": "18.1.1-beta.0",
+      "description": "Ensure targetDefaults inputs for task hashing when '@nx/angular:webpack-browser' is used are correct for Module Federation.",
+      "factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.1.0",
+  "version": "18.2.0-canary.20240316-b69047e",
   "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, 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": {
@@ -78,24 +78,22 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.1.0",
-    "@nx/cypress": "18.1.0",
-    "@nx/jest": "18.1.0",
-    "@nx/js": "18.1.0",
-    "@nx/eslint": "18.1.0",
-    "@nx/webpack": "18.1.0",
-    "@nx/web": "18.1.0",
-    "@nx/workspace": "18.1.0",
+    "@nx/devkit": "18.2.0-canary.20240316-b69047e",
+    "@nx/js": "18.2.0-canary.20240316-b69047e",
+    "@nx/eslint": "18.2.0-canary.20240316-b69047e",
+    "@nx/webpack": "18.2.0-canary.20240316-b69047e",
+    "@nx/web": "18.2.0-canary.20240316-b69047e",
+    "@nx/workspace": "18.2.0-canary.20240316-b69047e",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "18.1.0"
+    "@nrwl/angular": "18.2.0-canary.20240316-b69047e"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",
+    "@angular-devkit/core": ">= 15.0.0 < 18.0.0",
     "@angular-devkit/schematics": ">= 15.0.0 < 18.0.0",
     "@schematics/angular": ">= 15.0.0 < 18.0.0",
-    "@angular-devkit/core": ">= 15.0.0 < 18.0.0",
-    "rxjs": "^6.5.3 || ^7.5.0",
-    "esbuild": "^0.19.2"
+    "esbuild": "^0.19.2",
+    "rxjs": "^6.5.3 || ^7.5.0"
   },
   "peerDependenciesMeta": {
     "esbuild": {

package/src/generators/add-linting/add-linting.d.ts

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { AddLintingGeneratorSchema } from './schema';
 export declare function addLintingGenerator(tree: Tree, options: AddLintingGeneratorSchema): Promise<GeneratorCallback>;
 export default addLintingGenerator;

package/src/generators/add-linting/add-linting.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
-const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
+const eslint_1 = require("@nx/eslint");
 const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
+const buildable_project_1 = require("./lib/buildable-project");
 async function addLintingGenerator(tree, options) {
     const tasks = [];
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
@@ -73,7 +74,7 @@ async function addLintingGenerator(tree, options) {
                  */
                 rules: {},
             },
-            ...(isBuildableLibraryProject(tree, options.projectName)
+            ...((0, buildable_project_1.isBuildableLibraryProject)(tree, options.projectName)
                 ? [
                     {
                         files: ['*.json'],
@@ -87,7 +88,7 @@ async function addLintingGenerator(tree, options) {
         ]);
     }
     if (!options.skipPackageJson) {
-        const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
+        const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree, options.projectName);
         tasks.push(installTask);
     }
     if (!options.skipFormat) {
@@ -96,10 +97,4 @@ async function addLintingGenerator(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.addLintingGenerator = addLintingGenerator;
-function isBuildableLibraryProject(tree, projectName) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    return (projectConfig.projectType === 'library' &&
-        projectConfig.targets?.build &&
-        !!projectConfig.targets.build);
-}
 exports.default = addLintingGenerator;

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts

@@ -1,2 +1,2 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
-export declare function addAngularEsLintDependencies(tree: Tree): GeneratorCallback;
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export declare function addAngularEsLintDependencies(tree: Tree, projectName: string): GeneratorCallback;

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -3,14 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../utils/version-utils");
-function addAngularEsLintDependencies(tree) {
+const buildable_project_1 = require("./buildable-project");
+function addAngularEsLintDependencies(tree, projectName) {
     const angularEslintVersionToInstall = (0, version_utils_1.versions)(tree).angularEslintVersion;
-    const jsoncEslintParserVersionToInstall = (0, version_utils_1.versions)(tree).jsoncEslintParserVersion;
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+    const devDependencies = {
         '@angular-eslint/eslint-plugin': angularEslintVersionToInstall,
         '@angular-eslint/eslint-plugin-template': angularEslintVersionToInstall,
         '@angular-eslint/template-parser': angularEslintVersionToInstall,
-        'jsonc-eslint-parser': jsoncEslintParserVersionToInstall,
-    });
+    };
+    if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {
+        const jsoncEslintParserVersionToInstall = (0, version_utils_1.versions)(tree).jsoncEslintParserVersion;
+        devDependencies['jsonc-eslint-parser'] = jsoncEslintParserVersionToInstall;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
 }
 exports.addAngularEsLintDependencies = addAngularEsLintDependencies;

package/src/generators/add-linting/lib/buildable-project.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function isBuildableLibraryProject(tree: Tree, projectName: string): boolean;

package/src/generators/add-linting/lib/buildable-project.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBuildableLibraryProject = void 0;
+const devkit_1 = require("@nx/devkit");
+function isBuildableLibraryProject(tree, projectName) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    return (projectConfig.projectType === 'library' && !!projectConfig.targets?.build);
+}
+exports.isBuildableLibraryProject = isBuildableLibraryProject;

package/src/generators/application/lib/add-e2e.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
-const cypress_1 = require("@nx/cypress");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
@@ -11,6 +10,7 @@ async function addE2e(tree, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     if (options.e2eTestRunner === 'cypress') {
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         // TODO: This can call `@nx/web:static-config` generator when ready
         addFileServerTarget(tree, options, 'serve-static');
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -21,7 +21,7 @@ async function addE2e(tree, options) {
             tags: [],
             implicitDependencies: [options.name],
         });
-        await (0, cypress_1.configurationGenerator)(tree, {
+        await configurationGenerator(tree, {
             project: options.e2eProjectName,
             directory: 'src',
             linter: options.linter,
@@ -34,7 +34,7 @@ async function addE2e(tree, options) {
         });
     }
     else if (options.e2eTestRunner === 'playwright') {
-        const { configurationGenerator: playwrightConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
             projectType: 'application',
             root: options.e2eProjectRoot,
@@ -42,7 +42,7 @@ async function addE2e(tree, options) {
             targets: {},
             implicitDependencies: [options.name],
         });
-        await playwrightConfigurationGenerator(tree, {
+        await configurationGenerator(tree, {
             project: options.e2eProjectName,
             skipFormat: true,
             skipPackageJson: options.skipPackageJson,

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = void 0;
-const cypress_version_1 = require("@nx/cypress/src/utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 async function componentTestGenerator(tree, options) {
-    (0, cypress_version_1.assertMinimumCypressVersion)(10);
+    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/cypress-version'));
+    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/cypress-component-configuration/cypress-component-configuration.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfigurationInternal = exports.cypressComponentConfiguration = void 0;
-const cypress_1 = require("@nx/cypress");
-const config_1 = require("@nx/cypress/src/utils/config");
-const find_target_options_1 = require("@nx/cypress/src/utils/find-target-options");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 const component_test_1 = require("../component-test/component-test");
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
@@ -23,7 +21,8 @@ exports.cypressComponentConfiguration = cypressComponentConfiguration;
  */
 async function cypressComponentConfigurationInternal(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const installTask = await (0, cypress_1.componentConfigurationGenerator)(tree, {
+    const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const installTask = await baseCyCTConfig(tree, {
         project: options.project,
         skipFormat: true,
         addPlugin: false,
@@ -42,7 +41,8 @@ async function cypressComponentConfigurationInternal(tree, options) {
 exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 async function addFiles(tree, projectConfig, options) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-    const updatedCmpContents = await (0, config_1.addMountDefinition)(tree.read(componentFile, 'utf-8'));
+    const { addMountDefinition } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
     tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
     if (options.generateTests) {
         const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.project);
@@ -69,7 +69,8 @@ async function addFiles(tree, projectConfig, options) {
 async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     if (!options.buildTarget) {
-        found = await (0, find_target_options_1.findBuildConfig)(tree, {
+        const { findBuildConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
+        found = await findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
             validExecutorNames: new Set([
@@ -94,8 +95,9 @@ async function configureCypressCT(tree, options) {
     else {
         ctConfigOptions.buildTarget = found.target;
     }
-    const cypressConfigPath = (0, config_1.getProjectCypressConfigPath)(tree, projectConfig.root);
-    const updatedCyConfig = await (0, config_1.addDefaultCTConfig)(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
+    const { addDefaultCTConfig, getProjectCypressConfigPath } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
     tree.write(cypressConfigPath, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
 }
 function assertValidConfig(config) {

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

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eMigrator = void 0;
-const cypress_1 = require("@nx/cypress");
-const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const cypress_version_1 = require("@nx/cypress/src/utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
-const typescript_1 = require("typescript");
 const file_change_recorder_1 = require("../../../../utils/file-change-recorder");
+const versions_1 = require("../../../../utils/versions");
 const project_migrator_1 = require("./project.migrator");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const supportedTargets = {
     e2e: {
         acceptMultipleDefinitions: true,
@@ -175,7 +172,9 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             };
         }
         else if (this.isCypressE2eProject()) {
-            this.cypressInstalledVersion = (0, cypress_version_1.installedCypressVersion)();
+            (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            const { installedCypressVersion, } = require('@nx/cypress/src/utils/cypress-version');
+            this.cypressInstalledVersion = installedCypressVersion();
             this.project = {
                 ...this.project,
                 name,
@@ -238,7 +237,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
         const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false;
-        await (0, cypress_1.configurationGenerator)(this.tree, {
+        const { configurationGenerator } = await Promise.resolve().then(() => require('@nx/cypress'));
+        await configurationGenerator(this.tree, {
             project: this.project.name,
             linter: this.isProjectUsingEsLint ? eslint_1.Linter.EsLint : eslint_1.Linter.None,
             skipFormat: true,
@@ -366,9 +366,10 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             : undefined;
     }
     updateCypress10ConfigFile(configFilePath) {
-        (0, ensure_typescript_1.ensureTypescript)();
+        const { isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
         const { tsquery } = require('@phenomnomnominal/tsquery');
-        this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(configFilePath);
+        const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
+        this.cypressPreset = nxE2EPreset(configFilePath);
         const fileContent = this.tree.read(configFilePath, 'utf-8');
         let sourceFile = tsquery.ast(fileContent);
         const recorder = new file_change_recorder_1.FileChangeRecorder(this.tree, configFilePath);
@@ -381,15 +382,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         let componentNode;
         const globalConfig = {};
         defineConfigExpression.forEachChild((node) => {
-            if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'component') {
+            if (isPropertyAssignment(node) && node.name.getText() === 'component') {
                 componentNode = node;
                 return;
             }
-            if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'e2e') {
+            if (isPropertyAssignment(node) && node.name.getText() === 'e2e') {
                 e2eNode = node;
                 return;
             }
-            if ((0, typescript_1.isPropertyAssignment)(node)) {
+            if (isPropertyAssignment(node)) {
                 this.updateCypressConfigNodeValue(recorder, node, globalConfig);
             }
         });
@@ -401,14 +402,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!componentNode) {
             return;
         }
-        if (!(0, typescript_1.isObjectLiteralExpression)(componentNode.initializer)) {
+        const { isObjectLiteralExpression, isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+        if (!isObjectLiteralExpression(componentNode.initializer)) {
             this.logger.warn('The automatic migration only supports having an object literal in the "component" option of the Cypress configuration. ' +
                 `The configuration won't be updated. Please make sure to update any paths you may have in the "component" option ` +
                 'manually to point to the new location.');
             return;
         }
         componentNode.initializer.properties.forEach((node) => {
-            if ((0, typescript_1.isPropertyAssignment)(node)) {
+            if (isPropertyAssignment(node)) {
                 this.updateCypressConfigNodeValue(recorder, node);
             }
         });
@@ -431,7 +433,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             recorder.insertRight(defineConfigNode.getStart() + 1, e2eAssignment);
         }
         else {
-            if (!(0, typescript_1.isObjectLiteralExpression)(e2eNode.initializer)) {
+            const { isObjectLiteralExpression, isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+            if (!isObjectLiteralExpression(e2eNode.initializer)) {
                 this.logger.warn('The automatic migration only supports having an object literal in the "e2e" option of the Cypress configuration. ' +
                     `The configuration won't be updated. Please make sure to update any paths you might have in the "e2e" option ` +
                     'manually to point to the new location.');
@@ -439,7 +442,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             }
             recorder.insertRight(e2eNode.initializer.getStart() + 1, presetSpreadAssignment);
             e2eNode.initializer.properties.forEach((node) => {
-                if (!(0, typescript_1.isPropertyAssignment)(node)) {
+                if (!isPropertyAssignment(node)) {
                     return;
                 }
                 let change = { type: 'ignore' };
@@ -518,7 +521,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
     }
     isValidPathLikePropertyWithStringLiteralValue(node, properties) {
-        if (!(0, typescript_1.isPropertyAssignment)(node)) {
+        const { isPropertyAssignment, isStringLiteralLike, isTemplateExpression, SyntaxKind, } = (0, ensure_typescript_1.ensureTypescript)();
+        if (!isPropertyAssignment(node)) {
             // TODO(leo): handle more scenarios (spread assignments, etc)
             return false;
         }
@@ -526,13 +530,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!property) {
             return false;
         }
-        if (node.initializer.kind === typescript_1.SyntaxKind.UndefinedKeyword ||
-            node.initializer.kind === typescript_1.SyntaxKind.NullKeyword ||
-            node.initializer.kind === typescript_1.SyntaxKind.FalseKeyword) {
+        if (node.initializer.kind === SyntaxKind.UndefinedKeyword ||
+            node.initializer.kind === SyntaxKind.NullKeyword ||
+            node.initializer.kind === SyntaxKind.FalseKeyword) {
             return false;
         }
-        if (!(0, typescript_1.isStringLiteralLike)(node.initializer)) {
-            if ((0, typescript_1.isTemplateExpression)(node.initializer)) {
+        if (!isStringLiteralLike(node.initializer)) {
+            if (isTemplateExpression(node.initializer)) {
                 this.logger.warn(`The "${node.name.getText()}" in the Cypress configuration file is set to a template expression ("${node.initializer.getText()}"). ` +
                     `This is not supported by the automatic migration and its value won't be automatically migrated. ` +
                     `Please make sure to update its value to match the new location if needed.`);

package/src/generators/setup-mf/lib/add-cypress-workaround.js

@@ -4,7 +4,6 @@
 // is attached to the index.html with type=module
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCypressOnErrorWorkaround = void 0;
-const config_1 = require("@nx/cypress/src/utils/config");
 const devkit_1 = require("@nx/devkit");
 function addCypressOnErrorWorkaround(tree, schema) {
     if (!schema.e2eProjectName) {
@@ -23,11 +22,20 @@ function addCypressOnErrorWorkaround(tree, schema) {
     `);
         return;
     }
-    if (e2eProject.targets?.e2e?.executor !== '@nx/cypress:cypress' &&
-        !(0, devkit_1.glob)(tree, [`${e2eProject.root}/${config_1.CYPRESS_CONFIG_FILE_NAME_PATTERN}`])
-            .length) {
-        // Not a cypress e2e project, skip
-        return;
+    if (e2eProject.targets?.e2e?.executor !== '@nx/cypress:cypress') {
+        try {
+            // don't ensure package is installed, if it's not installed, we don't need to add the workaround
+            const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/src/utils/config');
+            if (!(0, devkit_1.glob)(tree, [`${e2eProject.root}/${CYPRESS_CONFIG_FILE_NAME_PATTERN}`])
+                .length) {
+                // Not a cypress e2e project, skip
+                return;
+            }
+        }
+        catch {
+            // assume cypress is not installed
+            return;
+        }
     }
     const commandToAdd = `Cypress.on('uncaught:exception', err => {
     if (err.message.includes(\`Cannot use 'import.meta' outside a module\`)) {

package/src/generators/storybook-configuration/lib/generate-stories.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStories = void 0;
-const project_name_1 = require("@nx/cypress/src/utils/project-name");
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
 const stories_1 = require("../../stories/stories");
 async function generateStories(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.project, project.root, options.cypressDirectory);
+    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
+    const e2eProjectName = getE2eProjectName(options.project, project.root, options.cypressDirectory);
     await (0, stories_1.angularStoriesGenerator)(tree, {
         name: options.project,
         generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
 const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("./version-utils");
 async function addJest(tree, options) {
@@ -10,7 +9,8 @@ async function addJest(tree, options) {
         process.env.npm_config_legacy_peer_deps ??= 'true';
         (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, { 'jest-preset-angular': versions_1.jestPresetAngularVersion });
     }
-    await (0, jest_1.configurationGenerator)(tree, {
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+    await configurationGenerator(tree, {
         project: options.name,
         setupFile: 'angular',
         supportTsx: false,

package/src/generators/utils/add-mf-env-to-inputs.js

@@ -8,7 +8,10 @@ function addMfEnvToTargetDefaultInputs(tree) {
     const mfEnvVar = 'NX_MF_DEV_SERVER_STATIC_REMOTES';
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults[webpackExecutor] ??= {};
-    nxJson.targetDefaults[webpackExecutor].inputs ??= [];
+    nxJson.targetDefaults[webpackExecutor].inputs ??= [
+        'production',
+        '^production',
+    ];
     let mfEnvVarExists = false;
     for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {

package/src/migrations/update-18-1-1/fix-target-defaults-inputs.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-18-1-1/fix-target-defaults-inputs.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+async function default_1(tree) {
+    if (!isWebpackBrowserUsed(tree)) {
+        return;
+    }
+    ensureTargetDefaultsContainProductionInputs(tree);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;
+function ensureTargetDefaultsContainProductionInputs(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const webpackExecutor = '@nx/angular:webpack-browser';
+    const mfEnvVar = 'NX_MF_DEV_SERVER_STATIC_REMOTES';
+    nxJson.targetDefaults[webpackExecutor] ??= {};
+    nxJson.targetDefaults[webpackExecutor].inputs ??= [
+        'production',
+        '^production',
+        { env: mfEnvVar },
+    ];
+    if (!nxJson.targetDefaults[webpackExecutor].inputs.includes('production')) {
+        nxJson.targetDefaults[webpackExecutor].inputs.push('production');
+    }
+    if (!nxJson.targetDefaults[webpackExecutor].inputs.includes('^production')) {
+        nxJson.targetDefaults[webpackExecutor].inputs.push('^production');
+    }
+    let mfEnvVarExists = false;
+    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
+        if (typeof input === 'object' && input['env'] === mfEnvVar) {
+            mfEnvVarExists = true;
+            break;
+        }
+    }
+    if (!mfEnvVarExists) {
+        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+function isWebpackBrowserUsed(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const project of projects.values()) {
+        const targets = project.targets || {};
+        for (const [_, target] of Object.entries(targets)) {
+            if (target.executor === '@nx/angular:webpack-browser' &&
+                (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||
+                    tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js')))) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

package/src/utils/mf/with-module-federation-ssr.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = void 0;
 const utils_1 = require("./utils");
 async function withModuleFederationForSSR(options) {
+    if (global.NX_GRAPH_CREATION) {
+        return (config) => config;
+    }
     const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
         isServer: true,
     });

package/src/utils/mf/with-module-federation.js

@@ -4,6 +4,9 @@ exports.withModuleFederation = void 0;
 const utils_1 = require("./utils");
 const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
 async function withModuleFederation(options) {
+    if (global.NX_GRAPH_CREATION) {
+        return (config) => config;
+    }
     const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
     return (config) => ({
         ...(config ?? {}),