@nx/angular 16.8.0-beta.4 → 16.8.0-beta.6

package/src/generators/component/component.js

@@ -1,53 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const lib_1 = require("./lib");
-function componentGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, rawOptions);
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const componentNames = (0, devkit_1.names)(options.name);
-        const typeNames = (0, devkit_1.names)(options.type);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
-            fileName: componentNames.fileName,
-            className: componentNames.className,
-            type: typeNames.fileName,
-            typeClassName: typeNames.className,
-            style: options.style,
-            inlineStyle: options.inlineStyle,
-            inlineTemplate: options.inlineTemplate,
-            standalone: options.standalone,
-            skipSelector: options.skipSelector,
-            changeDetection: options.changeDetection,
-            viewEncapsulation: options.viewEncapsulation,
-            displayBlock: options.displayBlock,
-            selector: options.selector,
-            tpl: '',
-        });
-        if (options.skipTests) {
-            const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.spec.ts`);
-            tree.delete(pathToSpecFile);
-        }
-        if (options.inlineTemplate) {
-            const pathToTemplateFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.html`);
-            tree.delete(pathToTemplateFile);
-        }
-        if (options.style === 'none' || options.inlineStyle) {
-            const pathToStyleFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.${options.style}`);
-            tree.delete(pathToStyleFile);
-        }
-        if (!options.skipImport && !options.standalone) {
-            const modulePath = (0, lib_1.findModuleFromOptions)(tree, options, options.projectRoot);
-            (0, utils_1.addToNgModule)(tree, options.path, modulePath, componentNames.fileName, `${componentNames.className}${typeNames.className}`, `${componentNames.fileName}.${typeNames.fileName}`, 'declarations', options.flat, options.export);
-        }
-        (0, lib_1.exportComponentInEntryPoint)(tree, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function componentGenerator(tree, rawOptions) {
+    (0, lib_1.validateOptions)(tree, rawOptions);
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const componentNames = (0, devkit_1.names)(options.name);
+    const typeNames = (0, devkit_1.names)(options.type);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
+        fileName: componentNames.fileName,
+        className: componentNames.className,
+        type: typeNames.fileName,
+        typeClassName: typeNames.className,
+        style: options.style,
+        inlineStyle: options.inlineStyle,
+        inlineTemplate: options.inlineTemplate,
+        standalone: options.standalone,
+        skipSelector: options.skipSelector,
+        changeDetection: options.changeDetection,
+        viewEncapsulation: options.viewEncapsulation,
+        displayBlock: options.displayBlock,
+        selector: options.selector,
+        tpl: '',
     });
+    if (options.skipTests) {
+        const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.spec.ts`);
+        tree.delete(pathToSpecFile);
+    }
+    if (options.inlineTemplate) {
+        const pathToTemplateFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.html`);
+        tree.delete(pathToTemplateFile);
+    }
+    if (options.style === 'none' || options.inlineStyle) {
+        const pathToStyleFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.${options.style}`);
+        tree.delete(pathToStyleFile);
+    }
+    if (!options.skipImport && !options.standalone) {
+        const modulePath = (0, lib_1.findModuleFromOptions)(tree, options, options.projectRoot);
+        (0, utils_1.addToNgModule)(tree, options.path, modulePath, componentNames.fileName, `${componentNames.className}${typeNames.className}`, `${componentNames.fileName}.${typeNames.fileName}`, 'declarations', options.flat, options.export);
+    }
+    (0, lib_1.exportComponentInEntryPoint)(tree, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.componentGenerator = componentGenerator;
 exports.default = componentGenerator;

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

@@ -5,13 +5,23 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("../../utils/path");
 const selector_1 = require("../../utils/selector");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e;
-    (_a = options.type) !== null && _a !== void 0 ? _a : (options.type = 'component');
+    options.type ??= 'component';
     const { directory, filePath, name, path, root, sourceRoot } = (0, path_1.normalizeNameAndPaths)(tree, options);
     const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const selector = (_b = options.selector) !== null && _b !== void 0 ? _b : (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'fileName');
-    return Object.assign(Object.assign({}, options), { name, changeDetection: (_c = options.changeDetection) !== null && _c !== void 0 ? _c : 'Default', style: (_d = options.style) !== null && _d !== void 0 ? _d : 'css', flat: (_e = options.flat) !== null && _e !== void 0 ? _e : false, directory,
+    const selector = options.selector ??
+        (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'fileName');
+    return {
+        ...options,
+        name,
+        changeDetection: options.changeDetection ?? 'Default',
+        style: options.style ?? 'css',
+        flat: options.flat ?? false,
+        directory,
         filePath,
-        path, projectSourceRoot: sourceRoot, projectRoot: root, selector });
+        path,
+        projectSourceRoot: sourceRoot,
+        projectRoot: root,
+        selector,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/component-cypress-spec/component-cypress-spec.js

@@ -1,39 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentCypressSpecGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 const get_args_default_value_1 = require("./lib/get-args-default-value");
 const get_component_selector_1 = require("./lib/get-component-selector");
-function componentCypressSpecGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
-        const e2eProjectName = cypressProject || `${projectName}-e2e`;
-        const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
-        const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
-        const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
-        const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
-        const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
-        const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
-        if (tree.exists(storyFile)) {
-            return;
-        }
-        const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
-        const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
-        const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
-        (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
-            projectName,
-            componentFileName,
-            componentName,
-            componentSelector,
-            props,
-            fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
-        });
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function componentCypressSpecGenerator(tree, options) {
+    const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
+    const e2eProjectName = cypressProject || `${projectName}-e2e`;
+    const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
+    const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
+    const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
+    const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
+    const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory ?? componentPath);
+    const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
+    if (tree.exists(storyFile)) {
+        return;
+    }
+    const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
+    const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
+    const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
+    (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
+        projectName,
+        componentFileName,
+        componentName,
+        componentSelector,
+        props,
+        fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
     });
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.componentCypressSpecGenerator = componentCypressSpecGenerator;
 exports.default = componentCypressSpecGenerator;

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

@@ -1,31 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentStoryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
-function componentStoryGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { componentFileName, componentName, componentPath, projectPath } = options;
-        const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
-        const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);
-        const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.stories.ts`);
-        if (tree.exists(storyFile)) {
-            return;
-        }
-        const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
-        (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
-            componentFileName: componentFileName,
-            componentName: componentName,
-            componentNameSimple: componentFileName.replace('.component', ''),
-            interactionTests: options.interactionTests,
-            props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
-            tmpl: '',
-        });
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function componentStoryGenerator(tree, options) {
+    const { componentFileName, componentName, componentPath, projectPath } = options;
+    const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
+    const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);
+    const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.stories.ts`);
+    if (tree.exists(storyFile)) {
+        return;
+    }
+    const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
+    (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
+        componentFileName: componentFileName,
+        componentName: componentName,
+        componentNameSimple: componentFileName.replace('.component', ''),
+        interactionTests: options.interactionTests,
+        props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
+        tmpl: '',
     });
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.componentStoryGenerator = componentStoryGenerator;
 exports.default = componentStoryGenerator;

package/src/generators/convert-to-with-mf/convert-to-with-mf.js

@@ -1,33 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToWithMF = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const get_mf_projects_1 = require("../../utils/get-mf-projects");
 const lib_1 = require("./lib");
-function convertToWithMF(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = new Set((0, get_mf_projects_1.getMFProjects)(tree, { legacy: true }));
-        if (!projects.has(schema.project)) {
-            throw new Error(`Could not find project "${schema.project}" with a Micro Frontend configuration in your workspace. Please check the name of the project you're wishing to convert exists.`);
-        }
-        const project = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-        const pathToWebpackConfig = (0, lib_1.getWebpackConfigPath)(project, schema.project);
-        const webpackAst = (0, lib_1.parseASTOfWebpackConfig)(tree, pathToWebpackConfig);
-        if (!(0, lib_1.checkOutputNameMatchesProjectName)(webpackAst, schema.project)) {
-            throw new Error(`Cannot automatically migrate "${schema.project}" to "withModuleFederation" micro frontend webpack config. 
+async function convertToWithMF(tree, schema) {
+    const projects = new Set((0, get_mf_projects_1.getMFProjects)(tree, { legacy: true }));
+    if (!projects.has(schema.project)) {
+        throw new Error(`Could not find project "${schema.project}" with a Micro Frontend configuration in your workspace. Please check the name of the project you're wishing to convert exists.`);
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    const pathToWebpackConfig = (0, lib_1.getWebpackConfigPath)(project, schema.project);
+    const webpackAst = (0, lib_1.parseASTOfWebpackConfig)(tree, pathToWebpackConfig);
+    if (!(0, lib_1.checkOutputNameMatchesProjectName)(webpackAst, schema.project)) {
+        throw new Error(`Cannot automatically migrate "${schema.project}" to "withModuleFederation" micro frontend webpack config. 
       "uniqueName" in webpack config (${pathToWebpackConfig}) does not match project name.`);
-        }
-        if (!(0, lib_1.checkSharedNpmPackagesMatchExpected)(webpackAst)) {
-            throw new Error(`Cannot automatically migrate "${schema.project}" to "withModuleFederation" micro frontend webpack config. 
+    }
+    if (!(0, lib_1.checkSharedNpmPackagesMatchExpected)(webpackAst)) {
+        throw new Error(`Cannot automatically migrate "${schema.project}" to "withModuleFederation" micro frontend webpack config. 
         There are npm packages being shared with a custom configuration in webpack config (${pathToWebpackConfig}).`);
-        }
-        devkit_1.logger.warn(`This Micro Frontend configuration conversion will overwrite "${schema.project}"'s current webpack config. If you have anything custom that is not related to Micro Frontends, it will be lost. You should be able to see the changes in your version control system.`);
-        const [updatedWebpackConfig, mfConfig] = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
-        tree.write(pathToWebpackConfig, updatedWebpackConfig);
-        tree.write((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js'), mfConfig);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    devkit_1.logger.warn(`This Micro Frontend configuration conversion will overwrite "${schema.project}"'s current webpack config. If you have anything custom that is not related to Micro Frontends, it will be lost. You should be able to see the changes in your version control system.`);
+    const [updatedWebpackConfig, mfConfig] = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
+    tree.write(pathToWebpackConfig, updatedWebpackConfig);
+    tree.write((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js'), mfConfig);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.convertToWithMF = convertToWithMF;
 exports.default = convertToWithMF;

package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebpackConfigPath = void 0;
 function getWebpackConfigPath(project, projectName) {
-    var _a, _b, _c;
     let pathToWebpackConfig = '';
-    for (const target of Object.values((_a = project.targets) !== null && _a !== void 0 ? _a : {})) {
+    for (const target of Object.values(project.targets ?? {})) {
         if ((target.executor === '@nx/angular:webpack-browser' ||
             target.executor === '@nrwl/angular:webpack-browser') &&
-            ((_b = target.options.customWebpackConfig) === null || _b === void 0 ? void 0 : _b.path)) {
-            pathToWebpackConfig = (_c = target.options.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path;
+            target.options.customWebpackConfig?.path) {
+            pathToWebpackConfig = target.options.customWebpackConfig?.path;
             break;
         }
     }

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.conversionGenerator = void 0;
-const tslib_1 = require("tslib");
 const cypress_1 = require("@nx/cypress");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
@@ -9,113 +8,111 @@ const add_linting_1 = require("../add-linting/add-linting");
 /**
  * @deprecated This generator will be removed in v17
  */
-function conversionGenerator(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        /**
-         * The ProjectConverter instance encapsulates all the standard operations we need
-         * to perform in order to convert a project from TSLint to ESLint, as well as some
-         * extensibility points for adjusting the behavior on a per package basis.
-         *
-         * E.g. @nx/angular projects might need to make different changes to the final
-         * ESLint config when compared with @nx/next projects.
-         *
-         * See the ProjectConverter implementation for a full breakdown of what it does.
-         */
-        const projectConverter = new linter_1.ProjectConverter({
-            host,
-            projectName: options.project,
-            ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
-            eslintInitializer: ({ projectName, projectConfig }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield (0, add_linting_1.addLintingGenerator)(host, {
-                    projectName,
-                    projectRoot: projectConfig.root,
-                    prefix: projectConfig.prefix || 'app',
-                    /**
-                     * We set the parserOptions.project config just in case the converted config uses
-                     * rules which require type-checking. Later in the conversion we check if it actually
-                     * does and remove the config again if it doesn't, so that it is most efficient.
-                     */
-                    setParserOptionsProject: true,
-                    skipFormat: true,
-                });
-            }),
-        });
-        /**
-         * If root eslint configuration already exists it will not be recreated
-         * but we also don't want to re-run the tslint config conversion
-         * as it was likely already done
-         */
-        const rootEslintConfigExists = host.exists('.eslintrc.json');
-        /**
-         * Create the standard (which is applicable to the current package) ESLint setup
-         * for converting the project.
-         */
-        const eslintInitInstallTask = yield projectConverter.initESLint();
-        /**
-         * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json
-         */
-        const rootConfigInstallTask = yield projectConverter.convertRootTSLintConfig((json) => {
-            json.overrides = [
-                { files: ['*.ts'], rules: {} },
-                { files: ['*.html'], rules: {} },
-            ];
-            return applyAngularRulesToCorrectOverrides(json);
-        }, rootEslintConfigExists);
-        /**
-         * Convert the project's tslint.json to an equivalent ESLint config.
-         */
-        const projectConfigInstallTask = yield projectConverter.convertProjectConfig((json) => applyAngularRulesToCorrectOverrides(json));
-        /**
-         * Clean up the original TSLint configuration for the project.
-         */
-        projectConverter.removeProjectTSLintFile();
-        // Only project shouldn't be added as a default
-        const { project } = options, defaults = tslib_1.__rest(options, ["project"]);
-        /**
-         * Store user preferences for the collection
-         */
-        projectConverter.setDefaults('@nx/angular', defaults);
-        /**
-         * If the Angular project is an app which has an e2e project, try and convert that as well.
-         */
-        let cypressInstallTask = () => Promise.resolve(undefined);
-        const e2eProjectName = projectConverter.getE2EProjectName();
-        if (e2eProjectName) {
-            try {
-                cypressInstallTask = yield (0, cypress_1.conversionGenerator)(host, {
-                    project: e2eProjectName,
-                    ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
-                    /**
-                     * We can always set this to false, because it will already be handled by the next
-                     * step of this parent generator, if applicable
-                     */
-                    removeTSLintIfNoMoreTSLintTargets: false,
-                    skipFormat: true,
-                });
-            }
-            catch (_a) {
-                devkit_1.logger.warn('This Angular app has an e2e project, but it was not possible to convert it from TSLint to ESLint. This could be because the e2e project did not have a tslint.json file to begin with.');
-            }
-        }
-        /**
-         * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
-         */
-        let uninstallTSLintTask = () => Promise.resolve(undefined);
-        if (options.removeTSLintIfNoMoreTSLintTargets &&
-            !projectConverter.isTSLintUsedInWorkspace()) {
-            uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
+async function conversionGenerator(host, options) {
+    /**
+     * The ProjectConverter instance encapsulates all the standard operations we need
+     * to perform in order to convert a project from TSLint to ESLint, as well as some
+     * extensibility points for adjusting the behavior on a per package basis.
+     *
+     * E.g. @nx/angular projects might need to make different changes to the final
+     * ESLint config when compared with @nx/next projects.
+     *
+     * See the ProjectConverter implementation for a full breakdown of what it does.
+     */
+    const projectConverter = new linter_1.ProjectConverter({
+        host,
+        projectName: options.project,
+        ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
+        eslintInitializer: async ({ projectName, projectConfig }) => {
+            await (0, add_linting_1.addLintingGenerator)(host, {
+                projectName,
+                projectRoot: projectConfig.root,
+                prefix: projectConfig.prefix || 'app',
+                /**
+                 * We set the parserOptions.project config just in case the converted config uses
+                 * rules which require type-checking. Later in the conversion we check if it actually
+                 * does and remove the config again if it doesn't, so that it is most efficient.
+                 */
+                setParserOptionsProject: true,
+                skipFormat: true,
+            });
+        },
+    });
+    /**
+     * If root eslint configuration already exists it will not be recreated
+     * but we also don't want to re-run the tslint config conversion
+     * as it was likely already done
+     */
+    const rootEslintConfigExists = host.exists('.eslintrc.json');
+    /**
+     * Create the standard (which is applicable to the current package) ESLint setup
+     * for converting the project.
+     */
+    const eslintInitInstallTask = await projectConverter.initESLint();
+    /**
+     * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json
+     */
+    const rootConfigInstallTask = await projectConverter.convertRootTSLintConfig((json) => {
+        json.overrides = [
+            { files: ['*.ts'], rules: {} },
+            { files: ['*.html'], rules: {} },
+        ];
+        return applyAngularRulesToCorrectOverrides(json);
+    }, rootEslintConfigExists);
+    /**
+     * Convert the project's tslint.json to an equivalent ESLint config.
+     */
+    const projectConfigInstallTask = await projectConverter.convertProjectConfig((json) => applyAngularRulesToCorrectOverrides(json));
+    /**
+     * Clean up the original TSLint configuration for the project.
+     */
+    projectConverter.removeProjectTSLintFile();
+    // Only project shouldn't be added as a default
+    const { project, ...defaults } = options;
+    /**
+     * Store user preferences for the collection
+     */
+    projectConverter.setDefaults('@nx/angular', defaults);
+    /**
+     * If the Angular project is an app which has an e2e project, try and convert that as well.
+     */
+    let cypressInstallTask = () => Promise.resolve(undefined);
+    const e2eProjectName = projectConverter.getE2EProjectName();
+    if (e2eProjectName) {
+        try {
+            cypressInstallTask = await (0, cypress_1.conversionGenerator)(host, {
+                project: e2eProjectName,
+                ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
+                /**
+                 * We can always set this to false, because it will already be handled by the next
+                 * step of this parent generator, if applicable
+                 */
+                removeTSLintIfNoMoreTSLintTargets: false,
+                skipFormat: true,
+            });
         }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+        catch {
+            devkit_1.logger.warn('This Angular app has an e2e project, but it was not possible to convert it from TSLint to ESLint. This could be because the e2e project did not have a tslint.json file to begin with.');
         }
-        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield eslintInitInstallTask();
-            yield rootConfigInstallTask();
-            yield projectConfigInstallTask();
-            yield cypressInstallTask();
-            yield uninstallTSLintTask();
-        });
-    });
+    }
+    /**
+     * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
+     */
+    let uninstallTSLintTask = () => Promise.resolve(undefined);
+    if (options.removeTSLintIfNoMoreTSLintTargets &&
+        !projectConverter.isTSLintUsedInWorkspace()) {
+        uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return async () => {
+        await eslintInitInstallTask();
+        await rootConfigInstallTask();
+        await projectConfigInstallTask();
+        await cypressInstallTask();
+        await uninstallTSLintTask();
+    };
 }
 exports.conversionGenerator = conversionGenerator;
 /**