@nx/angular 18.1.0-beta.0 → 18.1.0-beta.10

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,
@@ -235,14 +234,18 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             tags: [],
             implicitDependencies: [this.appName],
         });
-        await (0, cypress_1.configurationGenerator)(this.tree, {
+        const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
+        const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false;
+        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,
             // any target would do, we replace it later with the target existing in the project being migrated
             devServerTarget: `${this.appName}:serve`,
             baseUrl: 'http://localhost:4200',
-            addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
+            addPlugin,
         });
         const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
         this.updateCypressProjectConfiguration(cypressConfigFilePath);
@@ -363,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);
@@ -378,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);
             }
         });
@@ -398,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);
             }
         });
@@ -428,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.');
@@ -436,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' };
@@ -515,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;
         }
@@ -523,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/ng-add/utilities/workspace.js

@@ -29,9 +29,7 @@ exports.validateWorkspace = validateWorkspace;
 function createNxJson(tree, options, defaultProject) {
     const targets = getWorkspaceCommonTargets(tree);
     (0, devkit_1.writeJson)(tree, 'nx.json', {
-        affected: {
-            defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
-        },
+        defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
         namedInputs: {
             sharedGlobals: [],
             default: ['{projectRoot}/**/*', 'sharedGlobals'],
@@ -151,7 +149,7 @@ function updatePackageJson(tree) {
 exports.updatePackageJson = updatePackageJson;
 async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
     await (0, eslint_1.lintInitGenerator)(tree, {
-        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
+        addPlugin: false,
     });
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we set it up and use it as-is

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/setup-mf/lib/normalize-options.js

@@ -7,7 +7,7 @@ function normalizeOptions(tree, options) {
         ...options,
         typescriptConfiguration: options.typescriptConfiguration ?? true,
         federationType: options.federationType ?? 'static',
-        prefix: options.prefix ?? (0, project_1.getProjectPrefix)(tree, options.appName),
+        prefix: options.prefix ?? (0, project_1.getProjectPrefix)(tree, options.appName) ?? 'app',
         standalone: options.standalone ?? true,
     };
 }

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/storybook-configuration/lib/generate-storybook-configuration.js

@@ -15,6 +15,8 @@ async function generateStorybookConfiguration(tree, options) {
         interactionTests: options.interactionTests,
         configureStaticServe: options.configureStaticServe,
         skipFormat: true,
+        addPlugin: false,
+        addExplicitTargets: true,
     });
 }
 exports.generateStorybookConfiguration = generateStorybookConfiguration;

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
@@ -22,6 +23,10 @@ async function storybookConfigurationGenerator(tree, options) {
             skipFormat: true,
         });
     }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (project.projectType === 'application') {
+        (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/utils/add-jest.d.ts

@@ -4,6 +4,5 @@ export type AddJestOptions = {
     projectRoot: string;
     skipPackageJson: boolean;
     strict: boolean;
-    addPlugin?: boolean;
 };
 export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

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,14 +9,16 @@ 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,
         skipSerializers: false,
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
-        addPlugin: options.addPlugin,
+        addPlugin: false,
+        addExplicitTargets: true,
     });
     const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
     if (options.strict && tree.exists(setupFile)) {

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/generators/utils/project.d.ts

@@ -1,3 +1,2 @@
 import type { Tree } from '@nx/devkit';
-export declare function normalizeNewProjectPrefix(prefix: string | undefined, npmScope: string | undefined, fallbackPrefix: string): string;
 export declare function getProjectPrefix(tree: Tree, project: string): string | undefined;

package/src/generators/utils/project.js

@@ -1,35 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectPrefix = exports.normalizeNewProjectPrefix = void 0;
+exports.getProjectPrefix = void 0;
 const devkit_1 = require("@nx/devkit");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-function normalizeNewProjectPrefix(prefix, npmScope, fallbackPrefix) {
-    // Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
-    // to it and let it fall through to the Angular schematic to handle it
-    // https://github.com/angular/angular-cli/blob/aa9f0528f174e856a4923cb24861fdf6e6f96b48/packages/schematics/angular/component/index.ts#L64
-    const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
-    if (prefix) {
-        if (!htmlSelectorRegex.test(prefix)) {
-            throw new Error('The provided "prefix" is invalid. The prefix must start with a letter, and must contain only alphanumeric characters or dashes.');
-        }
-        return prefix;
-    }
-    if (npmScope && !htmlSelectorRegex.test(npmScope)) {
-        throw new Error(`The "--prefix" option was not provided, therefore attempted to use the "npmScope" defined in "nx.json" to set the application's selector prefix, but it is invalid.
-
-There are two options that can be followed to resolve this issue:
-  - Pass a valid "--prefix" option.
-  - Update the "npmScope" in "nx.json" (Note: this can be an involved process, as other libraries and applications may need to be updated to match the new scope).
-
-If you encountered this error when creating a new Nx Workspace, the workspace name or "npmScope" is invalid to use as the selector prefix for the application being generated.
-
-Valid selector prefixes must start with a letter, and must contain only alphanumeric characters or dashes.`);
-    }
-    return npmScope || fallbackPrefix;
-}
-exports.normalizeNewProjectPrefix = normalizeNewProjectPrefix;
 function getProjectPrefix(tree, project) {
-    return ((0, devkit_1.readProjectConfiguration)(tree, project)
-        .prefix ?? (0, get_npm_scope_1.getNpmScope)(tree));
+    return (0, devkit_1.readProjectConfiguration)(tree, project).prefix;
 }
 exports.getProjectPrefix = getProjectPrefix;

package/src/generators/utils/selector.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
 import { names } from '@nx/devkit';
-export declare function buildSelector(tree: Tree, name: string, prefix: string | undefined, projectPrefix: string | undefined, casing: keyof Pick<ReturnType<typeof names>, 'fileName' | 'propertyName'>): string;
+export declare function buildSelector(name: string, prefix: string | undefined, projectPrefix: string | undefined, casing: keyof Pick<ReturnType<typeof names>, 'fileName' | 'propertyName'>): string;
+export declare function validateHtmlSelector(selector: string): void;

package/src/generators/utils/selector.js

@@ -1,14 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSelector = void 0;
+exports.validateHtmlSelector = exports.buildSelector = void 0;
 const devkit_1 = require("@nx/devkit");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-function buildSelector(tree, name, prefix, projectPrefix, casing) {
+function buildSelector(name, prefix, projectPrefix, casing) {
     let selector = name;
-    prefix ??= projectPrefix ?? (0, get_npm_scope_1.getNpmScope)(tree);
+    prefix ??= projectPrefix;
     if (prefix) {
         selector = `${prefix}-${selector}`;
     }
     return (0, devkit_1.names)(selector)[casing];
 }
 exports.buildSelector = buildSelector;
+// https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/validation.ts#L11-L14
+const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
+function validateHtmlSelector(selector) {
+    if (selector && !htmlSelectorRegex.test(selector)) {
+        throw new Error(`The selector "${selector}" is invalid.`);
+    }
+}
+exports.validateHtmlSelector = validateHtmlSelector;

package/src/generators/utils/update-app-editor-tsconfig-excluded-files.d.ts

@@ -0,0 +1,2 @@
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+export declare function updateAppEditorTsConfigExcludedFiles(tree: Tree, projectConfig: ProjectConfiguration): void;

package/src/generators/utils/update-app-editor-tsconfig-excluded-files.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateAppEditorTsConfigExcludedFiles = void 0;
+const devkit_1 = require("@nx/devkit");
+function updateAppEditorTsConfigExcludedFiles(tree, projectConfig) {
+    if (projectConfig.projectType !== 'application') {
+        return;
+    }
+    const editorTsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.editor.json');
+    const appTsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json');
+    if (!tree.exists(editorTsConfigPath) || !tree.exists(appTsConfigPath)) {
+        return;
+    }
+    const appTsConfig = (0, devkit_1.readJson)(tree, appTsConfigPath);
+    (0, devkit_1.updateJson)(tree, editorTsConfigPath, (json) => {
+        const exclude = [...(json.exclude ?? []), ...(appTsConfig.exclude ?? [])];
+        if (exclude.length) {
+            json.exclude = Array.from(new Set(exclude));
+        }
+        return json;
+    });
+}
+exports.updateAppEditorTsConfigExcludedFiles = updateAppEditorTsConfigExcludedFiles;

package/src/generators/utils/update-project-root-tsconfig.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export { extractTsConfigBase } from '@nx/js';
+export declare function updateProjectRootTsConfig(host: Tree, projectRoot: string, relativePathToRootTsConfig: string, isRootProject?: boolean): void;

package/src/generators/utils/update-project-root-tsconfig.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateProjectRootTsConfig = exports.extractTsConfigBase = void 0;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+var js_2 = require("@nx/js");
+Object.defineProperty(exports, "extractTsConfigBase", { enumerable: true, get: function () { return js_2.extractTsConfigBase; } });
+function updateProjectRootTsConfig(host, projectRoot, relativePathToRootTsConfig, isRootProject) {
+    (0, devkit_1.updateJson)(host, `${projectRoot}/tsconfig.json`, (json) => {
+        if (isRootProject) {
+            // inline tsconfig.base.json into the project
+            json.compileOnSave = false;
+            json.compilerOptions = {
+                ...js_1.tsConfigBaseOptions,
+                ...json.compilerOptions,
+            };
+            json.exclude = ['node_modules', 'tmp'];
+            delete json.extends;
+        }
+        else {
+            json.extends = relativePathToRootTsConfig;
+        }
+        return json;
+    });
+}
+exports.updateProjectRootTsConfig = updateProjectRootTsConfig;

package/src/migrations/update-18-1-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~17.2.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-18-1-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~17.2.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+exports.default = default_1;

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 ?? {}),

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~17.1.0";
-export declare const angularDevkitVersion = "~17.1.0";
-export declare const ngPackagrVersion = "~17.1.0";
+export declare const angularVersion = "~17.2.0";
+export declare const angularDevkitVersion = "~17.2.0";
+export declare const ngPackagrVersion = "~17.2.0";
 export declare const ngrxVersion = "~17.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.14.3";
@@ -19,7 +19,7 @@ export declare const postcssVersion = "^8.4.5";
 export declare const postcssUrlVersion = "~10.1.3";
 export declare const autoprefixerVersion = "^10.4.0";
 export declare const tsNodeVersion = "10.9.1";
-export declare const jestPresetAngularVersion = "~13.1.4";
+export declare const jestPresetAngularVersion = "~14.0.3";
 export declare const typesNodeVersion = "18.16.9";
 export declare const jasmineMarblesVersion = "^0.9.2";
 export declare const jsoncEslintParserVersion = "^2.1.0";

package/src/utils/versions.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = 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 = '~17.1.0';
-exports.angularDevkitVersion = '~17.1.0';
-exports.ngPackagrVersion = '~17.1.0';
+exports.angularVersion = '~17.2.0';
+exports.angularDevkitVersion = '~17.2.0';
+exports.ngPackagrVersion = '~17.2.0';
 exports.ngrxVersion = '~17.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.14.3';
@@ -22,7 +22,7 @@ exports.postcssVersion = '^8.4.5';
 exports.postcssUrlVersion = '~10.1.3';
 exports.autoprefixerVersion = '^10.4.0';
 exports.tsNodeVersion = '10.9.1';
-exports.jestPresetAngularVersion = '~13.1.4';
+exports.jestPresetAngularVersion = '~14.0.3';
 exports.typesNodeVersion = '18.16.9';
 exports.jasmineMarblesVersion = '^0.9.2';
 exports.jsoncEslintParserVersion = '^2.1.0';

package/src/generators/utils/create-ts-config.d.ts

@@ -1,9 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export { extractTsConfigBase } from '@nx/js';
-export declare function createTsConfig(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
-    strict?: boolean;
-    style?: string;
-    bundler?: string;
-    rootProject?: boolean;
-    esModuleInterop?: boolean;
-}, relativePathToRootTsConfig: string): void;