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

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eMigrator = void 0;
-const tslib_1 = require("tslib");
 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");
@@ -36,7 +35,6 @@ const cypressConfig = {
 };
 class E2eMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project, lintTargetName, logger) {
-        var _a;
         super(tree, options, supportedTargets, project, 'apps', logger);
         this.lintTargetName = lintTargetName;
         this.appConfig = project.config;
@@ -44,39 +42,39 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         // TODO(leo): temporary keep restriction to support projects with an "e2e" target,
         // will be lifted soon when the migration is split per-builder and proper support
         // for multiple targets for the same builder is added
-        this.targetNames.e2e = ((_a = this.appConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e) ? 'e2e' : undefined;
+        this.targetNames.e2e = this.appConfig.targets?.e2e ? 'e2e' : undefined;
         this.initialize();
     }
-    migrate() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.targetNames.e2e) {
-                this.logger.info('No e2e project was migrated because there was no "e2e" target declared in the "angular.json".');
-                return;
-            }
-            if (this.shouldSkipTargetTypeMigration('e2e')) {
-                return;
-            }
-            if (this.isProtractorE2eProject()) {
-                yield this.migrateProtractorE2eProject();
-            }
-            else if (this.isCypressE2eProject()) {
-                yield this.migrateCypressE2eProject();
-            }
-            const tsConfig = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tsconfig.json');
-            if (!this.tree.exists(tsConfig)) {
-                this.logger.warn('A "tsconfig.json" file could not be found for the e2e project. Skipping updating the tsConfig file.');
-                return;
-            }
-            const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
-            (0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
-                json.extends = `${rootOffset}${(0, js_1.getRootTsConfigPathInTree)(this.tree)}`;
-                json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${rootOffset}dist/out-tsc` });
-                return json;
-            });
+    async migrate() {
+        if (!this.targetNames.e2e) {
+            this.logger.info('No e2e project was migrated because there was no "e2e" target declared in the "angular.json".');
+            return;
+        }
+        if (this.shouldSkipTargetTypeMigration('e2e')) {
+            return;
+        }
+        if (this.isProtractorE2eProject()) {
+            await this.migrateProtractorE2eProject();
+        }
+        else if (this.isCypressE2eProject()) {
+            await this.migrateCypressE2eProject();
+        }
+        const tsConfig = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tsconfig.json');
+        if (!this.tree.exists(tsConfig)) {
+            this.logger.warn('A "tsconfig.json" file could not be found for the e2e project. Skipping updating the tsConfig file.');
+            return;
+        }
+        const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
+        (0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
+            json.extends = `${rootOffset}${(0, js_1.getRootTsConfigPathInTree)(this.tree)}`;
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                outDir: `${rootOffset}dist/out-tsc`,
+            };
+            return json;
         });
     }
     validate() {
-        var _a;
         if (!this.targetNames.e2e) {
             return null;
         }
@@ -115,7 +113,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             return null;
         }
         if (this.isCypressE2eProject()) {
-            const configFile = (_a = this.projectConfig.targets[this.targetNames.e2e].options) === null || _a === void 0 ? void 0 : _a.configFile;
+            const configFile = this.projectConfig.targets[this.targetNames.e2e].options?.configFile;
             if (configFile === undefined && !this.getOldCypressConfigFilePath()) {
                 const expectedConfigFile = this.cypressInstalledVersion < 10
                     ? 'cypress.json'
@@ -168,70 +166,86 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         const newRoot = (0, devkit_1.joinPathFragments)('apps', name);
         const newSourceRoot = (0, devkit_1.joinPathFragments)('apps', name, 'src');
         if (this.isProtractorE2eProject()) {
-            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'e2e'), newRoot,
-                newSourceRoot });
+            this.project = {
+                ...this.project,
+                name,
+                oldRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'e2e'),
+                newRoot,
+                newSourceRoot,
+            };
         }
         else if (this.isCypressE2eProject()) {
             this.cypressInstalledVersion = (0, cypress_version_1.installedCypressVersion)();
-            this.project = Object.assign(Object.assign({}, this.project), { name, oldSourceRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress'), newRoot,
-                newSourceRoot });
+            this.project = {
+                ...this.project,
+                name,
+                oldSourceRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress'),
+                newRoot,
+                newSourceRoot,
+            };
         }
     }
-    migrateProtractorE2eProject() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.moveDir(this.project.oldRoot, this.project.newRoot);
-            this.projectConfig = {
-                root: this.project.newRoot,
-                sourceRoot: this.project.newSourceRoot,
-                projectType: 'application',
-                targets: {
-                    e2e: Object.assign(Object.assign({}, this.projectConfig.targets[this.targetNames.e2e]), { options: Object.assign(Object.assign({}, this.projectConfig.targets[this.targetNames.e2e].options), { protractorConfig: this.convertRootPath(this.projectConfig.targets[this.targetNames.e2e].options
-                                .protractorConfig) }) }),
+    async migrateProtractorE2eProject() {
+        this.moveDir(this.project.oldRoot, this.project.newRoot);
+        this.projectConfig = {
+            root: this.project.newRoot,
+            sourceRoot: this.project.newSourceRoot,
+            projectType: 'application',
+            targets: {
+                e2e: {
+                    ...this.projectConfig.targets[this.targetNames.e2e],
+                    options: {
+                        ...this.projectConfig.targets[this.targetNames.e2e].options,
+                        protractorConfig: this.convertRootPath(this.projectConfig.targets[this.targetNames.e2e].options
+                            .protractorConfig),
+                    },
                 },
-                implicitDependencies: [this.appName],
-                tags: [],
-            };
-            // remove e2e target from the app config
-            delete this.appConfig.targets[this.targetNames.e2e];
-            (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
-            // add e2e project config
-            (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
-            if (this.isProjectUsingEsLint) {
-                yield (0, linter_1.lintProjectGenerator)(this.tree, {
-                    project: this.project.name,
-                    linter: linter_1.Linter.EsLint,
-                    eslintFilePatterns: [`${this.project.newRoot}/**/*.{js,ts}`],
-                    unitTestRunner: this.options.unitTestRunner,
-                    tsConfigPaths: [
-                        (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'),
-                    ],
-                    skipFormat: true,
-                });
-            }
+            },
+            implicitDependencies: [this.appName],
+            tags: [],
+        };
+        // remove e2e target from the app config
+        delete this.appConfig.targets[this.targetNames.e2e];
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, {
+            ...this.appConfig,
         });
-    }
-    migrateCypressE2eProject() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const oldCypressConfigFilePath = this.getOldCypressConfigFilePath();
-            yield (0, cypress_1.cypressProjectGenerator)(this.tree, {
-                name: this.project.name,
-                project: this.appName,
-                linter: this.isProjectUsingEsLint ? linter_1.Linter.EsLint : linter_1.Linter.None,
-                standaloneConfig: true,
+        // add e2e project config
+        (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        }, true);
+        if (this.isProjectUsingEsLint) {
+            await (0, linter_1.lintProjectGenerator)(this.tree, {
+                project: this.project.name,
+                linter: linter_1.Linter.EsLint,
+                eslintFilePatterns: [`${this.project.newRoot}/**/*.{js,ts}`],
+                unitTestRunner: this.options.unitTestRunner,
+                tsConfigPaths: [
+                    (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'),
+                ],
                 skipFormat: true,
             });
-            const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
-            this.updateCypressProjectConfiguration(cypressConfigFilePath);
-            // replace the generated tsconfig.json with the project one
-            const newTsConfigPath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
-            this.tree.delete(newTsConfigPath);
-            this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldSourceRoot, 'tsconfig.json'), newTsConfigPath);
-            // replace the generated source with the project source
-            (0, devkit_1.visitNotIgnoredFiles)(this.tree, this.project.newSourceRoot, (filePath) => {
-                this.tree.delete(filePath);
-            });
-            this.moveDir(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.newSourceRoot));
+        }
+    }
+    async migrateCypressE2eProject() {
+        const oldCypressConfigFilePath = this.getOldCypressConfigFilePath();
+        await (0, cypress_1.cypressProjectGenerator)(this.tree, {
+            name: this.project.name,
+            project: this.appName,
+            linter: this.isProjectUsingEsLint ? linter_1.Linter.EsLint : linter_1.Linter.None,
+            standaloneConfig: true,
+            skipFormat: true,
+        });
+        const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
+        this.updateCypressProjectConfiguration(cypressConfigFilePath);
+        // replace the generated tsconfig.json with the project one
+        const newTsConfigPath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
+        this.tree.delete(newTsConfigPath);
+        this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldSourceRoot, 'tsconfig.json'), newTsConfigPath);
+        // replace the generated source with the project source
+        (0, devkit_1.visitNotIgnoredFiles)(this.tree, this.project.newSourceRoot, (filePath) => {
+            this.tree.delete(filePath);
         });
+        this.moveDir(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.newSourceRoot));
     }
     updateOrCreateCypressConfigFile(configFile) {
         if (!configFile) {
@@ -257,7 +271,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             this.projectConfig.root = this.project.newRoot;
             this.projectConfig.sourceRoot = this.project.newSourceRoot;
             (0, devkit_1.removeProjectConfiguration)(this.tree, generatedProjectName);
-            (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
+            (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, { ...this.projectConfig }, true);
         }
         else {
             this.projectConfig = (0, devkit_1.readProjectConfiguration)(this.tree, this.project.name);
@@ -278,14 +292,25 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
                 this.projectConfig.targets[target] = this.updateE2eCypressTarget(this.appConfig.targets[target], cypressConfigPath);
             }
         });
-        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        });
         delete this.appConfig.targets['cypress-run'];
         delete this.appConfig.targets['cypress-open'];
         delete this.appConfig.targets[this.targetNames.e2e];
-        (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, {
+            ...this.appConfig,
+        });
     }
     updateE2eCypressTarget(existingTarget, cypressConfig) {
-        const updatedTarget = Object.assign(Object.assign({}, existingTarget), { executor: '@nx/cypress:cypress', options: Object.assign(Object.assign({}, existingTarget.options), { cypressConfig }) });
+        const updatedTarget = {
+            ...existingTarget,
+            executor: '@nx/cypress:cypress',
+            options: {
+                ...existingTarget.options,
+                cypressConfig,
+            },
+        };
         delete updatedTarget.options.configFile;
         if (updatedTarget.options.tsConfig) {
             updatedTarget.options.tsConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
@@ -396,8 +421,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             }
         });
     }
-    updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, _a) {
-        var globalConfig = tslib_1.__rest(_a, []);
+    updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, { ...globalConfig }) {
         (0, ensure_typescript_1.ensureTypescript)();
         const { tsquery } = require('@phenomnomnominal/tsquery');
         const e2eConfig = {};

package/src/generators/ng-add/migrators/projects/lib.migrator.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LibMigrator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const devkit_2 = require("@nx/devkit");
 const utilities_1 = require("../../utilities");
@@ -16,45 +15,38 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project, logger) {
         super(tree, options, {}, project, 'libs', logger, supportedBuilderMigrators);
     }
-    migrate() {
-        const _super = Object.create(null, {
-            migrate: { get: () => super.migrate }
-        });
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.skipMigration === true) {
-                return;
-            }
-            yield _super.migrate.call(this);
-            yield this.updateProjectConfiguration();
-            this.moveProjectFiles();
-            for (const builderMigrator of (_a = this.builderMigrators) !== null && _a !== void 0 ? _a : []) {
-                yield builderMigrator.migrate();
-            }
-        });
+    async migrate() {
+        if (this.skipMigration === true) {
+            return;
+        }
+        await super.migrate();
+        await this.updateProjectConfiguration();
+        this.moveProjectFiles();
+        for (const builderMigrator of this.builderMigrators ?? []) {
+            await builderMigrator.migrate();
+        }
     }
     validate() {
-        var _a, _b;
-        const errors = [...((_a = super.validate()) !== null && _a !== void 0 ? _a : [])];
+        const errors = [...(super.validate() ?? [])];
         for (const builderMigrator of this.builderMigrators) {
-            errors.push(...((_b = builderMigrator.validate()) !== null && _b !== void 0 ? _b : []));
+            errors.push(...(builderMigrator.validate() ?? []));
         }
         return errors.length ? errors : null;
     }
     moveProjectFiles() {
         this.moveDir(this.project.oldRoot, this.project.newRoot);
     }
-    updateProjectConfiguration() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            (0, utilities_1.convertToNxProject)(this.tree, this.project.name);
-            this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'project.json'), (0, devkit_1.joinPathFragments)(this.project.newRoot, 'project.json'));
-            this.projectConfig.root = this.project.newRoot;
-            this.projectConfig.sourceRoot = this.project.newSourceRoot;
-            if (!this.projectConfig.targets ||
-                !Object.keys(this.projectConfig.targets).length) {
-                this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
-            }
-            (0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+    async updateProjectConfiguration() {
+        (0, utilities_1.convertToNxProject)(this.tree, this.project.name);
+        this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'project.json'), (0, devkit_1.joinPathFragments)(this.project.newRoot, 'project.json'));
+        this.projectConfig.root = this.project.newRoot;
+        this.projectConfig.sourceRoot = this.project.newSourceRoot;
+        if (!this.projectConfig.targets ||
+            !Object.keys(this.projectConfig.targets).length) {
+            this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
+        }
+        (0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
         });
     }
 }

package/src/generators/ng-add/migrators/projects/project.migrator.js

@@ -12,8 +12,7 @@ class ProjectMigrator extends migrator_1.Migrator {
     // TODO(leo): this will replace `targets` and become required once the full
     // refactor is done.
     supportedBuilderMigrators) {
-        var _a, _b;
-        super(tree, project.config, logger !== null && logger !== void 0 ? logger : new utilities_1.Logger(project.name));
+        super(tree, project.config, logger ?? new utilities_1.Logger(project.name));
         this.options = options;
         this.targets = targets;
         // TODO(leo): need to handle targets until all are converted to builder migrators,
@@ -23,9 +22,9 @@ class ProjectMigrator extends migrator_1.Migrator {
         this.targetNames = {};
         this.project = {
             name: project.name,
-            oldRoot: (_a = this.projectConfig.root) !== null && _a !== void 0 ? _a : '',
+            oldRoot: this.projectConfig.root ?? '',
             oldSourceRoot: this.projectConfig.sourceRoot ||
-                (0, devkit_1.joinPathFragments)((_b = this.projectConfig.root) !== null && _b !== void 0 ? _b : '', 'src'),
+                (0, devkit_1.joinPathFragments)(this.projectConfig.root ?? '', 'src'),
             newRoot: `${rootDir}/${project.name}`,
             newSourceRoot: `${rootDir}/${project.name}/src`,
         };
@@ -33,9 +32,8 @@ class ProjectMigrator extends migrator_1.Migrator {
         this.createBuilderMigrators(supportedBuilderMigrators);
     }
     getWorkspaceRootFileTypesInfo() {
-        var _a;
         const workspaceRootFileTypesInfo = {
-            eslint: Boolean((_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a.lint) ||
+            eslint: Boolean(this.projectConfig.targets?.lint) ||
                 this.tree.exists(`${this.projectConfig.root}/.eslintrc.json`),
             karma: this.builderMigrators.some((migrator) => migrator.rootFileType === 'karma' && migrator.isBuilderUsed()),
         };
@@ -49,7 +47,6 @@ class ProjectMigrator extends migrator_1.Migrator {
         this.logger.warn((0, utilities_1.getProjectValidationResultMessage)(validationResult));
     }
     validate() {
-        var _a, _b;
         const errors = [];
         // check project root
         if (this.projectConfig.root === undefined ||
@@ -91,7 +88,7 @@ class ProjectMigrator extends migrator_1.Migrator {
         ];
         allSupportedBuilders.push(...this.builderMigrators.map((migrator) => migrator.builderName));
         const unsupportedBuilders = [];
-        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
+        Object.entries(this.projectConfig.targets ?? {}).forEach(([targetName, target]) => {
             if (!allSupportedBuilders.includes(target.executor)) {
                 unsupportedBuilders.push([targetName, target.executor]);
             }
@@ -109,7 +106,7 @@ class ProjectMigrator extends migrator_1.Migrator {
         }
         // check for multiple targets for the same type of target
         const targetTypes = Object.keys(this.targets);
-        const targetsByType = Object.entries((_b = this.projectConfig.targets) !== null && _b !== void 0 ? _b : {}).reduce((acc, [target, { executor }]) => {
+        const targetsByType = Object.entries(this.projectConfig.targets ?? {}).reduce((acc, [target, { executor }]) => {
             targetTypes.forEach((targetType) => {
                 if (this.targets[targetType].builders.includes(executor)) {
                     acc[targetType].push(target);
@@ -117,7 +114,7 @@ class ProjectMigrator extends migrator_1.Migrator {
                 }
             });
             return acc;
-        }, targetTypes.reduce((acc, targetType) => (Object.assign(Object.assign({}, acc), { [targetType]: [] })), {}));
+        }, targetTypes.reduce((acc, targetType) => ({ ...acc, [targetType]: [] }), {}));
         targetTypes.forEach((targetType) => {
             if (this.targets[targetType].acceptMultipleDefinitions ||
                 targetsByType[targetType].length <= 1) {
@@ -132,10 +129,10 @@ class ProjectMigrator extends migrator_1.Migrator {
         return errors.length ? errors : null;
     }
     convertPath(originalPath) {
-        if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot)) {
+        if (originalPath?.startsWith(this.project.oldSourceRoot)) {
             return (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''));
         }
-        if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot)) {
+        if (originalPath?.startsWith(this.project.oldRoot)) {
             return (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''));
         }
         return originalPath;
@@ -150,9 +147,8 @@ class ProjectMigrator extends migrator_1.Migrator {
             this.skipMigration.includes(targetType));
     }
     collectTargetNames() {
-        var _a;
         const targetTypes = Object.keys(this.targets);
-        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
+        Object.entries(this.projectConfig.targets ?? {}).forEach(([targetName, target]) => {
             targetTypes.forEach((targetType) => {
                 if (!this.targetNames[targetType] &&
                     this.targets[targetType].builders.includes(target.executor)) {

package/src/generators/ng-add/ng-add.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAddGenerator = void 0;
-const tslib_1 = require("tslib");
 const init_1 = require("../init/init");
 const migrate_from_angular_cli_1 = require("./migrate-from-angular-cli");
 function getWorkspaceType(tree) {
     return tree.exists('nx.json') ? 'nx' : 'angular';
 }
-function ngAddGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (getWorkspaceType(tree) === 'angular') {
-            return yield (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
-        }
-        return yield (0, init_1.angularInitGenerator)(tree, options);
-    });
+async function ngAddGenerator(tree, options) {
+    if (getWorkspaceType(tree) === 'angular') {
+        return await (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
+    }
+    return await (0, init_1.angularInitGenerator)(tree, options);
 }
 exports.ngAddGenerator = ngAddGenerator;
 exports.default = ngAddGenerator;

package/src/generators/ng-add/utilities/dependencies.js

@@ -5,21 +5,20 @@ const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../../utils/version-utils");
 const version_utils_2 = require("../../utils/version-utils");
 function ensureAngularDevKitPeerDependenciesAreInstalled(tree) {
-    var _a;
     const packagesToInstall = [
         '@angular-devkit/core',
         '@angular-devkit/schematics',
         '@schematics/angular',
     ];
     const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    let angularCliVersion = (_a = devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies['@angular/cli']) !== null && _a !== void 0 ? _a : dependencies === null || dependencies === void 0 ? void 0 : dependencies['@angular/cli'];
+    let angularCliVersion = devDependencies?.['@angular/cli'] ?? dependencies?.['@angular/cli'];
     if (!angularCliVersion) {
         const angularMajorVersion = (0, version_utils_2.getInstalledAngularMajorVersion)(tree);
         const angularDevkitVersion = (0, version_utils_1.getPkgVersionForAngularMajorVersion)('angularDevkitVersion', angularMajorVersion);
         angularCliVersion = angularDevkitVersion;
     }
     const filteredPackages = packagesToInstall
-        .filter((pkg) => !(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[pkg]) && !(dependencies === null || dependencies === void 0 ? void 0 : dependencies[pkg]))
+        .filter((pkg) => !devDependencies?.[pkg] && !dependencies?.[pkg])
         .reduce((allPkgs, pkg) => {
         allPkgs[pkg] = angularCliVersion;
         return allPkgs;

package/src/generators/ng-add/utilities/format-files-task.js

@@ -11,6 +11,6 @@ function formatFilesTask(tree) {
     try {
         (0, child_process_1.runNxSync)(`format`, { cwd: tree.root, stdio: [0, 1, 2] });
     }
-    catch (_a) { }
+    catch { }
 }
 exports.formatFilesTask = formatFilesTask;

package/src/generators/ng-add/utilities/projects.js

@@ -30,6 +30,6 @@ function convertToNxProject(tree, projectName) {
     project.name = projectName;
     (0, devkit_1.addProjectConfiguration)(tree, projectName, project);
     delete angularJson.projects[projectName];
-    (0, devkit_1.writeJson)(tree, 'angular.json', Object.assign(Object.assign({}, angularJson), { version: 1 }));
+    (0, devkit_1.writeJson)(tree, 'angular.json', { ...angularJson, version: 1 });
 }
 exports.convertToNxProject = convertToNxProject;