@nx/plugin 16.8.0-beta.3 → 16.8.0-beta.5

package/src/generators/executor/executor.js

@@ -1,75 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executorSchematic = exports.executorGenerator = exports.createExecutorsJson = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
 const versions_1 = require("../../utils/versions");
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), `${options.projectSourceRoot}/executors`, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), `${options.projectSourceRoot}/executors`, {
+        ...options,
+        tmpl: '',
+    });
     if (options.unitTestRunner === 'none') {
         host.delete((0, devkit_1.joinPathFragments)(options.projectSourceRoot, 'executors', options.fileName, `executor.spec.ts`));
     }
 }
 function addHasherFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/hasher'), `${options.projectSourceRoot}/executors`, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/hasher'), `${options.projectSourceRoot}/executors`, {
+        ...options,
+        tmpl: '',
+    });
     if (options.unitTestRunner === 'none') {
         host.delete((0, devkit_1.joinPathFragments)(options.projectSourceRoot, 'executors', options.fileName, 'hasher.spec.ts'));
     }
 }
-function createExecutorsJson(host, projectRoot, projectName, skipLintChecks) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'), (json) => {
-            var _a;
-            (_a = json.executors) !== null && _a !== void 0 ? _a : (json.executors = './executors.json');
-            return json;
-        });
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'executors.json'), {
-            executors: {},
-        });
-        if (!skipLintChecks) {
-            yield (0, generator_1.default)(host, {
-                projectName,
-            });
-        }
+async function createExecutorsJson(host, projectRoot, projectName, skipLintChecks) {
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'), (json) => {
+        json.executors ??= './executors.json';
+        return json;
+    });
+    (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'executors.json'), {
+        executors: {},
     });
+    if (!skipLintChecks) {
+        await (0, generator_1.default)(host, {
+            projectName,
+        });
+    }
 }
 exports.createExecutorsJson = createExecutorsJson;
-function updateExecutorJson(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
-        const packageJsonExecutors = (_a = packageJson.executors) !== null && _a !== void 0 ? _a : packageJson.builders;
-        let executorsPath = packageJsonExecutors
-            ? (0, devkit_1.joinPathFragments)(options.projectRoot, packageJsonExecutors)
-            : null;
-        if (!executorsPath) {
-            executorsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'executors.json');
-        }
-        if (!host.exists(executorsPath)) {
-            yield createExecutorsJson(host, options.projectRoot, options.project, options.skipLintChecks);
+async function updateExecutorJson(host, options) {
+    const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
+    const packageJsonExecutors = packageJson.executors ?? packageJson.builders;
+    let executorsPath = packageJsonExecutors
+        ? (0, devkit_1.joinPathFragments)(options.projectRoot, packageJsonExecutors)
+        : null;
+    if (!executorsPath) {
+        executorsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'executors.json');
+    }
+    if (!host.exists(executorsPath)) {
+        await createExecutorsJson(host, options.projectRoot, options.project, options.skipLintChecks);
+    }
+    // add dependencies
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+        json.dependencies = {
+            '@nx/devkit': versions_1.nxVersion,
+            ...json.dependencies,
+        };
+        return json;
+    });
+    return (0, devkit_1.updateJson)(host, executorsPath, (json) => {
+        let executors = json.executors ?? json.builders;
+        executors ||= {};
+        executors[options.name] = {
+            implementation: `./src/executors/${options.fileName}/executor`,
+            schema: `./src/executors/${options.fileName}/schema.json`,
+            description: options.description,
+        };
+        if (options.includeHasher) {
+            executors[options.name].hasher = `./src/executors/${options.fileName}/hasher`;
         }
-        // add dependencies
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
-            json.dependencies = Object.assign({ '@nx/devkit': versions_1.nxVersion }, json.dependencies);
-            return json;
-        });
-        return (0, devkit_1.updateJson)(host, executorsPath, (json) => {
-            var _a;
-            let executors = (_a = json.executors) !== null && _a !== void 0 ? _a : json.builders;
-            executors || (executors = {});
-            executors[options.name] = {
-                implementation: `./src/executors/${options.fileName}/executor`,
-                schema: `./src/executors/${options.fileName}/schema.json`,
-                description: options.description,
-            };
-            if (options.includeHasher) {
-                executors[options.name].hasher = `./src/executors/${options.fileName}/hasher`;
-            }
-            json.executors = executors;
-            return json;
-        });
+        json.executors = executors;
+        return json;
     });
 }
 function normalizeOptions(host, options) {
@@ -83,26 +84,27 @@ function normalizeOptions(host, options) {
     else {
         description = `${options.name} executor`;
     }
-    return Object.assign(Object.assign({}, options), { fileName,
+    return {
+        ...options,
+        fileName,
         className,
         propertyName,
         description,
         projectRoot,
         projectSourceRoot,
-        npmScope });
+        npmScope,
+    };
 }
-function executorGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
-        addFiles(host, options);
-        if (options.includeHasher) {
-            addHasherFiles(host, options);
-        }
-        yield updateExecutorJson(host, options);
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-    });
+async function executorGenerator(host, schema) {
+    const options = normalizeOptions(host, schema);
+    addFiles(host, options);
+    if (options.includeHasher) {
+        addHasherFiles(host, options);
+    }
+    await updateExecutorJson(host, options);
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.executorGenerator = executorGenerator;
 exports.default = executorGenerator;

package/src/generators/generator/generator.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatorSchematic = exports.generatorGenerator = exports.createGeneratorsJson = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const has_generator_1 = require("../../utils/has-generator");
@@ -18,91 +17,93 @@ function normalizeOptions(host, options) {
     else {
         description = `${options.name} generator`;
     }
-    return Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { description,
+    return {
+        ...options,
+        ...(0, devkit_1.names)(options.name),
+        description,
         projectRoot,
         projectSourceRoot,
         npmScope,
-        npmPackageName });
+        npmPackageName,
+    };
 }
 function addFiles(host, options) {
     const indexPath = `${options.projectSourceRoot}/generators/${options.fileName}/files/src/index.ts.template`;
     if (!host.exists(indexPath)) {
         host.write(indexPath, 'const variable = "<%= name %>";');
     }
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, Object.assign(Object.assign({}, options), { generatorFnName: `${options.propertyName}Generator`, schemaInterfaceName: `${options.className}GeneratorSchema` }));
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, {
+        ...options,
+        generatorFnName: `${options.propertyName}Generator`,
+        schemaInterfaceName: `${options.className}GeneratorSchema`,
+    });
     if (options.unitTestRunner === 'none') {
         host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
     }
 }
-function createGeneratorsJson(host, projectRoot, projectName, skipLintChecks, skipFormat) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'), (json) => {
-            var _a;
-            (_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = './generators.json');
-            return json;
-        });
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'generators.json'), {
-            generators: {},
-        });
-        if (!skipLintChecks) {
-            yield (0, generator_1.default)(host, {
-                projectName,
-                skipFormat,
-            });
-        }
+async function createGeneratorsJson(host, projectRoot, projectName, skipLintChecks, skipFormat) {
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'), (json) => {
+        json.generators ??= './generators.json';
+        return json;
+    });
+    (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'generators.json'), {
+        generators: {},
     });
+    if (!skipLintChecks) {
+        await (0, generator_1.default)(host, {
+            projectName,
+            skipFormat,
+        });
+    }
 }
 exports.createGeneratorsJson = createGeneratorsJson;
-function updateGeneratorJson(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
-        const packageJsonGenerators = (_a = packageJson.generators) !== null && _a !== void 0 ? _a : packageJson.schematics;
-        let generatorsPath = packageJsonGenerators
-            ? (0, devkit_1.joinPathFragments)(options.projectRoot, packageJsonGenerators)
-            : null;
-        if (!generatorsPath) {
-            generatorsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'generators.json');
-        }
-        if (!host.exists(generatorsPath)) {
-            yield createGeneratorsJson(host, options.projectRoot, options.project, options.skipLintChecks, options.skipFormat);
-        }
-        // add dependencies
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
-            json.dependencies = Object.assign({ '@nx/devkit': versions_1.nxVersion }, json.dependencies);
-            return json;
-        });
-        (0, devkit_1.updateJson)(host, generatorsPath, (json) => {
-            var _a;
-            let generators = (_a = json.generators) !== null && _a !== void 0 ? _a : json.schematics;
-            generators = generators || {};
-            generators[options.name] = {
-                factory: `./src/generators/${options.fileName}/generator`,
-                schema: `./src/generators/${options.fileName}/schema.json`,
-                description: options.description,
-            };
-            // @todo(v17): Remove this, prop is defunct.
-            if (options.name === 'preset') {
-                generators[options.name]['x-use-standalone-layout'] = true;
-            }
-            json.generators = generators;
-            return json;
-        });
+async function updateGeneratorJson(host, options) {
+    const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
+    const packageJsonGenerators = packageJson.generators ?? packageJson.schematics;
+    let generatorsPath = packageJsonGenerators
+        ? (0, devkit_1.joinPathFragments)(options.projectRoot, packageJsonGenerators)
+        : null;
+    if (!generatorsPath) {
+        generatorsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'generators.json');
+    }
+    if (!host.exists(generatorsPath)) {
+        await createGeneratorsJson(host, options.projectRoot, options.project, options.skipLintChecks, options.skipFormat);
+    }
+    // add dependencies
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+        json.dependencies = {
+            '@nx/devkit': versions_1.nxVersion,
+            ...json.dependencies,
+        };
+        return json;
     });
-}
-function generatorGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
-        if ((0, has_generator_1.hasGenerator)(host, options.project, options.name)) {
-            throw new Error(`Generator ${options.name} already exists.`);
-        }
-        addFiles(host, options);
-        yield updateGeneratorJson(host, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+    (0, devkit_1.updateJson)(host, generatorsPath, (json) => {
+        let generators = json.generators ?? json.schematics;
+        generators = generators || {};
+        generators[options.name] = {
+            factory: `./src/generators/${options.fileName}/generator`,
+            schema: `./src/generators/${options.fileName}/schema.json`,
+            description: options.description,
+        };
+        // @todo(v17): Remove this, prop is defunct.
+        if (options.name === 'preset') {
+            generators[options.name]['x-use-standalone-layout'] = true;
         }
+        json.generators = generators;
+        return json;
     });
 }
+async function generatorGenerator(host, schema) {
+    const options = normalizeOptions(host, schema);
+    if ((0, has_generator_1.hasGenerator)(host, options.project, options.name)) {
+        throw new Error(`Generator ${options.name} already exists.`);
+    }
+    addFiles(host, options);
+    await updateGeneratorJson(host, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+}
 exports.generatorGenerator = generatorGenerator;
 exports.default = generatorGenerator;
 exports.generatorSchematic = (0, devkit_1.convertNxGenerator)(generatorGenerator);

package/src/generators/lint-checks/generator.js

@@ -1,43 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEsLintOptions = exports.addMigrationJsonChecks = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const logger_1 = require("nx/src/utils/logger");
 const package_json_1 = require("nx/src/utils/package-json");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
 const flat_config_1 = require("@nx/linter/src/utils/flat-config");
-function pluginLintCheckGenerator(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-        const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
-        // This rule is eslint **only**
-        if (projectIsEsLintEnabled(project)) {
-            updateRootEslintConfig(host);
-            updateProjectEslintConfig(host, project, packageJson);
-            updateProjectTarget(host, options, packageJson);
-            // Project is setup for vscode
-            if (host.exists('.vscode')) {
-                setupVsCodeLintingForJsonFiles(host);
-            }
-            // Project contains migrations.json
-            const migrationsPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
-            if (migrationsPath &&
-                host.exists((0, devkit_1.joinPathFragments)(project.root, migrationsPath))) {
-                addMigrationJsonChecks(host, options, packageJson);
-            }
-        }
-        else {
-            devkit_1.logger.error(`${logger_1.NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`);
+async function pluginLintCheckGenerator(host, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+    const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
+    // This rule is eslint **only**
+    if (projectIsEsLintEnabled(project)) {
+        updateRootEslintConfig(host);
+        updateProjectEslintConfig(host, project, packageJson);
+        updateProjectTarget(host, options, packageJson);
+        // Project is setup for vscode
+        if (host.exists('.vscode')) {
+            setupVsCodeLintingForJsonFiles(host);
         }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+        // Project contains migrations.json
+        const migrationsPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
+        if (migrationsPath &&
+            host.exists((0, devkit_1.joinPathFragments)(project.root, migrationsPath))) {
+            addMigrationJsonChecks(host, options, packageJson);
         }
-    });
+    }
+    else {
+        devkit_1.logger.error(`${logger_1.NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.default = pluginLintCheckGenerator;
 function addMigrationJsonChecks(host, options, packageJson) {
-    var _a, _b;
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (!projectIsEsLintEnabled(projectConfiguration)) {
         return;
@@ -49,25 +45,24 @@ function addMigrationJsonChecks(host, options, packageJson) {
     }
     const migrationsJsonPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, relativeMigrationsJsonPath);
     if (eslintTarget &&
-        !((_b = (_a = eslintTargetConfiguration.options) === null || _a === void 0 ? void 0 : _a.lintFilePatterns) === null || _b === void 0 ? void 0 : _b.includes(migrationsJsonPath))) {
+        !eslintTargetConfiguration.options?.lintFilePatterns?.includes(migrationsJsonPath)) {
         // Add to lintFilePatterns
         eslintTargetConfiguration.options.lintFilePatterns.push(migrationsJsonPath);
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
         // Update project level eslintrc
-        (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => {
-            var _a, _b, _c, _d;
-            return ((_b = Object.keys((_a = o.rules) !== null && _a !== void 0 ? _a : {})) === null || _b === void 0 ? void 0 : _b.includes('@nx/nx-plugin-checks')) ||
-                ((_d = Object.keys((_c = o.rules) !== null && _c !== void 0 ? _c : {})) === null || _d === void 0 ? void 0 : _d.includes('@nrwl/nx/nx-plugin-checks'));
-        }, (o) => {
+        (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
+            Object.keys(o.rules ?? {})?.includes('@nrwl/nx/nx-plugin-checks'), (o) => {
             const fileSet = new Set(Array.isArray(o.files) ? o.files : [o.files]);
             fileSet.add(relativeMigrationsJsonPath);
-            return Object.assign(Object.assign({}, o), { files: Array.from(fileSet) });
+            return {
+                ...o,
+                files: Array.from(fileSet),
+            };
         });
     }
 }
 exports.addMigrationJsonChecks = addMigrationJsonChecks;
 function updateProjectTarget(host, options, packageJson) {
-    var _a, _b;
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (!project.targets) {
         return;
@@ -75,8 +70,8 @@ function updateProjectTarget(host, options, packageJson) {
     for (const [target, configuration] of Object.entries(project.targets)) {
         if (configuration.executor === '@nx/linter:eslint' ||
             configuration.executor === '@nrwl/linter:eslint') {
-            const opts = (_a = configuration.options) !== null && _a !== void 0 ? _a : {};
-            (_b = opts.lintFilePatterns) !== null && _b !== void 0 ? _b : (opts.lintFilePatterns = []);
+            const opts = configuration.options ?? {};
+            opts.lintFilePatterns ??= [];
             if (packageJson.generators) {
                 opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.generators));
             }
@@ -100,11 +95,8 @@ function updateProjectTarget(host, options, packageJson) {
 }
 function updateProjectEslintConfig(host, options, packageJson) {
     if ((0, eslint_file_1.isEslintConfigSupported)(host, options.root)) {
-        const lookup = (o) => {
-            var _a, _b;
-            return Object.keys((_a = o.rules) !== null && _a !== void 0 ? _a : {}).includes('@nx/nx-plugin-checks') ||
-                Object.keys((_b = o.rules) !== null && _b !== void 0 ? _b : {}).includes('@nrwl/nx/nx-plugin-checks');
-        };
+        const lookup = (o) => Object.keys(o.rules ?? {}).includes('@nx/nx-plugin-checks') ||
+            Object.keys(o.rules ?? {}).includes('@nrwl/nx/nx-plugin-checks');
         const files = [
             './package.json',
             packageJson.generators,
@@ -117,18 +109,30 @@ function updateProjectEslintConfig(host, options, packageJson) {
             : { parser: 'jsonc-eslint-parser' };
         if ((0, eslint_file_1.lintConfigHasOverride)(host, options.root, lookup)) {
             // update it
-            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => (Object.assign(Object.assign(Object.assign(Object.assign({}, o), { files: [
+            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => ({
+                ...o,
+                files: [
                     ...new Set([
                         ...(Array.isArray(o.files) ? o.files : [o.files]),
                         ...files,
                     ]),
-                ] }), parser), { rules: Object.assign(Object.assign({}, o.rules), { '@nx/nx-plugin-checks': 'error' }) })));
+                ],
+                ...parser,
+                rules: {
+                    ...o.rules,
+                    '@nx/nx-plugin-checks': 'error',
+                },
+            }));
         }
         else {
             // add it
-            (0, eslint_file_1.addOverrideToLintConfig)(host, options.root, Object.assign(Object.assign({ files }, parser), { rules: {
+            (0, eslint_file_1.addOverrideToLintConfig)(host, options.root, {
+                files,
+                ...parser,
+                rules: {
                     '@nx/nx-plugin-checks': 'error',
-                } }));
+                },
+            });
         }
     }
 }
@@ -137,12 +141,9 @@ function updateProjectEslintConfig(host, options, packageJson) {
 // will display false errors in the IDE
 function updateRootEslintConfig(host) {
     if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-        if (!(0, eslint_file_1.lintConfigHasOverride)(host, '', (o) => {
-            var _a;
-            return Array.isArray(o.files)
-                ? o.files.some((f) => f.match(/\.json$/))
-                : !!((_a = o.files) === null || _a === void 0 ? void 0 : _a.match(/\.json$/));
-        }, true)) {
+        if (!(0, eslint_file_1.lintConfigHasOverride)(host, '', (o) => Array.isArray(o.files)
+            ? o.files.some((f) => f.match(/\.json$/))
+            : !!o.files?.match(/\.json$/), true)) {
             (0, eslint_file_1.addOverrideToLintConfig)(host, '', {
                 files: '*.json',
                 parser: 'jsonc-eslint-parser',
@@ -162,7 +163,6 @@ function updateRootEslintConfig(host) {
     }
 }
 function setupVsCodeLintingForJsonFiles(host) {
-    var _a;
     let existing = {};
     if (host.exists('.vscode/settings.json')) {
         existing = (0, devkit_1.readJson)(host, '.vscode/settings.json');
@@ -171,7 +171,7 @@ function setupVsCodeLintingForJsonFiles(host) {
         devkit_1.logger.info(`${logger_1.NX_PREFIX} We've updated the vscode settings for this repository to ensure that plugin lint checks show up inside your IDE. This created .vscode/settings.json. To read more about this file, check vscode's documentation. It is frequently not committed, so other developers may need to add similar settings if they'd like to see the lint checks in the IDE rather than only during linting.`);
     }
     // setup eslint validation for json files
-    const eslintValidate = (_a = existing['eslint.validate']) !== null && _a !== void 0 ? _a : [];
+    const eslintValidate = existing['eslint.validate'] ?? [];
     if (!eslintValidate.includes('json')) {
         existing['eslint.validate'] = [...eslintValidate, 'json'];
     }

package/src/generators/migration/migration.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrationSchematic = exports.migrationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
 const package_json_1 = require("nx/src/utils/package-json");
 const versions_1 = require("../../utils/versions");
 function normalizeOptions(host, options) {
-    var _a;
     let name;
     if (options.name) {
         name = (0, devkit_1.names)(options.name).fileName;
@@ -16,25 +14,27 @@ function normalizeOptions(host, options) {
     else {
         name = (0, devkit_1.names)(`update-${options.packageVersion}`).fileName;
     }
-    const description = (_a = options.description) !== null && _a !== void 0 ? _a : name;
+    const description = options.description ?? name;
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const normalized = Object.assign(Object.assign({}, options), { name,
+    const normalized = {
+        ...options,
+        name,
         description,
         projectRoot,
-        projectSourceRoot });
+        projectSourceRoot,
+    };
     return normalized;
 }
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), `${options.projectSourceRoot}/migrations`, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), `${options.projectSourceRoot}/migrations`, { ...options, tmpl: '' });
 }
 function updateMigrationsJson(host, options) {
-    var _a, _b;
     const configuredMigrationPath = (0, package_json_1.readNxMigrateConfig)((0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'))).migrations;
-    const migrationsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, configuredMigrationPath !== null && configuredMigrationPath !== void 0 ? configuredMigrationPath : 'migrations.json');
+    const migrationsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, configuredMigrationPath ?? 'migrations.json');
     const migrations = host.exists(migrationsPath)
         ? (0, devkit_1.readJson)(host, migrationsPath)
         : {};
-    const generators = (_a = migrations.generators) !== null && _a !== void 0 ? _a : {};
+    const generators = migrations.generators ?? {};
     generators[options.name] = {
         version: options.packageVersion,
         description: options.description,
@@ -42,7 +42,7 @@ function updateMigrationsJson(host, options) {
     };
     migrations.generators = generators;
     if (options.packageJsonUpdates) {
-        const packageJsonUpdatesObj = (_b = migrations.packageJsonUpdates) !== null && _b !== void 0 ? _b : {};
+        const packageJsonUpdatesObj = migrations.packageJsonUpdates ?? {};
         if (!packageJsonUpdatesObj[options.packageVersion]) {
             packageJsonUpdatesObj[options.packageVersion] = {
                 version: options.packageVersion,
@@ -69,14 +69,16 @@ function updatePackageJson(host, options) {
             preexistingValue.migrations = './migrations.json';
         }
         // add dependencies
-        json.dependencies = Object.assign({ '@nx/devkit': versions_1.nxVersion }, json.dependencies);
+        json.dependencies = {
+            '@nx/devkit': versions_1.nxVersion,
+            ...json.dependencies,
+        };
         return json;
     });
 }
 function updateWorkspaceJson(host, options) {
-    var _a, _b;
     const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const assets = (_b = (_a = project.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.assets;
+    const assets = project.targets.build?.options?.assets;
     if (assets &&
         assets.filter((a) => a.glob === 'migrations.json').length === 0) {
         project.targets.build.options.assets = [
@@ -90,22 +92,20 @@ function updateWorkspaceJson(host, options) {
         (0, devkit_1.updateProjectConfiguration)(host, options.project, project);
     }
 }
-function migrationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
-        addFiles(host, options);
-        updateMigrationsJson(host, options);
-        updateWorkspaceJson(host, options);
-        updateMigrationsJson(host, options);
-        updatePackageJson(host, options);
-        if (!host.exists('migrations.json')) {
-            const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
-            (0, generator_1.addMigrationJsonChecks)(host, { projectName: schema.project }, (0, devkit_1.readJson)(host, packageJsonPath));
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-    });
+async function migrationGenerator(host, schema) {
+    const options = normalizeOptions(host, schema);
+    addFiles(host, options);
+    updateMigrationsJson(host, options);
+    updateWorkspaceJson(host, options);
+    updateMigrationsJson(host, options);
+    updatePackageJson(host, options);
+    if (!host.exists('migrations.json')) {
+        const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
+        (0, generator_1.addMigrationJsonChecks)(host, { projectName: schema.project }, (0, devkit_1.readJson)(host, packageJsonPath));
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.migrationGenerator = migrationGenerator;
 exports.default = migrationGenerator;