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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -36,9 +36,9 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nrwl/jest": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
+    "@nrwl/jest": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
@@ -52,5 +52,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/plugins/resolver.js

@@ -31,14 +31,21 @@ module.exports = function (path, options) {
             // Try to use the defaultResolver with default options
             return options.defaultResolver(path, options);
         }
-        catch (_a) {
+        catch {
             // Try to use the defaultResolver with a packageFilter
-            return options.defaultResolver(path, Object.assign(Object.assign({}, options), { packageFilter: (pkg) => (Object.assign(Object.assign({}, pkg), { main: pkg.main || pkg.es2015 || pkg.module })), pathFilter: (pkg) => {
+            return options.defaultResolver(path, {
+                ...options,
+                packageFilter: (pkg) => ({
+                    ...pkg,
+                    main: pkg.main || pkg.es2015 || pkg.module,
+                }),
+                pathFilter: (pkg) => {
                     if (!pkg.exports) {
                         return path;
                     }
                     return (0, resolve_exports_1.resolve)(pkg, path) || path;
-                } }));
+                },
+            });
         }
     }
     catch (e) {

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

@@ -1,9 +1,6 @@
 "use strict";
-var _a;
-var _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.batchJest = exports.jestConfigParser = exports.jestExecutor = void 0;
-const tslib_1 = require("tslib");
 const jest_1 = require("jest");
 const jest_config_1 = require("jest-config");
 const reporters_1 = require("@jest/reporters");
@@ -13,13 +10,11 @@ const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const summary_1 = require("./summary");
 const fs_1 = require("fs");
-(_a = (_b = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_b.NODE_ENV = 'test');
-function jestExecutor(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = yield jestConfigParser(options, context);
-        const { results } = yield (0, jest_1.runCLI)(config, [options.jestConfig]);
-        return { success: results.success };
-    });
+process.env.NODE_ENV ??= 'test';
+async function jestExecutor(options, context) {
+    const config = await jestConfigParser(options, context);
+    const { results } = await (0, jest_1.runCLI)(config, [options.jestConfig]);
+    return { success: results.success };
 }
 exports.jestExecutor = jestExecutor;
 function getExtraArgs(options, schema) {
@@ -31,121 +26,154 @@ function getExtraArgs(options, schema) {
     }
     return extraArgs;
 }
-function jestConfigParser(options, context, multiProjects = false) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let jestConfig;
-        // support passing extra args to jest cli supporting 3rd party plugins
-        // like 'jest-runner-groups' --group arg
-        const schema = yield Promise.resolve().then(() => require('./schema.json'));
-        const extraArgs = getExtraArgs(options, schema);
-        const config = Object.assign(Object.assign({}, extraArgs), { $0: undefined, _: [], config: options.config, coverage: options.codeCoverage, bail: options.bail, ci: options.ci, color: options.color, detectOpenHandles: options.detectOpenHandles, forceExit: options.forceExit, logHeapUsage: options.logHeapUsage, detectLeaks: options.detectLeaks, json: options.json, maxWorkers: options.maxWorkers, onlyChanged: options.onlyChanged, changedSince: options.changedSince, outputFile: options.outputFile, passWithNoTests: options.passWithNoTests, runInBand: options.runInBand, showConfig: options.showConfig, silent: options.silent, testLocationInResults: options.testLocationInResults, testNamePattern: options.testNamePattern, testPathPattern: options.testPathPattern, testPathIgnorePatterns: options.testPathIgnorePatterns, testTimeout: options.testTimeout, colors: options.colors, verbose: options.verbose, testResultsProcessor: options.testResultsProcessor, updateSnapshot: options.updateSnapshot, useStderr: options.useStderr, watch: options.watch, watchAll: options.watchAll, randomize: options.randomize });
-        if (!multiProjects) {
-            options.jestConfig = path.resolve(context.root, options.jestConfig);
-            jestConfig = (yield (0, jest_config_1.readConfig)(config, options.jestConfig)).projectConfig;
-        }
-        // for backwards compatibility
-        if (options.setupFile && !multiProjects) {
-            const setupFilesAfterEnvSet = new Set([
-                ...((_a = jestConfig.setupFilesAfterEnv) !== null && _a !== void 0 ? _a : []),
-                path.resolve(context.root, options.setupFile),
-            ]);
-            config.setupFilesAfterEnv = Array.from(setupFilesAfterEnvSet);
-        }
-        if (options.testFile) {
-            config._.push(options.testFile);
-        }
-        if (options.findRelatedTests) {
-            const parsedTests = options.findRelatedTests
-                .split(',')
-                .map((s) => s.trim());
-            config._.push(...parsedTests);
-            config.findRelatedTests = true;
-        }
-        if (options.coverageDirectory) {
-            config.coverageDirectory = path.join(context.root, options.coverageDirectory);
-        }
-        if (options.clearCache) {
-            config.clearCache = true;
-        }
-        if (options.reporters && options.reporters.length > 0) {
-            config.reporters = options.reporters;
-        }
-        if (Array.isArray(options.coverageReporters) &&
-            options.coverageReporters.length > 0) {
-            config.coverageReporters = options.coverageReporters;
-        }
-        return config;
-    });
+async function jestConfigParser(options, context, multiProjects = false) {
+    let jestConfig;
+    // support passing extra args to jest cli supporting 3rd party plugins
+    // like 'jest-runner-groups' --group arg
+    const schema = await Promise.resolve().then(() => require('./schema.json'));
+    const extraArgs = getExtraArgs(options, schema);
+    const config = {
+        ...extraArgs,
+        $0: undefined,
+        _: [],
+        config: options.config,
+        coverage: options.codeCoverage,
+        bail: options.bail,
+        ci: options.ci,
+        color: options.color,
+        detectOpenHandles: options.detectOpenHandles,
+        forceExit: options.forceExit,
+        logHeapUsage: options.logHeapUsage,
+        detectLeaks: options.detectLeaks,
+        json: options.json,
+        maxWorkers: options.maxWorkers,
+        onlyChanged: options.onlyChanged,
+        changedSince: options.changedSince,
+        outputFile: options.outputFile,
+        passWithNoTests: options.passWithNoTests,
+        runInBand: options.runInBand,
+        showConfig: options.showConfig,
+        silent: options.silent,
+        testLocationInResults: options.testLocationInResults,
+        testNamePattern: options.testNamePattern,
+        testPathPattern: options.testPathPattern,
+        testPathIgnorePatterns: options.testPathIgnorePatterns,
+        testTimeout: options.testTimeout,
+        colors: options.colors,
+        verbose: options.verbose,
+        testResultsProcessor: options.testResultsProcessor,
+        updateSnapshot: options.updateSnapshot,
+        useStderr: options.useStderr,
+        watch: options.watch,
+        watchAll: options.watchAll,
+        randomize: options.randomize,
+    };
+    if (!multiProjects) {
+        options.jestConfig = path.resolve(context.root, options.jestConfig);
+        jestConfig = (await (0, jest_config_1.readConfig)(config, options.jestConfig)).projectConfig;
+    }
+    // for backwards compatibility
+    if (options.setupFile && !multiProjects) {
+        const setupFilesAfterEnvSet = new Set([
+            ...(jestConfig.setupFilesAfterEnv ?? []),
+            path.resolve(context.root, options.setupFile),
+        ]);
+        config.setupFilesAfterEnv = Array.from(setupFilesAfterEnvSet);
+    }
+    if (options.testFile) {
+        config._.push(options.testFile);
+    }
+    if (options.findRelatedTests) {
+        const parsedTests = options.findRelatedTests
+            .split(',')
+            .map((s) => s.trim());
+        config._.push(...parsedTests);
+        config.findRelatedTests = true;
+    }
+    if (options.coverageDirectory) {
+        config.coverageDirectory = path.join(context.root, options.coverageDirectory);
+    }
+    if (options.clearCache) {
+        config.clearCache = true;
+    }
+    if (options.reporters && options.reporters.length > 0) {
+        config.reporters = options.reporters;
+    }
+    if (Array.isArray(options.coverageReporters) &&
+        options.coverageReporters.length > 0) {
+        config.coverageReporters = options.coverageReporters;
+    }
+    return config;
 }
 exports.jestConfigParser = jestConfigParser;
 exports.default = jestExecutor;
-function batchJest(taskGraph, inputs, overrides, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let configPaths = [];
-        let selectedProjects = [];
-        let projectsWithNoName = [];
-        for (const task of taskGraph.roots) {
-            let configPath = path.resolve(context.root, inputs[task].jestConfig);
-            configPaths.push(configPath);
-            /* The display name in the jest.config.js is the correct project name jest
-             * uses to determine projects. It is usually the same as the Nx projectName
-             * but it can be changed. The safest method is to extract the displayName
-             * from the config file, but skip the project if it does not exist. */
-            const displayNameValueRegex = new RegExp(/(['"]+.*['"])(?<=displayName+.*)/, 'g');
-            const fileContents = (0, fs_1.readFileSync)(configPath, { encoding: 'utf-8' });
-            if (!displayNameValueRegex.test(fileContents)) {
-                projectsWithNoName.push([task.split(':')[0], configPath]);
-                continue;
-            }
-            const displayName = fileContents
-                .match(displayNameValueRegex)
-                .map((value) => value.substring(1, value.length - 1))[0];
-            selectedProjects.push(displayName);
+async function batchJest(taskGraph, inputs, overrides, context) {
+    let configPaths = [];
+    let selectedProjects = [];
+    let projectsWithNoName = [];
+    for (const task of taskGraph.roots) {
+        let configPath = path.resolve(context.root, inputs[task].jestConfig);
+        configPaths.push(configPath);
+        /* The display name in the jest.config.js is the correct project name jest
+         * uses to determine projects. It is usually the same as the Nx projectName
+         * but it can be changed. The safest method is to extract the displayName
+         * from the config file, but skip the project if it does not exist. */
+        const displayNameValueRegex = new RegExp(/(['"]+.*['"])(?<=displayName+.*)/, 'g');
+        const fileContents = (0, fs_1.readFileSync)(configPath, { encoding: 'utf-8' });
+        if (!displayNameValueRegex.test(fileContents)) {
+            projectsWithNoName.push([task.split(':')[0], configPath]);
+            continue;
         }
-        if (projectsWithNoName.length > 0) {
-            throw new Error((0, devkit_1.stripIndents) `Some projects do not have a "displayName" property. Jest Batch Mode requires this to be set. Please ensure this value is set. 
+        const displayName = fileContents
+            .match(displayNameValueRegex)
+            .map((value) => value.substring(1, value.length - 1))[0];
+        selectedProjects.push(displayName);
+    }
+    if (projectsWithNoName.length > 0) {
+        throw new Error((0, devkit_1.stripIndents) `Some projects do not have a "displayName" property. Jest Batch Mode requires this to be set. Please ensure this value is set. 
 
       Projects missing "displayName":
       ${projectsWithNoName.map(([project, configPath]) => ` - ${project} - ${configPath}\r\n`)}
       You can learn more about this requirement from Jest here: https://jestjs.io/docs/cli#--selectprojects-project1--projectn`);
-        }
-        const parsedConfigs = yield jestConfigParser(overrides, context, true);
-        const { globalConfig, results } = yield (0, jest_1.runCLI)(Object.assign(Object.assign({}, parsedConfigs), { selectProjects: selectedProjects }), [devkit_1.workspaceRoot]);
-        const { configs } = yield (0, jest_config_1.readConfigs)({ $0: undefined, _: [] }, configPaths);
-        const jestTaskExecutionResults = {};
-        for (let i = 0; i < taskGraph.roots.length; i++) {
-            let root = taskGraph.roots[i];
-            const aggregatedResults = (0, test_result_1.makeEmptyAggregatedTestResult)();
-            aggregatedResults.startTime = results.startTime;
-            let endTime;
-            const projectRoot = (0, path_1.join)(context.root, taskGraph.tasks[root].projectRoot);
-            let resultOutput = '';
-            for (const testResult of results.testResults) {
-                if (testResult.testFilePath.startsWith(projectRoot)) {
-                    aggregatedResults.startTime = aggregatedResults.startTime
-                        ? Math.min(aggregatedResults.startTime, testResult.perfStats.start)
-                        : testResult.perfStats.start;
-                    endTime = endTime
-                        ? Math.max(testResult.perfStats.end, endTime)
-                        : testResult.perfStats.end;
-                    (0, test_result_1.addResult)(aggregatedResults, testResult);
-                    resultOutput +=
-                        '\n\r' +
-                            reporters_1.utils.getResultHeader(testResult, globalConfig, configs[i]);
-                }
+    }
+    const parsedConfigs = await jestConfigParser(overrides, context, true);
+    const { globalConfig, results } = await (0, jest_1.runCLI)({
+        ...parsedConfigs,
+        selectProjects: selectedProjects,
+    }, [devkit_1.workspaceRoot]);
+    const { configs } = await (0, jest_config_1.readConfigs)({ $0: undefined, _: [] }, configPaths);
+    const jestTaskExecutionResults = {};
+    for (let i = 0; i < taskGraph.roots.length; i++) {
+        let root = taskGraph.roots[i];
+        const aggregatedResults = (0, test_result_1.makeEmptyAggregatedTestResult)();
+        aggregatedResults.startTime = results.startTime;
+        let endTime;
+        const projectRoot = (0, path_1.join)(context.root, taskGraph.tasks[root].projectRoot);
+        let resultOutput = '';
+        for (const testResult of results.testResults) {
+            if (testResult.testFilePath.startsWith(projectRoot)) {
+                aggregatedResults.startTime = aggregatedResults.startTime
+                    ? Math.min(aggregatedResults.startTime, testResult.perfStats.start)
+                    : testResult.perfStats.start;
+                endTime = endTime
+                    ? Math.max(testResult.perfStats.end, endTime)
+                    : testResult.perfStats.end;
+                (0, test_result_1.addResult)(aggregatedResults, testResult);
+                resultOutput +=
+                    '\n\r' +
+                        reporters_1.utils.getResultHeader(testResult, globalConfig, configs[i]);
             }
-            aggregatedResults.numTotalTestSuites = aggregatedResults.testResults.length;
-            jestTaskExecutionResults[root] = {
-                startTime: aggregatedResults.startTime,
-                endTime,
-                success: aggregatedResults.numFailedTests === 0,
-                // TODO(caleb): getSummary assumed endTime is Date.now().
-                // might need to make own method to correctly set the endtime base on tests instead of _now_
-                terminalOutput: resultOutput + '\n\r\n\r' + (0, summary_1.getSummary)(aggregatedResults),
-            };
         }
-        return jestTaskExecutionResults;
-    });
+        aggregatedResults.numTotalTestSuites = aggregatedResults.testResults.length;
+        jestTaskExecutionResults[root] = {
+            startTime: aggregatedResults.startTime,
+            endTime,
+            success: aggregatedResults.numFailedTests === 0,
+            // TODO(caleb): getSummary assumed endTime is Date.now().
+            // might need to make own method to correctly set the endtime base on tests instead of _now_
+            terminalOutput: resultOutput + '\n\r\n\r' + (0, summary_1.getSummary)(aggregatedResults),
+        };
+    }
+    return jestTaskExecutionResults;
 }
 exports.batchJest = batchJest;

package/src/executors/jest/summary.js

@@ -68,11 +68,11 @@ const renderTime = (runTime, estimatedTime, width) => {
 };
 const getSummary = (aggregatedResults, options) => {
     let runTime = (Date.now() - aggregatedResults.startTime) / 1000;
-    if (options === null || options === void 0 ? void 0 : options.roundTime) {
+    if (options?.roundTime) {
         runTime = Math.floor(runTime);
     }
-    const { numFailingTests, numPendingTests, numTodoTests, numPassingTests, numTotalTests, } = getValuesCurrentTestCases(options === null || options === void 0 ? void 0 : options.currentTestCases);
-    const estimatedTime = (options === null || options === void 0 ? void 0 : options.estimatedTime) || 0;
+    const { numFailingTests, numPendingTests, numTodoTests, numPassingTests, numTotalTests, } = getValuesCurrentTestCases(options?.currentTestCases);
+    const estimatedTime = options?.estimatedTime || 0;
     const snapshotResults = aggregatedResults.snapshot;
     const snapshotsAdded = snapshotResults.added;
     const snapshotsFailed = snapshotResults.unmatched;
@@ -92,7 +92,7 @@ const getSummary = (aggregatedResults, options) => {
     const testsPending = aggregatedResults.numPendingTests;
     const testsTodo = aggregatedResults.numTodoTests;
     const testsTotal = aggregatedResults.numTotalTests;
-    const width = (options === null || options === void 0 ? void 0 : options.width) || 0;
+    const width = options?.width || 0;
     const suites = chalk.bold('Test Suites: ') +
         (suitesFailed ? chalk.bold.red(`${suitesFailed} failed`) + ', ' : '') +
         (suitesPending

package/src/generators/configuration/configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compat = exports.configurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const init_1 = require("../init/init");
 const check_for_test_target_1 = require("./lib/check-for-test-target");
 const create_files_1 = require("./lib/create-files");
@@ -34,21 +33,23 @@ function normalizeOptions(tree, options) {
         options.setupFile = schemaDefaults.setupFile;
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    return Object.assign(Object.assign(Object.assign({}, schemaDefaults), options), { rootProject: project.root === '.' || project.root === '' });
+    return {
+        ...schemaDefaults,
+        ...options,
+        rootProject: project.root === '.' || project.root === '',
+    };
 }
-function configurationGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(tree, schema);
-        const installTask = yield (0, init_1.default)(tree, options);
-        (0, check_for_test_target_1.checkForTestTarget)(tree, options);
-        (0, create_files_1.createFiles)(tree, options);
-        (0, update_tsconfig_1.updateTsConfig)(tree, options);
-        (0, update_workspace_1.updateWorkspace)(tree, options);
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return installTask;
-    });
+async function configurationGenerator(tree, schema) {
+    const options = normalizeOptions(tree, schema);
+    const installTask = await (0, init_1.default)(tree, options);
+    (0, check_for_test_target_1.checkForTestTarget)(tree, options);
+    (0, create_files_1.createFiles)(tree, options);
+    (0, update_tsconfig_1.updateTsConfig)(tree, options);
+    (0, update_workspace_1.updateWorkspace)(tree, options);
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return installTask;
 }
 exports.configurationGenerator = configurationGenerator;
 exports.default = configurationGenerator;

package/src/generators/configuration/lib/check-for-test-target.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkForTestTarget = void 0;
 const devkit_1 = require("@nx/devkit");
 function checkForTestTarget(tree, options) {
-    var _a;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _a === void 0 ? void 0 : _a.test) {
+    if (projectConfig?.targets?.test) {
         throw new Error(`${options.project}: already has a test target set.`);
     }
 }

package/src/generators/configuration/lib/create-files.js

@@ -22,12 +22,20 @@ function createFiles(tree, options) {
         transformer = 'ts-jest';
         transformerOptions = "{ tsconfig: '<rootDir>/tsconfig.spec.json' }";
     }
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesFolder), projectConfig.root, Object.assign(Object.assign({ tmpl: '' }, options), { 
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesFolder), projectConfig.root, {
+        tmpl: '',
+        ...options,
         // jsdom is the default
         testEnvironment: options.testEnvironment === 'none' || options.testEnvironment === 'jsdom'
             ? ''
-            : options.testEnvironment, transformer,
-        transformerOptions, js: !!options.js, rootProject: options.rootProject, projectRoot: options.rootProject ? options.project : projectConfig.root, offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root) }));
+            : options.testEnvironment,
+        transformer,
+        transformerOptions,
+        js: !!options.js,
+        rootProject: options.rootProject,
+        projectRoot: options.rootProject ? options.project : projectConfig.root,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+    });
     if (options.setupFile === 'none') {
         tree.delete((0, path_1.join)(projectConfig.root, './src/test-setup.ts'));
     }

package/src/generators/configuration/lib/update-workspace.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWorkspace = void 0;
 const devkit_1 = require("@nx/devkit");
 function updateWorkspace(tree, options) {
-    var _a;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (!projectConfig.targets) {
         projectConfig.targets = {};
@@ -29,7 +28,7 @@ function updateWorkspace(tree, options) {
     /**
      * @deprecated this will be removed in the v17
      */
-    const isUsingTSLint = ((_a = projectConfig.targets.lint) === null || _a === void 0 ? void 0 : _a.executor) ===
+    const isUsingTSLint = projectConfig.targets.lint?.executor ===
         '@angular-devkit/build-angular:tslint';
     if (isUsingTSLint) {
         projectConfig.targets.lint.options.tsConfig = [

package/src/generators/init/init.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jestInitSchematic = exports.jestInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const find_root_jest_files_1 = require("../../utils/config/find-root-jest-files");
@@ -29,7 +28,6 @@ function generateGlobalConfig(tree, isJS) {
     tree.write(`jest.config.${isJS ? 'js' : 'ts'}`, contents);
 }
 function createJestConfig(tree, options) {
-    var _a;
     if (!tree.exists('jest.preset.js')) {
         // preset is always js file.
         tree.write(`jest.preset.js`, `
@@ -56,13 +54,13 @@ function createJestConfig(tree, options) {
         // moving from root project config to monorepo-style config
         const projects = (0, devkit_1.getProjects)(tree);
         const projectNames = Array.from(projects.keys());
-        const rootProject = projectNames.find((projectName) => { var _a; return ((_a = projects.get(projectName)) === null || _a === void 0 ? void 0 : _a.root) === '.'; });
+        const rootProject = projectNames.find((projectName) => projects.get(projectName)?.root === '.');
         // root project might have been removed,
         // if it's missing there's nothing to migrate
         if (rootProject) {
             const rootProjectConfig = projects.get(rootProject);
-            const jestTarget = Object.values(rootProjectConfig.targets || {}).find((t) => (t === null || t === void 0 ? void 0 : t.executor) === '@nx/jest:jest' || (t === null || t === void 0 ? void 0 : t.executor) === '@nrwl/jest:jest');
-            const isProjectConfig = ((_a = jestTarget === null || jestTarget === void 0 ? void 0 : jestTarget.options) === null || _a === void 0 ? void 0 : _a.jestConfig) === rootJestPath;
+            const jestTarget = Object.values(rootProjectConfig.targets || {}).find((t) => t?.executor === '@nx/jest:jest' || t?.executor === '@nrwl/jest:jest');
+            const isProjectConfig = jestTarget?.options?.jestConfig === rootJestPath;
             // if root project doesn't have jest target, there's nothing to migrate
             if (isProjectConfig) {
                 const jestProjectConfig = `jest.config.${rootProjectConfig.projectType === 'application' ? 'app' : 'lib'}.${options.js ? 'js' : 'ts'}`;
@@ -76,10 +74,8 @@ function createJestConfig(tree, options) {
     }
 }
 function addTestInputs(tree) {
-    var _a, _b, _c, _d;
-    var _e, _f;
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const productionFileSet = (_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production;
+    const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
         // This is one of the patterns in the default jest patterns
         productionFileSet.push(
@@ -96,12 +92,12 @@ function addTestInputs(tree) {
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
     // Test targets depend on all their project's sources + production sources of dependencies
-    (_b = nxJson.targetDefaults) !== null && _b !== void 0 ? _b : (nxJson.targetDefaults = {});
-    (_c = (_e = nxJson.targetDefaults).test) !== null && _c !== void 0 ? _c : (_e.test = {});
-    (_d = (_f = nxJson.targetDefaults.test).inputs) !== null && _d !== void 0 ? _d : (_f.inputs = [
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults.test ??= {};
+    nxJson.targetDefaults.test.inputs ??= [
         'default',
         productionFileSet ? '^production' : '^default',
-    ]);
+    ];
     nxJson.targetDefaults.test.inputs.push('{workspaceRoot}/jest.preset.js');
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
@@ -148,24 +144,28 @@ function updateExtensions(host) {
         return json;
     });
 }
-function jestInitGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(schema);
-        const tasks = [];
-        tasks.push(yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true })));
-        createJestConfig(tree, options);
-        if (!options.skipPackageJson) {
-            (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/jest'], []);
-            const installTask = updateDependencies(tree, options);
-            tasks.push(installTask);
-        }
-        updateExtensions(tree);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function jestInitGenerator(tree, schema) {
+    const options = normalizeOptions(schema);
+    const tasks = [];
+    tasks.push(await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        skipFormat: true,
+    }));
+    createJestConfig(tree, options);
+    if (!options.skipPackageJson) {
+        (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/jest'], []);
+        const installTask = updateDependencies(tree, options);
+        tasks.push(installTask);
+    }
+    updateExtensions(tree);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.jestInitGenerator = jestInitGenerator;
 function normalizeOptions(options) {
-    return Object.assign(Object.assign({}, schemaDefaults), options);
+    return {
+        ...schemaDefaults,
+        ...options,
+    };
 }
 exports.default = jestInitGenerator;
 exports.jestInitSchematic = (0, devkit_1.convertNxGenerator)(jestInitGenerator);

package/src/migrations/update-12-1-2/update-jest-preset-angular.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
@@ -27,7 +26,7 @@ function updateJestConfig(tree) {
                 (0, update_config_1.removePropertyFromJestConfig)(tree, options.jestConfig, 'snapshotSerializers');
                 (0, update_config_1.addPropertyToJestConfig)(tree, options.jestConfig, 'snapshotSerializers', snapshotSerializers);
             }
-            catch (_a) {
+            catch {
                 devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update snapshotSerializers for project ${projectName}.
             More information you can check online documentation https://github.com/thymikee/jest-preset-angular/blob/master/CHANGELOG.md#840-2021-03-04`);
             }
@@ -40,15 +39,13 @@ function updateJestConfig(tree) {
                 tree.write(setupTestPath, contents.replace(`import 'jest-preset-angular';`, `import 'jest-preset-angular/setup-jest';`));
             }
         }
-        catch (_b) {
+        catch {
             devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update test-setup.ts for project ${projectName}.`);
         }
     });
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateJestConfig(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    updateJestConfig(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;