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

package/src/generators/plugin/plugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginSchematic = exports.pluginGeneratorInternal = exports.pluginGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
@@ -13,18 +12,17 @@ const normalize_schema_1 = require("./utils/normalize-schema");
 const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
 const add_swc_dependencies_2 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const nxVersion = require('../../../package.json').version;
-function addFiles(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        host.delete((0, devkit_1.normalizePath)(`${options.projectRoot}/src/lib`));
-        (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/plugin'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '' }));
+async function addFiles(host, options) {
+    host.delete((0, devkit_1.normalizePath)(`${options.projectRoot}/src/lib`));
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/plugin'), options.projectRoot, {
+        ...options,
+        tmpl: '',
     });
 }
 function updatePluginConfig(host, options) {
-    var _a;
-    var _b;
     const project = (0, devkit_1.readProjectConfiguration)(host, options.name);
     if (project.targets.build) {
-        (_a = (_b = project.targets.build.options).assets) !== null && _a !== void 0 ? _a : (_b.assets = []);
+        project.targets.build.options.assets ??= [];
         const root = options.projectRoot === '.' ? '.' : './' + options.projectRoot;
         project.targets.build.options.assets = [
             ...project.targets.build.options.assets,
@@ -52,52 +50,58 @@ function updatePluginConfig(host, options) {
         (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
     }
 }
-function pluginGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield pluginGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function pluginGenerator(host, schema) {
+    return await pluginGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.pluginGenerator = pluginGenerator;
-function pluginGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_schema_1.normalizeOptions)(host, schema);
-        const tasks = [];
-        tasks.push(yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: 'project', bundler: options.bundler, publishable: options.publishable, importPath: options.npmPackageName, skipFormat: true })));
-        if (options.bundler === 'tsc') {
-            tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
-        }
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
-            '@nx/devkit': nxVersion,
-        }, {
-            '@nx/jest': nxVersion,
-            '@nx/js': nxVersion,
-            '@nx/plugin': nxVersion,
+async function pluginGeneratorInternal(host, schema) {
+    const options = await (0, normalize_schema_1.normalizeOptions)(host, schema);
+    const tasks = [];
+    tasks.push(await (0, js_1.libraryGenerator)(host, {
+        ...schema,
+        config: 'project',
+        bundler: options.bundler,
+        publishable: options.publishable,
+        importPath: options.npmPackageName,
+        skipFormat: true,
+    }));
+    if (options.bundler === 'tsc') {
+        tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
+    }
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
+        '@nx/devkit': nxVersion,
+    }, {
+        '@nx/jest': nxVersion,
+        '@nx/js': nxVersion,
+        '@nx/plugin': nxVersion,
+    }));
+    // Ensures Swc Deps are installed to handle running
+    // local plugin generators and executors
+    tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
+    tasks.push((0, add_swc_dependencies_2.addSwcRegisterDependencies)(host));
+    await addFiles(host, options);
+    updatePluginConfig(host, options);
+    if (options.e2eTestRunner !== 'none') {
+        tasks.push(await (0, e2e_1.e2eProjectGenerator)(host, {
+            pluginName: options.name,
+            projectDirectory: options.projectDirectory,
+            pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
+            npmPackageName: options.npmPackageName,
+            skipFormat: true,
+            rootProject: options.rootProject,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
         }));
-        // Ensures Swc Deps are installed to handle running
-        // local plugin generators and executors
-        tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
-        tasks.push((0, add_swc_dependencies_2.addSwcRegisterDependencies)(host));
-        yield addFiles(host, options);
-        updatePluginConfig(host, options);
-        if (options.e2eTestRunner !== 'none') {
-            tasks.push(yield (0, e2e_1.e2eProjectGenerator)(host, {
-                pluginName: options.name,
-                projectDirectory: options.projectDirectory,
-                pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
-                npmPackageName: options.npmPackageName,
-                skipFormat: true,
-                rootProject: options.rootProject,
-                projectNameAndRootFormat: options.projectNameAndRootFormat,
-            }));
-        }
-        if (options.linter === linter_1.Linter.EsLint && !options.skipLintChecks) {
-            yield (0, generator_1.default)(host, { projectName: options.name });
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    if (options.linter === linter_1.Linter.EsLint && !options.skipLintChecks) {
+        await (0, generator_1.default)(host, { projectName: options.name });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.pluginGeneratorInternal = pluginGeneratorInternal;
 exports.default = pluginGenerator;

package/src/generators/plugin/utils/normalize-schema.js

@@ -1,41 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-function normalizeOptions(host, options) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName, projectRoot, importPath: npmPackageName, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            rootProject: options.rootProject,
-            callingGenerator: '@nx/plugin:plugin',
-        });
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        options.rootProject = projectRoot === '.';
-        let projectDirectory = projectRoot;
-        if (options.projectNameAndRootFormat === 'derived') {
-            let { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-            if (!layoutDirectory) {
-                const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-                layoutDirectory = libsDir;
-            }
-            if (projectRoot.startsWith(`${layoutDirectory}/`)) {
-                projectDirectory = projectRoot.replace(`${layoutDirectory}/`, '');
-            }
-        }
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        return Object.assign(Object.assign({}, options), { bundler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'tsc', fileName: projectName, name: projectName, projectRoot,
-            projectDirectory,
-            parsedTags,
-            npmPackageName, publishable: (_b = options.publishable) !== null && _b !== void 0 ? _b : false });
+async function normalizeOptions(host, options) {
+    const { projectName, projectRoot, importPath: npmPackageName, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        rootProject: options.rootProject,
+        callingGenerator: '@nx/plugin:plugin',
     });
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.rootProject = projectRoot === '.';
+    let projectDirectory = projectRoot;
+    if (options.projectNameAndRootFormat === 'derived') {
+        let { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+        if (!layoutDirectory) {
+            const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+            layoutDirectory = libsDir;
+        }
+        if (projectRoot.startsWith(`${layoutDirectory}/`)) {
+            projectDirectory = projectRoot.replace(`${layoutDirectory}/`, '');
+        }
+    }
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    return {
+        ...options,
+        bundler: options.compiler ?? 'tsc',
+        fileName: projectName,
+        name: projectName,
+        projectRoot,
+        projectDirectory,
+        parsedTags,
+        npmPackageName,
+        publishable: options.publishable ?? false,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/preset/generator.js

@@ -1,59 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const plugin_1 = require("../plugin/plugin");
 const create_package_1 = require("../create-package/create-package");
-function default_1(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const pluginProjectName = (0, devkit_1.names)(options.pluginName.includes('/')
-            ? options.pluginName.split('/')[1]
-            : options.pluginName).fileName;
-        options.createPackageName =
-            options.createPackageName === 'false' // for command line in e2e, it is passed as a string
-                ? undefined
-                : options.createPackageName;
-        const pluginTask = yield (0, plugin_1.pluginGenerator)(tree, {
-            compiler: 'tsc',
-            linter: linter_1.Linter.EsLint,
-            name: pluginProjectName,
+async function default_1(tree, options) {
+    const tasks = [];
+    const pluginProjectName = (0, devkit_1.names)(options.pluginName.includes('/')
+        ? options.pluginName.split('/')[1]
+        : options.pluginName).fileName;
+    options.createPackageName =
+        options.createPackageName === 'false' // for command line in e2e, it is passed as a string
+            ? undefined
+            : options.createPackageName;
+    const pluginTask = await (0, plugin_1.pluginGenerator)(tree, {
+        compiler: 'tsc',
+        linter: linter_1.Linter.EsLint,
+        name: pluginProjectName,
+        skipFormat: true,
+        unitTestRunner: 'jest',
+        importPath: options.pluginName,
+        e2eTestRunner: 'jest',
+        publishable: true,
+        // when creating a CLI package, the plugin will be in the packages folder
+        directory: options.createPackageName && options.createPackageName !== 'false'
+            ? 'packages'
+            : undefined,
+        rootProject: options.createPackageName ? false : true,
+    });
+    tasks.push(pluginTask);
+    removeNpmScope(tree);
+    moveNxPluginToDevDeps(tree);
+    if (options.createPackageName) {
+        const e2eProject = `${options.pluginName}-e2e`;
+        const cliTask = await (0, create_package_1.default)(tree, {
+            directory: 'packages',
+            name: options.createPackageName,
+            e2eProject: e2eProject,
+            project: options.pluginName,
             skipFormat: true,
             unitTestRunner: 'jest',
-            importPath: options.pluginName,
-            e2eTestRunner: 'jest',
-            publishable: true,
-            // when creating a CLI package, the plugin will be in the packages folder
-            directory: options.createPackageName && options.createPackageName !== 'false'
-                ? 'packages'
-                : undefined,
-            rootProject: options.createPackageName ? false : true,
+            linter: linter_1.Linter.EsLint,
+            compiler: 'tsc',
         });
-        tasks.push(pluginTask);
-        removeNpmScope(tree);
-        moveNxPluginToDevDeps(tree);
-        if (options.createPackageName) {
-            const e2eProject = `${options.pluginName}-e2e`;
-            const cliTask = yield (0, create_package_1.default)(tree, {
-                directory: 'packages',
-                name: options.createPackageName,
-                e2eProject: e2eProject,
-                project: options.pluginName,
-                skipFormat: true,
-                unitTestRunner: 'jest',
-                linter: linter_1.Linter.EsLint,
-                compiler: 'tsc',
-            });
-            tasks.push(cliTask);
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+        tasks.push(cliTask);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = default_1;
 function removeNpmScope(tree) {
-    (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, (0, devkit_1.readNxJson)(tree)), { npmScope: undefined }));
+    (0, devkit_1.updateNxJson)(tree, { ...(0, devkit_1.readNxJson)(tree), npmScope: undefined });
 }
 function moveNxPluginToDevDeps(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {

package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
-function addSwcNodeIfNeeded(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, add_swc_dependencies_1.addSwcRegisterDependencies)(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-        return (0, devkit_1.installPackagesTask)(tree);
-    });
+async function addSwcNodeIfNeeded(tree) {
+    (0, add_swc_dependencies_1.addSwcRegisterDependencies)(tree);
+    await (0, devkit_1.formatFiles)(tree);
+    return (0, devkit_1.installPackagesTask)(tree);
 }
 exports.default = addSwcNodeIfNeeded;

package/src/migrations/update-15-0-0/specify-output-capture.js

@@ -1,56 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        for (const [project, { root }] of (0, devkit_1.getProjects)(tree)) {
-            const packageJsonPath = (0, devkit_1.joinPathFragments)(root, 'package.json');
-            if (!tree.exists(packageJsonPath)) {
-                continue;
-            }
-            const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
-            if (!packageJson.executors && !packageJson.builders) {
+async function update(tree) {
+    for (const [project, { root }] of (0, devkit_1.getProjects)(tree)) {
+        const packageJsonPath = (0, devkit_1.joinPathFragments)(root, 'package.json');
+        if (!tree.exists(packageJsonPath)) {
+            continue;
+        }
+        const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
+        if (!packageJson.executors && !packageJson.builders) {
+            continue;
+        }
+        const paths = [packageJson.executors, packageJson.builders].filter(Boolean);
+        for (const collectionPathSegment of paths) {
+            const collectionPath = (0, devkit_1.joinPathFragments)(root, collectionPathSegment);
+            if (!tree.exists(collectionPath)) {
                 continue;
             }
-            const paths = [packageJson.executors, packageJson.builders].filter(Boolean);
-            for (const collectionPathSegment of paths) {
-                const collectionPath = (0, devkit_1.joinPathFragments)(root, collectionPathSegment);
-                if (!tree.exists(collectionPath)) {
+            const collectionFile = (0, devkit_1.readJson)(tree, collectionPath);
+            const collections = [
+                collectionFile.builders,
+                collectionFile.executors,
+            ].filter(Boolean);
+            for (const collection of collections) {
+                if (!collection) {
                     continue;
                 }
-                const collectionFile = (0, devkit_1.readJson)(tree, collectionPath);
-                const collections = [
-                    collectionFile.builders,
-                    collectionFile.executors,
-                ].filter(Boolean);
-                for (const collection of collections) {
-                    if (!collection) {
-                        continue;
-                    }
-                    for (const entry of Object.values(collection)) {
-                        const schemaPath = (0, devkit_1.joinPathFragments)(root, entry.schema);
-                        if (tree.exists(schemaPath)) {
-                            (0, devkit_1.updateJson)(tree, schemaPath, (json) => {
-                                if (json.version) {
-                                    return json;
-                                }
-                                else {
-                                    const newProperties = {
-                                        version: 2,
-                                    };
-                                    if (!json.outputCapture) {
-                                        newProperties.outputCapture = 'direct-nodejs';
-                                    }
-                                    return Object.assign(Object.assign({}, newProperties), json);
+                for (const entry of Object.values(collection)) {
+                    const schemaPath = (0, devkit_1.joinPathFragments)(root, entry.schema);
+                    if (tree.exists(schemaPath)) {
+                        (0, devkit_1.updateJson)(tree, schemaPath, (json) => {
+                            if (json.version) {
+                                return json;
+                            }
+                            else {
+                                const newProperties = {
+                                    version: 2,
+                                };
+                                if (!json.outputCapture) {
+                                    newProperties.outputCapture = 'direct-nodejs';
                                 }
-                            });
-                        }
+                                return { ...newProperties, ...json };
+                            }
+                        });
                     }
                 }
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-15-9-0/jest-29-configs.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConfigsJest29 = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = require("typescript");
@@ -9,38 +8,36 @@ const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-opt
 const ast_utils_1 = require("@nx/jest/src/utils/ast-utils");
 const find_root_jest_files_1 = require("@nx/jest/src/utils/config/find-root-jest-files");
 // NOTE: this is a copy of the @nrwl/jest v15.8.0 migrations
-function updateConfigsJest29(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
-        const targetsWithJest = new Set();
-        // have to use graph so the negative configuration targets are expanded
-        const graph = yield (0, devkit_1.createProjectGraphAsync)();
-        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName, targetName) => {
-            if (options.jestConfig && tree.exists(options.jestConfig)) {
-                targetsWithJest.add(targetName);
-                // if the default root preset exists or if the project doesn't have a 'preset' configured
-                //  -> update snapshot config
-                if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
-                    addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
-                }
-                updateTsJestOptions(tree, options.jestConfig);
-                updateNgJestOptions(tree, options.jestConfig);
+async function updateConfigsJest29(tree) {
+    const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
+    const targetsWithJest = new Set();
+    // have to use graph so the negative configuration targets are expanded
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName, targetName) => {
+        if (options.jestConfig && tree.exists(options.jestConfig)) {
+            targetsWithJest.add(targetName);
+            // if the default root preset exists or if the project doesn't have a 'preset' configured
+            //  -> update snapshot config
+            if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
+                addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
             }
-        });
-        if (rootPreset && tree.exists(rootPreset)) {
-            const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
-            addSnapshotOptionsToConfig(tree, rootPreset, cmd);
-            updateTsJestOptions(tree, rootPreset);
-            updateNgJestOptions(tree, rootPreset);
+            updateTsJestOptions(tree, options.jestConfig);
+            updateNgJestOptions(tree, options.jestConfig);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-        devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
+    });
+    if (rootPreset && tree.exists(rootPreset)) {
+        const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
+        addSnapshotOptionsToConfig(tree, rootPreset, cmd);
+        updateTsJestOptions(tree, rootPreset);
+        updateNgJestOptions(tree, rootPreset);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
 By default Nx kept the older style to prevent breaking of existing tests with snapshots.
 It's recommend you update to the latest format.
 You can do this in your project's jest config file.
 Remove the snapshotFormat property and re-run tests with the --update-snapshot flag.
 More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format`);
-    });
 }
 exports.updateConfigsJest29 = updateConfigsJest29;
 function addSnapshotOptionsToConfig(tree, configPath, updateSnapshotExample) {
@@ -67,9 +64,8 @@ snapshotFormat: { escapeString: true, printBasicPrototype: true }
     tree.write(configPath, updatedConfig);
 }
 function hasPresetConfigured(tree, configPath) {
-    var _a;
     const contents = tree.read(configPath, 'utf-8');
-    return (((_a = tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)) === null || _a === void 0 ? void 0 : _a.length) > 0);
+    return (tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)?.length > 0);
 }
 function updateTsJestOptions(tree, configPath) {
     // query for the globals property, if they don't have one then there's nothing to modify.
@@ -126,15 +122,13 @@ testEnvironmentOptions: { teardown: ${ngJestTeardownConfig} },
     tree.write(configPath, updatedConfig);
 }
 function getGlobalTsJestConfig(node) {
-    var _a;
     const globalObject = node.initializer;
     const foundConfig = globalObject.properties.find((p) => ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
-    return ((_a = foundConfig === null || foundConfig === void 0 ? void 0 : foundConfig.initializer) === null || _a === void 0 ? void 0 : _a.getText()) || '';
+    return foundConfig?.initializer?.getText() || '';
 }
 function getGlobalConfigWithoutTsJest(node) {
-    var _a;
-    const globalObject = node === null || node === void 0 ? void 0 : node.initializer;
-    const withoutTsJest = (_a = globalObject === null || globalObject === void 0 ? void 0 : globalObject.properties) === null || _a === void 0 ? void 0 : _a.filter((p) => {
+    const globalObject = node?.initializer;
+    const withoutTsJest = globalObject?.properties?.filter((p) => {
         return !(ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
     });
     const globalConfigs = withoutTsJest.map((c) => c.getText()).join(',\n');
@@ -142,7 +136,7 @@ function getGlobalConfigWithoutTsJest(node) {
 }
 function getNodeWithComments(fullText, node) {
     const commentRanges = ts.getLeadingCommentRanges(fullText, node.getFullStart());
-    if ((commentRanges === null || commentRanges === void 0 ? void 0 : commentRanges.length) > 0) {
+    if (commentRanges?.length > 0) {
         const withComments = `${commentRanges
             .map((r) => fullText.slice(r.pos, r.end))
             .join('\n')}\n${node.getText()}`;

package/src/migrations/update-15-9-0/jest-29-tests.js

@@ -1,27 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestMocked = exports.updateJestMockTypes = exports.updateTestsJest29 = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("@nx/jest/src/utils/ast-utils");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 // NOTE: this is a copy of the @nrwl/jest v15.8.0 migrations
-function updateTestsJest29(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const graph = yield (0, devkit_1.createProjectGraphAsync)();
-        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
-                if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
-                    return;
-                }
-                updateJestMockTypes(tree, file);
-                updateJestMocked(tree, file);
-            });
+async function updateTestsJest29(tree) {
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
+            if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
+                return;
+            }
+            updateJestMockTypes(tree, file);
+            updateJestMocked(tree, file);
         });
-        yield (0, devkit_1.formatFiles)(tree);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.updateTestsJest29 = updateTestsJest29;
 function updateJestMockTypes(tree, filePath) {

package/src/migrations/update-16-0-0/cli-in-schema-json.js

@@ -85,32 +85,29 @@ function updateCliPropsForPlugins(tree) {
 }
 exports.updateCliPropsForPlugins = updateCliPropsForPlugins;
 function removeCliFromExecutorSchemaJsonFiles(tree, collectionPath) {
-    var _a, _b;
     const collection = (0, devkit_1.readJson)(tree, collectionPath);
-    for (const [name, entry] of Object.entries((_a = collection.executors) !== null && _a !== void 0 ? _a : {}).concat(Object.entries((_b = collection.builders) !== null && _b !== void 0 ? _b : {}))) {
+    for (const [name, entry] of Object.entries(collection.executors ?? {}).concat(Object.entries(collection.builders ?? {}))) {
         deleteCliPropFromSchemaFile(collectionPath, entry, tree);
     }
 }
 function removeCliFromGeneratorSchemaJsonFiles(tree, collectionPath) {
-    var _a, _b;
     const collection = (0, devkit_1.readJson)(tree, collectionPath);
-    for (const [name, entry] of Object.entries((_a = collection.generators) !== null && _a !== void 0 ? _a : {}).concat(Object.entries((_b = collection.schematics) !== null && _b !== void 0 ? _b : {}))) {
+    for (const [name, entry] of Object.entries(collection.generators ?? {}).concat(Object.entries(collection.schematics ?? {}))) {
         deleteCliPropFromSchemaFile(collectionPath, entry, tree);
     }
 }
 function updateMigrationsJsonForPlugin(tree, collectionPath) {
     (0, devkit_1.updateJson)(tree, collectionPath, (json) => {
-        var _a, _b, _c, _d;
-        for (const migration in (_a = json.generators) !== null && _a !== void 0 ? _a : {}) {
+        for (const migration in json.generators ?? {}) {
             if (!(json.generators[migration].cli === 'nx')) {
-                (_b = json.schematics) !== null && _b !== void 0 ? _b : (json.schematics = {});
+                json.schematics ??= {};
                 json.schematics[migration] = json.generators[migration];
                 delete json.generators[migration];
             }
         }
-        for (const migration in (_c = json.schematics) !== null && _c !== void 0 ? _c : {}) {
+        for (const migration in json.schematics ?? {}) {
             if (json.schematics[migration].cli === 'nx') {
-                (_d = json.generators) !== null && _d !== void 0 ? _d : (json.generators = {});
+                json.generators ??= {};
                 json.generators[migration] = json.schematics[migration];
                 delete json.schematics[migration];
             }

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nx-plugin', '@nx/plugin');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nx-plugin', '@nx/plugin');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;