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

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": {
@@ -1641,7 +1647,7 @@
       }
     },
     "18.1.0-jest": {
-      "version": "18.1.0-beta.1",
+      "version": "18.1.0-beta.2",
       "requires": {
         "@angular-devkit/build-angular": ">=15.0.0 <18.0.0",
         "@angular/compiler-cli": ">=15.0.0 <18.0.0",
@@ -1651,13 +1657,17 @@
       },
       "packages": {
         "jest-preset-angular": {
-          "version": "~14.0.2",
+          "version": "~14.0.3",
           "alwaysAddToPackageJson": false
         }
       }
     },
     "18.1.0": {
       "version": "18.1.0-beta.1",
+      "x-prompt": "Do you want to update the Angular version to v17.2?",
+      "requires": {
+        "@angular/core": ">=17.1.0 <17.2.0"
+      },
       "packages": {
         "@angular-devkit/build-angular": {
           "version": "~17.2.0",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nx/angular",
-  "version": "18.1.0-beta.1",
+  "version": "18.1.0-beta.10",
   "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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
+  "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": {
     "type": "git",
     "url": "https://github.com/nrwl/nx.git",
@@ -78,24 +78,22 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.1.0-beta.1",
-    "@nx/cypress": "18.1.0-beta.1",
-    "@nx/jest": "18.1.0-beta.1",
-    "@nx/js": "18.1.0-beta.1",
-    "@nx/eslint": "18.1.0-beta.1",
-    "@nx/webpack": "18.1.0-beta.1",
-    "@nx/web": "18.1.0-beta.1",
-    "@nx/workspace": "18.1.0-beta.1",
+    "@nx/devkit": "18.1.0-beta.10",
+    "@nx/js": "18.1.0-beta.10",
+    "@nx/eslint": "18.1.0-beta.10",
+    "@nx/webpack": "18.1.0-beta.10",
+    "@nx/web": "18.1.0-beta.10",
+    "@nx/workspace": "18.1.0-beta.10",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "18.1.0-beta.1"
+    "@nrwl/angular": "18.1.0-beta.10"
   },
   "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/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -101,8 +101,10 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             devkit_1.logger.info(`NX All remotes started, server ready at http://localhost:${options.port}`);
             next({ success: true, baseUrl: `http://localhost:${options.port}` });
         }
-        catch {
-            throw new Error(`Timed out waiting for remote to start. Check above for any errors.`);
+        catch (err) {
+            throw new Error(`Failed to start remotes. Check above for any errors.`, {
+                cause: err,
+            });
         }
         finally {
             done();

package/src/executors/module-federation-dev-server/schema.json

@@ -122,7 +122,7 @@
       "items": {
         "type": "string"
       },
-      "description": "List of remote applications to not automatically serve, either statically or in development mode."
+      "description": "List of remote applications to not automatically serve, either statically or in development mode. This will not remove the remotes from the `module-federation.config` file, and therefore the application may still try to fetch these remotes.\nThis option is useful for when the `host` application is using a `remote` that does not live in the same workspace as the `host`."
     },
     "pathToManifestFile": {
       "type": "string",

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/files/base/tsconfig.json__tpl__

@@ -7,6 +7,9 @@
   "files": [],
   "include": [],
   "references": [
+    {
+      "path": "./tsconfig.editor.json"
+    },
     {
       "path": "./tsconfig.app.json"
     }

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

@@ -1,14 +1,16 @@
 "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");
 async function addE2e(tree, options) {
     // since e2e are separate projects, default to adding plugins
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    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, {
@@ -19,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,
@@ -32,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,
@@ -40,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/application/lib/create-files.js

@@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const create_ts_config_1 = require("../../utils/create-ts-config");
+const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
+const selector_1 = require("../../utils/selector");
 async function createFiles(tree, options, rootOffset) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const isUsingApplicationBuilder = angularMajorVersion >= 17 && options.bundler === 'esbuild';
+    const rootSelector = `${options.prefix}-root`;
+    (0, selector_1.validateHtmlSelector)(rootSelector);
+    const nxWelcomeSelector = `${options.prefix}-nx-welcome`;
+    (0, selector_1.validateHtmlSelector)(nxWelcomeSelector);
     const substitutions = {
-        rootSelector: `${options.prefix}-root`,
+        rootSelector,
         appName: options.name,
         inlineStyle: options.inlineStyle,
         inlineTemplate: options.inlineTemplate,
@@ -19,7 +24,7 @@ async function createFiles(tree, options, rootOffset) {
         unitTesting: options.unitTestRunner !== test_runners_1.UnitTestRunner.None,
         routing: options.routing,
         minimal: options.minimal,
-        nxWelcomeSelector: `${options.prefix}-nx-welcome`,
+        nxWelcomeSelector,
         rootTsConfig: (0, devkit_1.joinPathFragments)(rootOffset, (0, js_1.getRootTsConfigFileName)(tree)),
         angularMajorVersion,
         rootOffset,
@@ -33,13 +38,7 @@ async function createFiles(tree, options, rootOffset) {
     else {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
     }
-    (0, create_ts_config_1.createTsConfig)(tree, options.appProjectRoot, 'app', {
-        bundler: options.bundler,
-        rootProject: options.rootProject,
-        strict: options.strict,
-        style: options.style,
-        esModuleInterop: isUsingApplicationBuilder,
-    }, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
+    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(tree, options.appProjectRoot, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot), options.rootProject);
     if (!options.routing) {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.routes.ts'));
     }

package/src/generators/application/lib/normalize-options.js

@@ -4,9 +4,7 @@ exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const test_runners_1 = require("../../../utils/test-runners");
-const project_1 = require("../../utils/project");
 const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(host, options) {
     const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -24,7 +22,6 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, (0, get_npm_scope_1.getNpmScope)(host), 'app');
     let bundler = options.bundler;
     if (!bundler) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
@@ -44,7 +41,7 @@ async function normalizeOptions(host, options) {
         strict: true,
         standalone: true,
         ...options,
-        prefix,
+        prefix: options.prefix || 'app',
         name: appProjectName,
         appProjectRoot,
         appProjectSourceRoot: `${appProjectRoot}/src`,

package/src/generators/application/lib/update-editor-tsconfig.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
 export declare function updateEditorTsConfig(tree: Tree, options: NormalizedSchema): void;

package/src/generators/application/lib/update-editor-tsconfig.js

@@ -2,24 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateEditorTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
 function getCompilerOptionsTypes(tsConfig) {
     return tsConfig?.compilerOptions?.types ?? [];
 }
 function updateEditorTsConfig(tree, options) {
-    const types = getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json')));
-    if (options.unitTestRunner !== 'none') {
-        types.push(...getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'))));
-    }
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
-        json.compilerOptions.types = types;
-        return json;
-    });
-    // This should be the last tsconfig references so it's not in the template
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
-        json.references.push({
-            path: './tsconfig.editor.json',
+    const appTsConfig = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'));
+    const types = getCompilerOptionsTypes(appTsConfig);
+    if (types?.length) {
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
+            json.compilerOptions ??= {};
+            json.compilerOptions.types = Array.from(new Set(types));
+            return json;
         });
-        return json;
-    });
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
 }
 exports.updateEditorTsConfig = updateEditorTsConfig;

package/src/generators/application/schema.json

@@ -81,6 +81,7 @@
       "type": "string",
       "format": "html-selector",
       "description": "The prefix to apply to generated selectors.",
+      "default": "app",
       "alias": "p"
     },
     "skipTests": {

package/src/generators/component/lib/normalize-options.js

@@ -20,8 +20,8 @@ async function normalizeOptions(tree, options) {
     const { className: suffixClassName } = (0, devkit_1.names)(options.type);
     const symbolName = `${className}${suffixClassName}`;
     const { prefix, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const selector = options.selector ??
-        (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'fileName');
+    const selector = options.selector ?? (0, selector_1.buildSelector)(name, options.prefix, prefix, 'fileName');
+    (0, selector_1.validateHtmlSelector)(selector);
     return {
         ...options,
         name,

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,15 +1,14 @@
 "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");
 const module_info_1 = require("../utils/storybook-ast/module-info");
+const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
 function cypressComponentConfiguration(tree, options) {
     return cypressComponentConfigurationInternal(tree, {
         ...options,
@@ -22,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,
@@ -30,6 +30,9 @@ async function cypressComponentConfigurationInternal(tree, options) {
     });
     await configureCypressCT(tree, options);
     await addFiles(tree, projectConfig, options);
+    if (projectConfig.projectType === 'application') {
+        (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, projectConfig);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -38,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);
@@ -65,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([
@@ -90,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/directive/lib/normalize-options.js

@@ -20,7 +20,8 @@ async function normalizeOptions(tree, options) {
     const symbolName = `${className}${suffixClassName}`;
     const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const selector = options.selector ??
-        (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'propertyName');
+        (0, selector_1.buildSelector)(name, options.prefix, prefix, 'propertyName');
+    (0, selector_1.validateHtmlSelector)(selector);
     return {
         ...options,
         projectName,

package/src/generators/library/lib/add-project.js

@@ -4,10 +4,6 @@ exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function addProject(tree, libraryOptions) {
-    const executor = libraryOptions.publishable
-        ? '@nx/angular:package'
-        : '@nx/angular:ng-packagr-lite';
-    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -15,27 +11,30 @@ function addProject(tree, libraryOptions) {
         prefix: libraryOptions.prefix,
         tags: libraryOptions.parsedTags,
         projectType: 'library',
-        targets: {
-            build: libraryOptions.buildable || libraryOptions.publishable
-                ? {
-                    executor,
-                    outputs: ['{workspaceRoot}/dist/{projectRoot}'],
-                    options: {
-                        project: `${libraryOptions.projectRoot}/ng-package.json`,
-                    },
-                    configurations: {
-                        production: {
-                            tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.prod.json`,
-                        },
-                        development: {
-                            tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.json`,
-                        },
-                    },
-                    defaultConfiguration: 'production',
-                }
-                : undefined,
-        },
+        targets: {},
     };
+    if (libraryOptions.buildable || libraryOptions.publishable) {
+        const executor = libraryOptions.publishable
+            ? '@nx/angular:package'
+            : '@nx/angular:ng-packagr-lite';
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
+        project.targets.build = {
+            executor,
+            outputs: ['{workspaceRoot}/dist/{projectRoot}'],
+            options: {
+                project: `${libraryOptions.projectRoot}/ng-package.json`,
+            },
+            configurations: {
+                production: {
+                    tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.prod.json`,
+                },
+                development: {
+                    tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.json`,
+                },
+            },
+            defaultConfiguration: 'production',
+        };
+    }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;
 }

package/src/generators/library/lib/normalize-options.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
-const project_1 = require("../../utils/project");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
@@ -40,14 +38,12 @@ async function normalizeOptions(host, schema) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
-    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
-    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
         linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
-        prefix,
+        prefix: options.prefix ?? 'lib',
         name: projectName,
         projectRoot,
         entryFile: 'index',

package/src/generators/library/lib/update-tsconfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const create_ts_config_1 = require("../../utils/create-ts-config");
+const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 function updateProjectConfig(host, options) {
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
         json.include = ['src/**/*.ts'];
@@ -18,7 +18,7 @@ function updateProjectConfig(host, options) {
         return json;
     });
     // tsconfig.json
-    (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
+    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(host, options.projectRoot, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
 }
 function updateProjectIvyConfig(host, options) {
     if (options.buildable || options.publishable) {
@@ -30,7 +30,7 @@ function updateProjectIvyConfig(host, options) {
     }
 }
 function updateTsConfig(host, options) {
-    (0, create_ts_config_1.extractTsConfigBase)(host);
+    (0, update_project_root_tsconfig_1.extractTsConfigBase)(host);
     updateProjectConfig(host, options);
     updateProjectIvyConfig(host, options);
 }

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'],

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/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.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/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-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

@@ -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 = "~14.0.2";
+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

@@ -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 = '~14.0.2';
+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;

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

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTsConfig = 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 createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
-    const json = {
-        compilerOptions: {
-            target: 'es2022',
-            useDefineForClassFields: false,
-            esModuleInterop: options.esModuleInterop ? true : undefined,
-        },
-        files: [],
-        include: [],
-        references: [
-            {
-                path: type === 'app' ? './tsconfig.app.json' : './tsconfig.lib.json',
-            },
-        ],
-    };
-    // inline tsconfig.base.json into the project
-    if (options.rootProject) {
-        json.compileOnSave = false;
-        json.compilerOptions = { ...js_1.tsConfigBaseOptions, ...json.compilerOptions };
-        json.exclude = ['node_modules', 'tmp'];
-    }
-    else {
-        json.extends = relativePathToRootTsConfig;
-    }
-    (0, devkit_1.writeJson)(host, `${projectRoot}/tsconfig.json`, json);
-}
-exports.createTsConfig = createTsConfig;