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

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const linter_1 = require("@nx/linter");
@@ -21,87 +20,88 @@ const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-sco
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const create_files_1 = require("./lib/create-files");
 const add_project_1 = require("./lib/add-project");
-function libraryGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield libraryGeneratorInternal(tree, Object.assign({ 
-            // provide a default projectNameAndRootFormat to avoid breaking changes
-            // to external generators invoking this one
-            projectNameAndRootFormat: 'derived' }, schema));
+async function libraryGenerator(tree, schema) {
+    return await libraryGeneratorInternal(tree, {
+        // provide a default projectNameAndRootFormat to avoid breaking changes
+        // to external generators invoking this one
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.libraryGenerator = libraryGenerator;
-function libraryGeneratorInternal(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // Do some validation checks
-        if (!schema.routing && schema.lazy) {
-            throw new Error(`To use "--lazy" option, "--routing" must also be set.`);
-        }
-        if (schema.publishable === true && !schema.importPath) {
-            throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-        }
-        if (schema.addTailwind && !schema.buildable && !schema.publishable) {
-            throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
-        }
-        const userInstalledAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
-            throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
-        }
-        const options = yield (0, normalize_options_1.normalizeOptions)(tree, schema);
-        const { libraryOptions } = options;
-        const pkgVersions = (0, version_utils_1.versions)(tree);
-        yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
-        const project = (0, add_project_1.addProject)(tree, libraryOptions);
-        (0, create_files_1.createFiles)(tree, options, project);
-        (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
-        yield addUnitTestRunner(tree, libraryOptions);
-        updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
-        if (!libraryOptions.standalone) {
-            (0, add_module_1.addModule)(tree, libraryOptions);
-        }
-        else {
-            yield (0, add_standalone_component_1.addStandaloneComponent)(tree, options);
-        }
-        setStrictMode(tree, libraryOptions);
-        yield addLinting(tree, libraryOptions);
-        if (libraryOptions.addTailwind) {
-            yield (0, setup_tailwind_1.default)(tree, {
-                project: libraryOptions.name,
-                skipFormat: true,
-            });
-        }
-        if (libraryOptions.buildable || libraryOptions.publishable) {
-            (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
-                'ng-packagr': pkgVersions.ngPackagrVersion,
-            });
-            (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
-        }
-        (0, js_1.addTsConfigPath)(tree, libraryOptions.importPath, [
-            (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, './src', 'index.ts'),
-        ]);
-        if (!libraryOptions.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            (0, devkit_1.installPackagesTask)(tree);
-        };
+async function libraryGeneratorInternal(tree, schema) {
+    // Do some validation checks
+    if (!schema.routing && schema.lazy) {
+        throw new Error(`To use "--lazy" option, "--routing" must also be set.`);
+    }
+    if (schema.publishable === true && !schema.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
+    if (schema.addTailwind && !schema.buildable && !schema.publishable) {
+        throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
+    }
+    const userInstalledAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
+        throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
+    }
+    const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
+    const { libraryOptions } = options;
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    await (0, init_1.default)(tree, {
+        ...libraryOptions,
+        skipFormat: true,
+        e2eTestRunner: test_runners_1.E2eTestRunner.None,
     });
+    const project = (0, add_project_1.addProject)(tree, libraryOptions);
+    (0, create_files_1.createFiles)(tree, options, project);
+    (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
+    await addUnitTestRunner(tree, libraryOptions);
+    updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
+    if (!libraryOptions.standalone) {
+        (0, add_module_1.addModule)(tree, libraryOptions);
+    }
+    else {
+        await (0, add_standalone_component_1.addStandaloneComponent)(tree, options);
+    }
+    setStrictMode(tree, libraryOptions);
+    await addLinting(tree, libraryOptions);
+    if (libraryOptions.addTailwind) {
+        await (0, setup_tailwind_1.default)(tree, {
+            project: libraryOptions.name,
+            skipFormat: true,
+        });
+    }
+    if (libraryOptions.buildable || libraryOptions.publishable) {
+        (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+            'ng-packagr': pkgVersions.ngPackagrVersion,
+        });
+        (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
+    }
+    (0, js_1.addTsConfigPath)(tree, libraryOptions.importPath, [
+        (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, './src', 'index.ts'),
+    ]);
+    if (!libraryOptions.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
-function addUnitTestRunner(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.unitTestRunner === 'jest') {
-            yield (0, jest_1.configurationGenerator)(host, {
-                project: options.name,
-                setupFile: 'angular',
-                supportTsx: false,
-                skipSerializers: false,
-                skipFormat: true,
-                skipPackageJson: options.skipPackageJson,
-            });
-            const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
-            if (options.strict && host.exists(setupFile)) {
-                const contents = host.read(setupFile, 'utf-8');
-                host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
+async function addUnitTestRunner(host, options) {
+    if (options.unitTestRunner === 'jest') {
+        await (0, jest_1.configurationGenerator)(host, {
+            project: options.name,
+            setupFile: 'angular',
+            supportTsx: false,
+            skipSerializers: false,
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+        });
+        const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
+        if (options.strict && host.exists(setupFile)) {
+            const contents = host.read(setupFile, 'utf-8');
+            host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
 globalThis.ngJest = {
   testEnvironmentOptions: {
     errorOnUnknownElements: true,
@@ -109,9 +109,8 @@ globalThis.ngJest = {
   },
 };
 ${contents}`);
-            }
         }
-    });
+    }
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {
     if (options.buildable || options.publishable) {
@@ -126,20 +125,18 @@ function setStrictMode(host, options) {
         (0, enable_strict_type_checking_1.setLibraryStrictDefault)(host, options.strict);
     }
 }
-function addLinting(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.linter === linter_1.Linter.None) {
-            return;
-        }
-        yield (0, add_linting_1.default)(host, {
-            projectName: options.name,
-            projectRoot: options.projectRoot,
-            prefix: options.prefix,
-            unitTestRunner: options.unitTestRunner,
-            setParserOptionsProject: options.setParserOptionsProject,
-            skipFormat: true,
-            skipPackageJson: options.skipPackageJson,
-        });
+async function addLinting(host, options) {
+    if (options.linter === linter_1.Linter.None) {
+        return;
+    }
+    await (0, add_linting_1.default)(host, {
+        projectName: options.name,
+        projectRoot: options.projectRoot,
+        prefix: options.prefix,
+        unitTestRunner: options.unitTestRunner,
+        setParserOptionsProject: options.setParserOptionsProject,
+        skipFormat: true,
+        skipPackageJson: options.skipPackageJson,
     });
 }
 exports.default = libraryGenerator;

package/src/generators/library-secondary-entry-point/lib/add-files.js

@@ -4,7 +4,11 @@ exports.addFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 function addFiles(tree, options) {
     const nameVariants = (0, devkit_1.names)(options.name);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.entryPointDestination, Object.assign(Object.assign(Object.assign({}, options), nameVariants), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.entryPointDestination, {
+        ...options,
+        ...nameVariants,
+        tmpl: '',
+    });
     if (options.skipModule) {
         tree.delete((0, devkit_1.joinPathFragments)(options.entryPointDestination, `src/lib/${nameVariants.fileName}.module.ts`));
     }

package/src/generators/library-secondary-entry-point/lib/normalize-options.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(tree, options) {
-    var _a;
     const name = (0, devkit_1.names)(options.name).fileName;
     const projects = (0, devkit_1.getProjects)(tree);
     const libraryProject = projects.get(options.library);
@@ -19,10 +18,14 @@ function normalizeOptions(tree, options) {
     }
     const { name: mainEntryPoint } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(libraryProject.root, 'package.json'));
     const secondaryEntryPoint = `${mainEntryPoint}/${options.name}`;
-    return Object.assign(Object.assign({}, options), { entryPointDestination,
+    return {
+        ...options,
+        entryPointDestination,
         mainEntryPoint,
         name,
         libraryProject,
-        secondaryEntryPoint, skipModule: (_a = options.skipModule) !== null && _a !== void 0 ? _a : false });
+        secondaryEntryPoint,
+        skipModule: options.skipModule ?? false,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/library-secondary-entry-point/lib/update-linting-file-patterns.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateLintingFilePatterns = void 0;
 const devkit_1 = require("@nx/devkit");
 function updateLintingFilePatterns(tree, options) {
-    var _a, _b, _c;
     const { libraryProject } = options;
-    if ((_c = (_b = (_a = libraryProject.targets) === null || _a === void 0 ? void 0 : _a.lint) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.lintFilePatterns) {
+    if (libraryProject.targets?.lint?.options?.lintFilePatterns) {
         libraryProject.targets.lint.options.lintFilePatterns.push(...[
             `${libraryProject.root}/${options.name}/**/*.ts`,
             `${libraryProject.root}/${options.name}/**/*.html`,

package/src/generators/library-secondary-entry-point/library-secondary-entry-point.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.librarySecondaryEntryPointGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-function librarySecondaryEntryPointGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        (0, lib_1.addFiles)(tree, options);
-        (0, lib_1.addPathMapping)(tree, options);
-        (0, lib_1.updateLintingFilePatterns)(tree, options);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function librarySecondaryEntryPointGenerator(tree, rawOptions) {
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    (0, lib_1.addFiles)(tree, options);
+    (0, lib_1.addPathMapping)(tree, options);
+    (0, lib_1.updateLintingFilePatterns)(tree, options);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.librarySecondaryEntryPointGenerator = librarySecondaryEntryPointGenerator;
 exports.default = librarySecondaryEntryPointGenerator;

package/src/generators/move/lib/normalize-schema.js

@@ -6,6 +6,10 @@ const get_new_project_name_1 = require("../../utils/get-new-project-name");
 function normalizeSchema(tree, schema) {
     const newProjectName = (0, get_new_project_name_1.getNewProjectName)(schema.destination);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
-    return Object.assign(Object.assign({}, schema), { newProjectName, oldProjectRoot: root });
+    return {
+        ...schema,
+        newProjectName,
+        oldProjectRoot: root,
+    };
 }
 exports.normalizeSchema = normalizeSchema;

package/src/generators/move/lib/update-module-name.js

@@ -87,7 +87,7 @@ function updateFileContent(tree, replacements, fileName, newFileName) {
             }
         });
         if (updated) {
-            tree.write(newFileName !== null && newFileName !== void 0 ? newFileName : fileName, content);
+            tree.write(newFileName ?? fileName, content);
         }
     }
 }

package/src/generators/move/lib/update-ng-package.js

@@ -4,7 +4,6 @@ exports.updateNgPackage = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function updateNgPackage(tree, schema) {
-    var _a;
     const project = (0, devkit_1.readProjectConfiguration)(tree, schema.newProjectName);
     if (project.projectType === 'application') {
         return;
@@ -28,7 +27,7 @@ function updateNgPackage(tree, schema) {
             targets: project.targets,
         },
     });
-    const output = (_a = outputs[0]) !== null && _a !== void 0 ? _a : `dist/${project.root}`;
+    const output = outputs[0] ?? `dist/${project.root}`;
     (0, devkit_1.updateJson)(tree, ngPackagePath, (json) => {
         json.dest = `${rootOffset}/${output}`;
         return json;

package/src/generators/move/lib/update-secondary-entry-points.js

@@ -12,12 +12,11 @@ const libraryExecutors = [
     '@nrwl/angular:package',
 ];
 function updateSecondaryEntryPoints(tree, schema) {
-    var _a;
     const project = (0, devkit_1.readProjectConfiguration)(tree, schema.newProjectName);
     if (project.projectType !== 'library') {
         return;
     }
-    if (!Object.values((_a = project.targets) !== null && _a !== void 0 ? _a : {}).some((target) => libraryExecutors.includes(target.executor))) {
+    if (!Object.values(project.targets ?? {}).some((target) => libraryExecutors.includes(target.executor))) {
         return;
     }
     (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {

package/src/generators/move/move.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMoveGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const generators_1 = require("@nx/workspace/generators");
 const lib_1 = require("./lib");
@@ -12,16 +11,14 @@ const lib_1 = require("./lib");
  * to the workspace, so it can't use the same tricks as the `@nx/workspace` rules
  * to get the before and after names and paths.
  */
-function angularMoveGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const normalizedSchema = (0, lib_1.normalizeSchema)(tree, schema);
-        yield (0, generators_1.moveGenerator)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true }));
-        (0, lib_1.updateModuleName)(tree, normalizedSchema);
-        (0, lib_1.updateNgPackage)(tree, normalizedSchema);
-        (0, lib_1.updateSecondaryEntryPoints)(tree, normalizedSchema);
-        if (!normalizedSchema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
+async function angularMoveGenerator(tree, schema) {
+    const normalizedSchema = (0, lib_1.normalizeSchema)(tree, schema);
+    await (0, generators_1.moveGenerator)(tree, { ...schema, skipFormat: true });
+    (0, lib_1.updateModuleName)(tree, normalizedSchema);
+    (0, lib_1.updateNgPackage)(tree, normalizedSchema);
+    (0, lib_1.updateSecondaryEntryPoints)(tree, normalizedSchema);
+    if (!normalizedSchema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.angularMoveGenerator = angularMoveGenerator;

package/src/generators/ng-add/migrate-from-angular-cli.js

@@ -1,61 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateFromAngularCli = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const migrators_1 = require("./migrators");
 const utilities_1 = require("./utilities");
-function migrateFromAngularCli(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, utilities_1.validateWorkspace)(tree);
-        const projects = (0, utilities_1.getAllProjects)(tree);
-        const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
-        (0, utilities_1.ensureAngularDevKitPeerDependenciesAreInstalled)(tree);
-        const migrators = [
-            ...projects.apps.map((app) => new migrators_1.AppMigrator(tree, options, app)),
-            ...projects.libs.map((lib) => new migrators_1.LibMigrator(tree, options, lib)),
-        ];
-        const workspaceRootFileTypesInfo = (0, utilities_1.getWorkspaceRootFileTypesInfo)(tree, migrators);
-        /**
-         * Keep a copy of the root eslint config to restore it later. We need to
-         * do this because the root config can also be the config for the app at
-         * the root of the Angular CLI workspace and it will be moved as part of
-         * the app migration.
-         */
-        let eslintConfig = workspaceRootFileTypesInfo.eslint && tree.exists('.eslintrc.json')
-            ? (0, devkit_1.readJson)(tree, '.eslintrc.json')
-            : undefined;
-        // create and update root files and configurations
-        (0, devkit_1.updateJson)(tree, 'angular.json', (json) => (Object.assign(Object.assign({}, json), { version: 2, $schema: undefined })));
-        (0, utilities_1.createNxJson)(tree, options, angularJson.defaultProject);
-        (0, utilities_1.updateWorkspaceConfigDefaults)(tree);
-        (0, utilities_1.updateRootTsConfig)(tree);
-        (0, utilities_1.updatePackageJson)(tree);
-        yield (0, utilities_1.createWorkspaceFiles)(tree);
-        // migrate all projects
-        for (const migrator of migrators) {
-            yield migrator.migrate();
-        }
-        /**
-         * This needs to be done last because the Angular CLI workspace can have
-         * these files in the root for the root application, so we wait until
-         * those root config files are moved when the projects are migrated.
-         */
-        if (workspaceRootFileTypesInfo.karma) {
-            (0, utilities_1.createRootKarmaConfig)(tree);
-        }
-        if (workspaceRootFileTypesInfo.eslint) {
-            (0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
-            (0, utilities_1.cleanupEsLintPackages)(tree);
-        }
-        (0, utilities_1.deleteGitKeepFilesIfNotNeeded)(tree);
-        (0, utilities_1.deleteAngularJson)(tree);
-        if (!options.skipInstall) {
-            return () => {
-                (0, devkit_1.installPackagesTask)(tree);
-                (0, utilities_1.formatFilesTask)(tree);
-            };
-        }
-    });
+async function migrateFromAngularCli(tree, options) {
+    (0, utilities_1.validateWorkspace)(tree);
+    const projects = (0, utilities_1.getAllProjects)(tree);
+    const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
+    (0, utilities_1.ensureAngularDevKitPeerDependenciesAreInstalled)(tree);
+    const migrators = [
+        ...projects.apps.map((app) => new migrators_1.AppMigrator(tree, options, app)),
+        ...projects.libs.map((lib) => new migrators_1.LibMigrator(tree, options, lib)),
+    ];
+    const workspaceRootFileTypesInfo = (0, utilities_1.getWorkspaceRootFileTypesInfo)(tree, migrators);
+    /**
+     * Keep a copy of the root eslint config to restore it later. We need to
+     * do this because the root config can also be the config for the app at
+     * the root of the Angular CLI workspace and it will be moved as part of
+     * the app migration.
+     */
+    let eslintConfig = workspaceRootFileTypesInfo.eslint && tree.exists('.eslintrc.json')
+        ? (0, devkit_1.readJson)(tree, '.eslintrc.json')
+        : undefined;
+    // create and update root files and configurations
+    (0, devkit_1.updateJson)(tree, 'angular.json', (json) => ({
+        ...json,
+        version: 2,
+        $schema: undefined,
+    }));
+    (0, utilities_1.createNxJson)(tree, options, angularJson.defaultProject);
+    (0, utilities_1.updateWorkspaceConfigDefaults)(tree);
+    (0, utilities_1.updateRootTsConfig)(tree);
+    (0, utilities_1.updatePackageJson)(tree);
+    await (0, utilities_1.createWorkspaceFiles)(tree);
+    // migrate all projects
+    for (const migrator of migrators) {
+        await migrator.migrate();
+    }
+    /**
+     * This needs to be done last because the Angular CLI workspace can have
+     * these files in the root for the root application, so we wait until
+     * those root config files are moved when the projects are migrated.
+     */
+    if (workspaceRootFileTypesInfo.karma) {
+        (0, utilities_1.createRootKarmaConfig)(tree);
+    }
+    if (workspaceRootFileTypesInfo.eslint) {
+        (0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
+        (0, utilities_1.cleanupEsLintPackages)(tree);
+    }
+    (0, utilities_1.deleteGitKeepFilesIfNotNeeded)(tree);
+    (0, utilities_1.deleteAngularJson)(tree);
+    if (!options.skipInstall) {
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+            (0, utilities_1.formatFilesTask)(tree);
+        };
+    }
 }
 exports.migrateFromAngularCli = migrateFromAngularCli;

package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js

@@ -58,11 +58,12 @@ class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
         target.options.scripts =
             target.options.scripts &&
                 target.options.scripts.map((script) => this.convertAsset(script));
-        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        });
     }
     updateTsConfigFileUsedByTestTarget(targetName, target) {
-        var _a;
-        if (!((_a = target.options) === null || _a === void 0 ? void 0 : _a.tsConfig)) {
+        if (!target.options?.tsConfig) {
             this.logger.warn(`The "${targetName}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
             return;
         }

package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js

@@ -35,21 +35,21 @@ class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator
             return;
         }
         ['project', 'tsConfig'].forEach((option) => {
-            var _a, _b;
-            if ((_a = target.options) === null || _a === void 0 ? void 0 : _a[option]) {
+            if (target.options?.[option]) {
                 target.options[option] = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(target.options[option]));
             }
-            for (const configuration of Object.values((_b = target.configurations) !== null && _b !== void 0 ? _b : {})) {
+            for (const configuration of Object.values(target.configurations ?? {})) {
                 configuration[option] =
                     configuration[option] &&
                         (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configuration[option]));
             }
         });
-        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        });
     }
     updateNgPackageJson(targetName, target) {
-        var _a;
-        if (!((_a = target.options) === null || _a === void 0 ? void 0 : _a.project)) {
+        if (!target.options?.project) {
             this.logger.warn(`The "${targetName}" target does not have the "project" option configured. Skipping updating the ng-packagr project file ("ng-package.json").`);
             return;
         }
@@ -68,16 +68,16 @@ class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator
         });
     }
     updateTsConfigs(targetName, target) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const tsConfigPath = (_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = target.configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        const tsConfigPath = target.options?.tsConfig ?? target.configurations?.development?.tsConfig;
         if (!tsConfigPath) {
             this.logger.warn(`The "${targetName}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
             return;
         }
         else if (!this.tree.exists(tsConfigPath)) {
-            const originalTsConfigPath = ((_e = target.options) === null || _e === void 0 ? void 0 : _e.tsConfig)
+            const originalTsConfigPath = target.options?.tsConfig
                 ? this.originalProjectConfig.targets[targetName].options.tsConfig
-                : (_g = (_f = this.originalProjectConfig.targets[targetName].configurations) === null || _f === void 0 ? void 0 : _f.development) === null || _g === void 0 ? void 0 : _g.tsConfig;
+                : this.originalProjectConfig.targets[targetName].configurations
+                    ?.development?.tsConfig;
             this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
             return;
         }
@@ -85,8 +85,7 @@ class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator
         const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
         this.updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot);
         (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
-            var _a, _b;
-            if (!((_a = json.include) === null || _a === void 0 ? void 0 : _a.length) && !((_b = json.files) === null || _b === void 0 ? void 0 : _b.length)) {
+            if (!json.include?.length && !json.files?.length) {
                 json.include = ['**/*.ts'];
             }
             return json;