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

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 === '';
@@ -20,7 +21,8 @@ async function addLintingGenerator(tree, options) {
         setParserOptionsProject: options.setParserOptionsProject,
         skipFormat: true,
         rootProject: rootProject,
-        addPlugin: options.addPlugin,
+        addPlugin: false,
+        addExplicitTargets: true,
     });
     tasks.push(lintTask);
     if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
@@ -72,7 +74,7 @@ async function addLintingGenerator(tree, options) {
                  */
                 rules: {},
             },
-            ...(isBuildableLibraryProject(tree, options.projectName)
+            ...((0, buildable_project_1.isBuildableLibraryProject)(tree, options.projectName)
                 ? [
                     {
                         files: ['*.json'],
@@ -86,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) {
@@ -95,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/add-linting/schema.d.ts

@@ -6,5 +6,4 @@ export interface AddLintingGeneratorSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   unitTestRunner?: string;
-  addPlugin?: boolean;
 }

package/src/generators/application/application.js

@@ -12,7 +12,6 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         projectNameAndRootFormat: 'derived',
-        addPlugin: false,
         ...schema,
     });
 }

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/files/ng-module/src/app/nx-welcome.component.ts__tpl__

@@ -699,7 +699,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
                 You can activate distributed tasks executions and caching by
                 running:
               </p>
-              <pre>nx connect-to-nx-cloud</pre>
+              <pre>nx connect</pre>
               <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer"> What is Nx Cloud? </a>
             </div>
             <a id="nx-repo" class="button-pill rounded shadow" href="https://github.com/nrwl/nx?utm_source=nx-project" target="_blank" rel="noreferrer">

package/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__

@@ -702,7 +702,7 @@ import { CommonModule } from '@angular/common';
                 You can activate distributed tasks executions and caching by
                 running:
               </p>
-              <pre>nx connect-to-nx-cloud</pre>
+              <pre>nx connect</pre>
               <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer"> What is Nx Cloud? </a>
             </div>
             <a id="nx-repo" class="button-pill rounded shadow" href="https://github.com/nrwl/nx?utm_source=nx-project" target="_blank" rel="noreferrer">

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

@@ -1,12 +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 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, {
@@ -17,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,
@@ -26,11 +30,11 @@ async function addE2e(tree, options) {
             devServerTarget: `${options.name}:serve:development`,
             baseUrl: 'http://localhost:4200',
             rootProject: options.rootProject,
-            addPlugin: options.addPlugin,
+            addPlugin,
         });
     }
     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,
@@ -38,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,
@@ -49,7 +53,7 @@ async function addE2e(tree, options) {
             webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
             webServerAddress: `http://localhost:${options.port ?? 4200}`,
             rootProject: options.rootProject,
-            addPlugin: options.addPlugin,
+            addPlugin,
         });
     }
 }

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

@@ -15,7 +15,6 @@ async function addLinting(host, options) {
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
 }
 exports.addLinting = addLinting;

package/src/generators/application/lib/add-unit-test-runner.js

@@ -10,7 +10,6 @@ async function addUnitTestRunner(host, options) {
             projectRoot: options.appProjectRoot,
             skipPackageJson: options.skipPackageJson,
             strict: options.strict,
-            addPlugin: options.addPlugin,
         });
     }
 }

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, {
@@ -19,13 +17,11 @@ async function normalizeOptions(host, options) {
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     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);
@@ -45,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.d.ts

@@ -31,5 +31,4 @@ export interface Schema {
   minimal?: boolean;
   bundler?: 'webpack' | 'esbuild';
   ssr?: boolean;
-  addPlugin?: boolean;
 }

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,18 +1,16 @@
 "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, {
-        addPlugin: false,
         ...options,
     });
 }
@@ -22,15 +20,19 @@ exports.cypressComponentConfiguration = cypressComponentConfiguration;
  * storybook + cypress then use the componentCypressGenerator instead.
  */
 async function cypressComponentConfigurationInternal(tree, options) {
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     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: options.addPlugin,
+        addPlugin: false,
+        addExplicitTargets: true,
     });
     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);
     }
@@ -39,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);
@@ -66,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([
@@ -91,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/cypress-component-configuration/schema.d.ts

@@ -3,5 +3,4 @@ export interface CypressComponentConfigSchema {
   generateTests: boolean;
   skipFormat?: boolean;
   buildTarget?: string;
-  addPlugin?: boolean;
 }

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/library/schema.d.ts

@@ -40,4 +40,5 @@ export interface Schema {
   skipTests?: boolean;
   selector?: string;
   skipSelector?: boolean;
+  addPlugin?: boolean;
 }