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

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularEslintLintMigrator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const path_1 = require("path");
@@ -11,13 +10,13 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
         super(tree, '@angular-eslint/builder:lint', 'eslint', project, projectConfig, logger);
     }
     migrate() {
-        var _a, _b;
         if (this.skipMigration) {
             return;
         }
         for (const [name, target] of this.targets) {
             this.oldEsLintConfigPath =
-                (_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
+                target.options?.eslintConfig ??
+                    (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
             this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
             this.moveProjectRootFile(this.oldEsLintConfigPath);
             this.updateTargetConfiguration(name, target);
@@ -34,42 +33,42 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
             }
         }
     }
-    updateTargetConfiguration(targetName, target) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            target.executor = '@nx/linter:eslint';
-            if (!target.options) {
-                this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
-                return;
-            }
-            const existEsLintConfigPath = this.tree.exists(this.newEsLintConfigPath);
-            if (!existEsLintConfigPath) {
-                this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
-            }
-            target.options.eslintConfig =
-                target.options.eslintConfig && this.newEsLintConfigPath;
-            target.options.lintFilePatterns =
-                target.options.lintFilePatterns &&
-                    target.options.lintFilePatterns.map((pattern) => {
-                        // replace the old source root with the new root, we want to lint all
-                        // matching files in the project, not just the ones in the source root
-                        if (pattern.startsWith(this.project.oldSourceRoot)) {
-                            return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldSourceRoot, ''));
-                        }
-                        // replace the old root with the new root
-                        if (pattern.startsWith(this.project.oldRoot)) {
-                            return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldRoot, ''));
-                        }
-                        // do nothing, warn about the pattern
-                        this.logger.warn(`The lint file pattern "${pattern}" specified in the "${targetName}" target is not contained in the project root or source root. The pattern will not be updated.`);
-                        return pattern;
-                    });
-            if (existEsLintConfigPath) {
-                const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
-                if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
-                    target.options.hasTypeAwareRules = true;
-                }
+    async updateTargetConfiguration(targetName, target) {
+        target.executor = '@nx/linter:eslint';
+        if (!target.options) {
+            this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
+            return;
+        }
+        const existEsLintConfigPath = this.tree.exists(this.newEsLintConfigPath);
+        if (!existEsLintConfigPath) {
+            this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
+        }
+        target.options.eslintConfig =
+            target.options.eslintConfig && this.newEsLintConfigPath;
+        target.options.lintFilePatterns =
+            target.options.lintFilePatterns &&
+                target.options.lintFilePatterns.map((pattern) => {
+                    // replace the old source root with the new root, we want to lint all
+                    // matching files in the project, not just the ones in the source root
+                    if (pattern.startsWith(this.project.oldSourceRoot)) {
+                        return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldSourceRoot, ''));
+                    }
+                    // replace the old root with the new root
+                    if (pattern.startsWith(this.project.oldRoot)) {
+                        return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldRoot, ''));
+                    }
+                    // do nothing, warn about the pattern
+                    this.logger.warn(`The lint file pattern "${pattern}" specified in the "${targetName}" target is not contained in the project root or source root. The pattern will not be updated.`);
+                    return pattern;
+                });
+        if (existEsLintConfigPath) {
+            const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
+            if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
+                target.options.hasTypeAwareRules = true;
             }
-            (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        }
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
         });
     }
     updateEsLintConfig() {
@@ -77,7 +76,6 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
             return;
         }
         (0, devkit_1.updateJson)(this.tree, this.newEsLintConfigPath, (json) => {
-            var _a;
             delete json.root;
             json.ignorePatterns = ['!**/*'];
             const rootEsLintConfigRelativePath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
@@ -91,9 +89,8 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
             else {
                 json.extends = rootEsLintConfigRelativePath;
             }
-            (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.forEach((override) => {
-                var _a;
-                if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
+            json.overrides?.forEach((override) => {
+                if (!override.parserOptions?.project) {
                     return;
                 }
                 override.parserOptions.project = [

package/src/generators/ng-add/migrators/builders/builder.migrator.js

@@ -33,8 +33,7 @@ class BuilderMigrator extends migrator_1.Migrator {
         return this.targets.size > 0;
     }
     collectBuilderTargets() {
-        var _a;
-        for (const [name, target] of Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {})) {
+        for (const [name, target] of Object.entries(this.projectConfig.targets ?? {})) {
             if (target.executor === this.builderName) {
                 this.targets.set(name, target);
             }

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

@@ -15,11 +15,11 @@ class Migrator {
             return this.convertSourceRootPath(asset);
         }
         else {
-            return Object.assign(Object.assign({}, asset), { input: this.convertSourceRootPath(asset.input) });
+            return { ...asset, input: this.convertSourceRootPath(asset.input) };
         }
     }
     convertRootPath(originalPath) {
-        return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot))
+        return originalPath?.startsWith(this.project.oldRoot)
             ? (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''))
             : originalPath;
     }
@@ -58,16 +58,14 @@ class Migrator {
     }
     // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.
     updateCacheableOperations(targetNames) {
-        var _a;
         if (!targetNames.length) {
             return;
         }
         const nxJson = (0, devkit_1.readNxJson)(this.tree);
-        Object.keys((_a = nxJson.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
-            var _a;
+        Object.keys(nxJson.tasksRunnerOptions ?? {}).forEach((taskRunnerName) => {
             const taskRunner = nxJson.tasksRunnerOptions[taskRunnerName];
             taskRunner.options.cacheableOperations = Array.from(new Set([
-                ...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
+                ...(taskRunner.options.cacheableOperations ?? []),
                 ...targetNames,
             ]));
         });
@@ -76,26 +74,24 @@ class Migrator {
     // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.
     updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot) {
         (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
-            var _a;
             json.extends = `${projectOffsetFromRoot}${rootTsConfigFile}`;
-            json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
+            json.compilerOptions = json.compilerOptions ?? {};
             json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
             return json;
         });
     }
     convertSourceRootPath(originalPath) {
-        return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot))
+        return originalPath?.startsWith(this.project.oldSourceRoot)
             ? (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''))
             : originalPath;
     }
     getTargetValuesForOption(target, optionPath) {
-        var _a;
         const values = new Set();
         const value = this.getValueForOption(target.options, optionPath);
         if (value) {
             values.add(value);
         }
-        for (const configuration of Object.values((_a = target.configurations) !== null && _a !== void 0 ? _a : {})) {
+        for (const configuration of Object.values(target.configurations ?? {})) {
             const value = this.getValueForOption(configuration, optionPath);
             if (value) {
                 values.add(value);

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppMigrator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
@@ -37,35 +36,28 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             ? Object.keys(eslintBuilderMigrator.targets)[0]
             : undefined);
     }
-    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);
-            this.updateProjectConfiguration();
-            yield this.e2eMigrator.migrate();
-            this.moveProjectFiles();
-            this.updateProjectConfigurationTargets();
-            for (const builderMigrator of (_a = this.builderMigrators) !== null && _a !== void 0 ? _a : []) {
-                yield builderMigrator.migrate();
-            }
-            this.updateTsConfigs();
-            this.setCacheableOperations();
-        });
+    async migrate() {
+        if (this.skipMigration === true) {
+            return;
+        }
+        await super.migrate();
+        this.updateProjectConfiguration();
+        await this.e2eMigrator.migrate();
+        this.moveProjectFiles();
+        this.updateProjectConfigurationTargets();
+        for (const builderMigrator of this.builderMigrators ?? []) {
+            await builderMigrator.migrate();
+        }
+        this.updateTsConfigs();
+        this.setCacheableOperations();
     }
     validate() {
-        var _a, _b, _c;
         const errors = [
-            ...((_a = super.validate()) !== null && _a !== void 0 ? _a : []),
-            ...((_b = this.e2eMigrator.validate()) !== null && _b !== void 0 ? _b : []),
+            ...(super.validate() ?? []),
+            ...(this.e2eMigrator.validate() ?? []),
         ];
         for (const builderMigrator of this.builderMigrators) {
-            errors.push(...((_c = builderMigrator.validate()) !== null && _c !== void 0 ? _c : []));
+            errors.push(...(builderMigrator.validate() ?? []));
         }
         return errors.length ? errors : null;
     }
@@ -105,7 +97,9 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         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;
-        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        });
     }
     updateProjectConfigurationTargets() {
         if (!this.projectConfig.targets ||
@@ -117,7 +111,9 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         this.updateServerTargetConfiguration();
         this.updatePrerenderTargetConfiguration();
         this.updateServeSsrTargetConfiguration();
-        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        });
     }
     updateTsConfigs() {
         const rootTsConfigFile = (0, js_1.getRootTsConfigPathInTree)(this.tree);
@@ -174,7 +170,6 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                 }));
     }
     updateBuildTargetConfiguration() {
-        var _a, _b, _c, _d, _e, _f;
         if (!this.targetNames.build) {
             this.logger.warn('There is no build target in the project configuration. Skipping updating the build target configuration.');
             return;
@@ -189,7 +184,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             this.logger.warn(`The target "${this.targetNames.build}" is not specifying any options or configurations. Skipping updating the target configuration.`);
             return;
         }
-        const buildDevTsConfig = (_b = (_a = buildTarget.options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = buildTarget.configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        const buildDevTsConfig = buildTarget.options?.tsConfig ??
+            buildTarget.configurations?.development?.tsConfig;
         if (!buildDevTsConfig) {
             this.logger.warn(`The "${this.targetNames.build}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
         }
@@ -199,8 +195,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                 this.logger.warn(`The tsConfig file "${buildDevTsConfig}" specified in the "${this.targetNames.build}" target could not be found. Skipping updating the tsConfig file.`);
             }
         }
-        this.convertBuildOptions((_e = buildTarget.options) !== null && _e !== void 0 ? _e : {});
-        Object.values((_f = buildTarget.configurations) !== null && _f !== void 0 ? _f : {}).forEach((config) => this.convertBuildOptions(config));
+        this.convertBuildOptions(buildTarget.options ?? {});
+        Object.values(buildTarget.configurations ?? {}).forEach((config) => this.convertBuildOptions(config));
     }
     updatePrerenderTargetConfiguration() {
         if (!this.targetNames.prerender ||
@@ -217,7 +213,6 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                 this.convertPath(prerenderTarget.options.routesFile);
     }
     updateServerTargetConfiguration() {
-        var _a, _b, _c, _d, _e, _f;
         if (!this.targetNames.server ||
             this.shouldSkipTargetTypeMigration('server')) {
             return;
@@ -229,7 +224,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             this.logger.warn(`The target "${this.targetNames.server}" is not specifying any options or configurations. Skipping updating the target configuration.`);
             return;
         }
-        const serverDevTsConfig = (_b = (_a = serverTarget.options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = serverTarget.configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        const serverDevTsConfig = serverTarget.options?.tsConfig ??
+            serverTarget.configurations?.development?.tsConfig;
         if (!serverDevTsConfig) {
             this.logger.warn(`The "${this.targetNames.server}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
         }
@@ -239,8 +235,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                 this.logger.warn(`The tsConfig file "${serverDevTsConfig}" specified in the "${this.targetNames.server}" target could not be found. Skipping updating the tsConfig file.`);
             }
         }
-        this.convertServerOptions((_e = serverTarget.options) !== null && _e !== void 0 ? _e : {});
-        Object.values((_f = serverTarget.configurations) !== null && _f !== void 0 ? _f : {}).forEach((config) => this.convertServerOptions(config));
+        this.convertServerOptions(serverTarget.options ?? {});
+        Object.values(serverTarget.configurations ?? {}).forEach((config) => this.convertServerOptions(config));
     }
     updateServeSsrTargetConfiguration() {
         if (!this.targetNames.serveSsr ||
@@ -255,13 +251,12 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             return;
         }
         ['sslKey', 'sslCert', 'proxyConfig'].forEach((option) => {
-            var _a;
             if (serveSsrTarget.options) {
                 serveSsrTarget.options[option] =
                     serveSsrTarget.options[option] &&
                         this.convertPath(serveSsrTarget.options[option]);
             }
-            for (const configuration of Object.values((_a = serveSsrTarget.configurations) !== null && _a !== void 0 ? _a : {})) {
+            for (const configuration of Object.values(serveSsrTarget.configurations ?? {})) {
                 serveSsrTarget.configurations[configuration][option] =
                     serveSsrTarget.configurations[configuration][option] &&
                         this.convertPath(serveSsrTarget.configurations[configuration][option]);
@@ -269,12 +264,13 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         });
     }
     updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot) {
-        var _a, _b, _c, _d;
         if (!this.targetNames.build ||
             this.shouldSkipTargetTypeMigration('build')) {
             return;
         }
-        const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.build].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.build].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        const tsConfigPath = this.projectConfig.targets[this.targetNames.build].options?.tsConfig ??
+            this.projectConfig.targets[this.targetNames.build].configurations
+                ?.development?.tsConfig;
         if (!tsConfigPath || !this.tree.exists(tsConfigPath)) {
             // we already logged a warning for these cases, so just return
             return;
@@ -282,19 +278,19 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         this.updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot);
     }
     updateTsConfigFileUsedByServerTarget(projectOffsetFromRoot) {
-        var _a, _b, _c, _d;
         if (!this.targetNames.server ||
             this.shouldSkipTargetTypeMigration('server')) {
             return;
         }
-        const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.server].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.server].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        const tsConfigPath = this.projectConfig.targets[this.targetNames.server].options?.tsConfig ??
+            this.projectConfig.targets[this.targetNames.server].configurations
+                ?.development?.tsConfig;
         if (!tsConfigPath || !this.tree.exists(tsConfigPath)) {
             // we already logged a warning for these cases, so just return
             return;
         }
         (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
-            var _a;
-            json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
+            json.compilerOptions = json.compilerOptions ?? {};
             json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
             return json;
         });