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

package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js

@@ -7,7 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.augmentProgramWithVersioning = exports.cacheCompilerHost = void 0;
-const tslib_1 = require("tslib");
 const crypto_1 = require("crypto");
 const node_1 = require("ng-packagr/lib/graph/node");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
@@ -36,7 +35,8 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
     const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
     const flatModuleFileDtsPath = (0, path_1.ensureUnixPath)(path.join(destinationPath, flatModuleFileDtsFilename));
     const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';
-    return Object.assign(Object.assign({}, compilerHost), { 
+    return {
+        ...compilerHost,
         // ts specific
         fileExists: (fileName) => {
             const cache = sourcesFileCache.getOrCreate(fileName);
@@ -44,14 +44,16 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 cache.exists = compilerHost.fileExists.call(this, fileName);
             }
             return cache.exists;
-        }, getSourceFile: (fileName, languageVersion) => {
+        },
+        getSourceFile: (fileName, languageVersion) => {
             addDependee(fileName);
             const cache = sourcesFileCache.getOrCreate(fileName);
             if (!cache.sourceFile) {
                 cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);
             }
             return cache.sourceFile;
-        }, writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+        },
+        writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
             if (fileName.endsWith('.d.ts')) {
                 if (fileName === flatModuleFileDtsPath) {
                     if (hasIndexEntryFile) {
@@ -83,7 +85,7 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                     if (fileName.endsWith('.mjs')) {
                         const cachedData = outputCache.get(fileName);
                         map =
-                            (cachedData === null || cachedData === void 0 ? void 0 : cachedData.version) === version
+                            cachedData?.version === version
                                 ? cachedData.map
                                 : require('convert-source-map').fromComment(data).toJSON();
                     }
@@ -101,25 +103,29 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 }
             }
             compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);
-        }, readFile: (fileName) => {
+        },
+        readFile: (fileName) => {
             addDependee(fileName);
             const cache = sourcesFileCache.getOrCreate(fileName);
             if (cache.content === undefined) {
                 cache.content = compilerHost.readFile.call(this, fileName);
             }
             return cache.content;
-        }, resolveModuleNames: (moduleNames, containingFile) => {
+        },
+        resolveModuleNames: (moduleNames, containingFile) => {
             return moduleNames.map((moduleName) => {
                 const { resolvedModule } = ts.resolveModuleName(moduleName, (0, path_1.ensureUnixPath)(containingFile), compilerOptions, compilerHost, moduleResolutionCache);
                 return resolvedModule;
             });
-        }, resourceNameToFileName: (resourceName, containingFilePath) => {
+        },
+        resourceNameToFileName: (resourceName, containingFilePath) => {
             const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);
             const containingNode = getNode(containingFilePath);
             const resourceNode = getNode(resourcePath);
             containingNode.dependsOn(resourceNode);
             return resourcePath;
-        }, readResource: (fileName) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        },
+        readResource: async (fileName) => {
             addDependee(fileName);
             const cache = sourcesFileCache.getOrCreate(fileName);
             if (cache.content === undefined) {
@@ -132,7 +138,7 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 }
                 else {
                     // stylesheet
-                    cache.content = yield stylesheetProcessor.process({
+                    cache.content = await stylesheetProcessor.process({
                         filePath: fileName,
                         content: compilerHost.readFile.call(this, fileName),
                     });
@@ -140,7 +146,8 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 cache.exists = true;
             }
             return cache.content;
-        }), transformResource: (data, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        },
+        transformResource: async (data, context) => {
             if (context.resourceFile || context.type !== 'style') {
                 return null;
             }
@@ -149,7 +156,7 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 const fileName = `${context.containingFile}-${key}.${inlineStyleLanguage}`;
                 const cache = sourcesFileCache.getOrCreate(fileName);
                 if (cache.content === undefined) {
-                    cache.content = yield stylesheetProcessor.process({
+                    cache.content = await stylesheetProcessor.process({
                         filePath: context.containingFile,
                         content: data,
                     });
@@ -161,7 +168,8 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 return { content: cache.content };
             }
             return null;
-        }) });
+        },
+    };
 }
 exports.cacheCompilerHost = cacheCompilerHost;
 function augmentProgramWithVersioning(program) {

package/src/executors/package/ng-packagr-adjustments/utils/ng-compiler-cli.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngccCompilerCli = void 0;
-const tslib_1 = require("tslib");
-function ngccCompilerCli() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const compilerCliModule = yield new Function(`return import('@angular/compiler-cli/ngcc');`)();
-        return compilerCliModule.process
-            ? compilerCliModule
-            : compilerCliModule.default;
-    });
+async function ngccCompilerCli() {
+    const compilerCliModule = await new Function(`return import('@angular/compiler-cli/ngcc');`)();
+    return compilerCliModule.process
+        ? compilerCliModule
+        : compilerCliModule.default;
 }
 exports.ngccCompilerCli = ngccCompilerCli;

package/src/executors/package/package.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageExecutor = exports.createLibraryExecutor = void 0;
-const tslib_1 = require("tslib");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const path_1 = require("path");
@@ -11,25 +10,23 @@ const typescript_1 = require("../utilities/typescript");
 const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
 const options_di_1 = require("./ng-packagr-adjustments/ng-package/options.di");
 const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
-function initializeNgPackagr(options, context, projectDependencies) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const packager = new (yield Promise.resolve().then(() => require('ng-packagr'))).NgPackagr([
-            ...package_di_1.NX_PACKAGE_PROVIDERS,
-            ...entry_point_di_1.NX_ENTRY_POINT_PROVIDERS,
-            (0, options_di_1.nxProvideOptions)({
-                tailwindConfig: options.tailwindConfig,
-                watch: options.watch,
-            }),
-        ]);
-        packager.forProject((0, path_1.resolve)(context.root, options.project));
-        packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
-        if (options.tsConfig) {
-            const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
-            const tsConfig = yield (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
-            packager.withTsConfig(tsConfig);
-        }
-        return packager;
-    });
+async function initializeNgPackagr(options, context, projectDependencies) {
+    const packager = new (await Promise.resolve().then(() => require('ng-packagr'))).NgPackagr([
+        ...package_di_1.NX_PACKAGE_PROVIDERS,
+        ...entry_point_di_1.NX_ENTRY_POINT_PROVIDERS,
+        (0, options_di_1.nxProvideOptions)({
+            tailwindConfig: options.tailwindConfig,
+            watch: options.watch,
+        }),
+    ]);
+    packager.forProject((0, path_1.resolve)(context.root, options.project));
+    packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
+    if (options.tsConfig) {
+        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
+        packager.withTsConfig(tsConfig);
+    }
+    return packager;
 }
 /**
  * Creates an executor function that executes the library build of an Angular
@@ -37,25 +34,23 @@ function initializeNgPackagr(options, context, projectDependencies) {
  * @param initializeNgPackagr function that returns an ngPackagr instance to use for the build.
  */
 function createLibraryExecutor(initializeNgPackagr) {
-    return function (options, context) {
-        return tslib_1.__asyncGenerator(this, arguments, function* () {
-            const { target, dependencies, topLevelDependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-            if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
-                return yield tslib_1.__await(Promise.resolve({ success: false }));
-            }
-            function updatePackageJson() {
-                if (topLevelDependencies.length > 0 &&
-                    options.updateBuildableProjectDepsInPackageJson) {
-                    (0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, topLevelDependencies, options.buildableProjectDepsInPackageJsonType);
-                }
-            }
-            if (options.watch) {
-                return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.tap)(() => updatePackageJson()), (0, operators_1.mapTo)({ success: true })))))));
+    return async function* (options, context) {
+        const { target, dependencies, topLevelDependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+        if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
+            return Promise.resolve({ success: false });
+        }
+        function updatePackageJson() {
+            if (topLevelDependencies.length > 0 &&
+                options.updateBuildableProjectDepsInPackageJson) {
+                (0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, topLevelDependencies, options.buildableProjectDepsInPackageJsonType);
             }
-            return yield tslib_1.__await((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies))
-                .pipe((0, operators_1.switchMap)((packagr) => packagr.build()), (0, operators_1.tap)(() => updatePackageJson()), (0, operators_1.mapTo)({ success: true }))
-                .toPromise());
-        });
+        }
+        if (options.watch) {
+            return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.tap)(() => updatePackageJson()), (0, operators_1.mapTo)({ success: true })));
+        }
+        return (0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies))
+            .pipe((0, operators_1.switchMap)((packagr) => packagr.build()), (0, operators_1.tap)(() => updatePackageJson()), (0, operators_1.mapTo)({ success: true }))
+            .toPromise();
     };
 }
 exports.createLibraryExecutor = createLibraryExecutor;

package/src/executors/utilities/angular-version-utils.js

@@ -12,7 +12,7 @@ function getInstalledPackageVersionInfo(pkgName) {
         const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)(pkgName);
         return { major: (0, semver_1.major)(version), version };
     }
-    catch (_a) {
+    catch {
         return null;
     }
 }

package/src/executors/utilities/tailwindcss.js

@@ -27,7 +27,7 @@ function getTailwindSetup(basePath, tailwindConfig) {
     try {
         tailwindPackagePath = require.resolve('tailwindcss');
     }
-    catch (_a) {
+    catch {
         const relativeTailwindConfigPath = (0, path_1.relative)(devkit_2.workspaceRoot, tailwindConfigPath);
         devkit_1.logger.warn(`Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
             ` but the 'tailwindcss' package is not installed.` +
@@ -64,7 +64,7 @@ function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath },
     }
     return [
         postcssImport({
-            addModulesDirectories: includePaths !== null && includePaths !== void 0 ? includePaths : [],
+            addModulesDirectories: includePaths ?? [],
             resolve: (url) => (url.startsWith('~') ? url.substring(1) : url),
         }),
         require(tailwindPackagePath)({ config: tailwindConfigPath }),

package/src/executors/utilities/typescript.js

@@ -9,40 +9,35 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRemappedTsConfigAndMergeDefaults = void 0;
-const tslib_1 = require("tslib");
 const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const path_1 = require("path");
 const ts = require("typescript");
-function readDefaultTsConfig(fileName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // these options are mandatory
-        const extraOptions = {
-            target: ts.ScriptTarget.ES2020,
-            experimentalDecorators: true,
-            // sourcemaps
-            sourceMap: false,
-            inlineSources: true,
-            inlineSourceMap: true,
-            outDir: '',
-            declaration: true,
-            // ng compiler to options
-            enableResourceInlining: true,
-            // these are required to set the appropriate EmitFlags
-            flatModuleId: 'AUTOGENERATED',
-            flatModuleOutFile: 'AUTOGENERATED',
-        };
-        const { readConfiguration } = yield (0, ng_compiler_cli_1.ngCompilerCli)();
-        return readConfiguration(fileName, extraOptions);
-    });
+async function readDefaultTsConfig(fileName) {
+    // these options are mandatory
+    const extraOptions = {
+        target: ts.ScriptTarget.ES2020,
+        experimentalDecorators: true,
+        // sourcemaps
+        sourceMap: false,
+        inlineSources: true,
+        inlineSourceMap: true,
+        outDir: '',
+        declaration: true,
+        // ng compiler to options
+        enableResourceInlining: true,
+        // these are required to set the appropriate EmitFlags
+        flatModuleId: 'AUTOGENERATED',
+        flatModuleOutFile: 'AUTOGENERATED',
+    };
+    const { readConfiguration } = await (0, ng_compiler_cli_1.ngCompilerCli)();
+    return readConfiguration(fileName, extraOptions);
 }
 /**
  * Proxy function that ensures the configFilePath option points to the original file path.
  */
-function parseRemappedTsConfigAndMergeDefaults(workspaceRoot, originalFilePath, remappedFilePath) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const parsedConfiguration = yield readDefaultTsConfig(remappedFilePath);
-        parsedConfiguration.options.configFilePath = (0, path_1.resolve)(workspaceRoot, originalFilePath);
-        return parsedConfiguration;
-    });
+async function parseRemappedTsConfigAndMergeDefaults(workspaceRoot, originalFilePath, remappedFilePath) {
+    const parsedConfiguration = await readDefaultTsConfig(remappedFilePath);
+    parsedConfiguration.options.configFilePath = (0, path_1.resolve)(workspaceRoot, originalFilePath);
+    return parsedConfiguration;
 }
 exports.parseRemappedTsConfigAndMergeDefaults = parseRemappedTsConfigAndMergeDefaults;

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

@@ -1,92 +1,94 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
-function addLintingGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const rootProject = options.projectRoot === '.' || options.projectRoot === '';
-        const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
-            linter: linter_1.Linter.EsLint,
-            project: options.projectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            eslintFilePatterns: [
-                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
-                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
-            ],
-            setParserOptionsProject: options.setParserOptionsProject,
-            skipFormat: true,
-            rootProject: rootProject,
-        });
-        tasks.push(lintTask);
-        if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
-            const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
-            // keep parser options if they exist
-            const hasParserOptions = tree
-                .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
-                .includes(`${options.projectRoot}/tsconfig.*?.json`);
-            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                {
-                    files: ['*.json'],
-                    parser: 'jsonc-eslint-parser',
-                    rules: {},
-                },
-                Object.assign(Object.assign({ files: ['*.ts'] }, (hasParserOptions
+async function addLintingGenerator(tree, options) {
+    const tasks = [];
+    const rootProject = options.projectRoot === '.' || options.projectRoot === '';
+    const lintTask = await (0, linter_1.lintProjectGenerator)(tree, {
+        linter: linter_1.Linter.EsLint,
+        project: options.projectName,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        eslintFilePatterns: [
+            (0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
+            (0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
+        ],
+        setParserOptionsProject: options.setParserOptionsProject,
+        skipFormat: true,
+        rootProject: rootProject,
+    });
+    tasks.push(lintTask);
+    if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
+        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
+        // keep parser options if they exist
+        const hasParserOptions = tree
+            .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
+            .includes(`${options.projectRoot}/tsconfig.*?.json`);
+        (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+            {
+                files: ['*.json'],
+                parser: 'jsonc-eslint-parser',
+                rules: {},
+            },
+            {
+                files: ['*.ts'],
+                ...(hasParserOptions
                     ? {
                         parserOptions: {
                             project: [`${options.projectRoot}/tsconfig.*?.json`],
                         },
                     }
-                    : {})), { extends: [
-                        'plugin:@nx/angular',
-                        'plugin:@angular-eslint/template/process-inline-templates',
-                    ], rules: {
-                        '@angular-eslint/directive-selector': [
-                            'error',
-                            {
-                                type: 'attribute',
-                                prefix: (0, string_utils_1.camelize)(options.prefix),
-                                style: 'camelCase',
-                            },
-                        ],
-                        '@angular-eslint/component-selector': [
-                            'error',
-                            {
-                                type: 'element',
-                                prefix: (0, string_utils_1.dasherize)(options.prefix),
-                                style: 'kebab-case',
-                            },
-                        ],
-                    } }),
-                {
-                    files: ['*.html'],
-                    extends: ['plugin:@nx/angular-template'],
-                    /**
-                     * Having an empty rules object present makes it more obvious to the user where they would
-                     * extend things from if they needed to
-                     */
-                    rules: {},
+                    : {}),
+                extends: [
+                    'plugin:@nx/angular',
+                    'plugin:@angular-eslint/template/process-inline-templates',
+                ],
+                rules: {
+                    '@angular-eslint/directive-selector': [
+                        'error',
+                        {
+                            type: 'attribute',
+                            prefix: (0, string_utils_1.camelize)(options.prefix),
+                            style: 'camelCase',
+                        },
+                    ],
+                    '@angular-eslint/component-selector': [
+                        'error',
+                        {
+                            type: 'element',
+                            prefix: (0, string_utils_1.dasherize)(options.prefix),
+                            style: 'kebab-case',
+                        },
+                    ],
                 },
-            ]);
-        }
-        if (!options.skipPackageJson) {
-            const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
-            tasks.push(installTask);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+            },
+            {
+                files: ['*.html'],
+                extends: ['plugin:@nx/angular-template'],
+                /**
+                 * Having an empty rules object present makes it more obvious to the user where they would
+                 * extend things from if they needed to
+                 */
+                rules: {},
+            },
+        ]);
+    }
+    if (!options.skipPackageJson) {
+        const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
+        tasks.push(installTask);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.addLintingGenerator = addLintingGenerator;
 exports.default = addLintingGenerator;

package/src/generators/add-linting/lib/create-eslint-configuration.js

@@ -8,11 +8,15 @@ const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
  */
 const extendAngularEslintJson = (json, options) => {
     const overrides = [
-        Object.assign(Object.assign({}, json.overrides[0]), { files: ['*.ts'], extends: [
+        {
+            ...json.overrides[0],
+            files: ['*.ts'],
+            extends: [
                 ...(json.overrides[0].extends || []),
                 'plugin:@nx/angular',
                 'plugin:@angular-eslint/template/process-inline-templates',
-            ], rules: {
+            ],
+            rules: {
                 '@angular-eslint/directive-selector': [
                     'error',
                     {
@@ -29,7 +33,8 @@ const extendAngularEslintJson = (json, options) => {
                         style: 'kebab-case',
                     },
                 ],
-            } }),
+            },
+        },
         {
             files: ['*.html'],
             extends: ['plugin:@nx/angular-template'],
@@ -40,7 +45,10 @@ const extendAngularEslintJson = (json, options) => {
             rules: {},
         },
     ];
-    return Object.assign(Object.assign({}, json), { overrides });
+    return {
+        ...json,
+        overrides,
+    };
 };
 exports.extendAngularEslintJson = extendAngularEslintJson;
 /**