@nx/jest 23.0.0-rc.2 → 23.0.0-rc.4

package/dist/src/generators/configuration/configuration.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const internal_2 = require("@nx/js/internal");
+const internal_1 = require("@nx/js/internal");
 const config_file_1 = require("../../utils/config/config-file");
 const init_1 = require("../init/init");
 const assert_supported_jest_version_1 = require("../../utils/assert-supported-jest-version");
@@ -48,7 +47,7 @@ function normalizeOptions(tree, options) {
         ...options,
         keepExistingVersions: options.keepExistingVersions ?? true,
         rootProject: project.root === '.' || project.root === '',
-        isTsSolutionSetup: (0, internal_2.isUsingTsSolutionSetup)(tree),
+        isTsSolutionSetup: (0, internal_1.isUsingTsSolutionSetup)(tree),
     };
 }
 function configurationGenerator(tree, schema) {
@@ -94,13 +93,12 @@ async function configurationGeneratorInternal(tree, schema) {
         ignoreTestOutput(tree);
         // in the TS solution setup, the test target depends on the build outputs
         // so we need to setup the task pipeline accordingly
-        const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
-        const existing = findExistingTestDefault(nxJson.targetDefaults, options.targetName);
-        const dependsOn = Array.from(new Set([...(existing?.dependsOn ?? []), '^build']));
-        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-            target: options.targetName,
-            dependsOn,
-        });
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults[options.targetName] ??= {};
+        nxJson.targetDefaults[options.targetName].dependsOn ??= [];
+        nxJson.targetDefaults[options.targetName].dependsOn.push('^build');
+        nxJson.targetDefaults[options.targetName].dependsOn = Array.from(new Set(nxJson.targetDefaults[options.targetName].dependsOn));
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     if (!schema.skipFormat) {
@@ -108,16 +106,6 @@ async function configurationGeneratorInternal(tree, schema) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function findExistingTestDefault(td, targetName) {
-    if (!td)
-        return undefined;
-    if (Array.isArray(td)) {
-        return td.find((e) => e.target === targetName &&
-            e.projects === undefined &&
-            e.plugin === undefined);
-    }
-    return td[targetName];
-}
 function ignoreTestOutput(tree) {
     if (!tree.exists('.gitignore')) {
         devkit_1.logger.warn(`Couldn't find a root .gitignore file to update.`);

package/dist/src/generators/init/init.js

@@ -29,66 +29,27 @@ function updateProductionFileSet(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function addJestTargetDefaults(tree, presetExt) {
-    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults['@nx/jest:jest'] ??= {};
     const productionFileSet = nxJson.namedInputs?.production;
-    const existingEntries = findExistingJestDefaults(nxJson.targetDefaults);
-    if (existingEntries.length === 0) {
-        const patch = createJestDefaultPatch(undefined, productionFileSet, presetExt);
-        if (Object.keys(patch).length > 0) {
-            (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-                executor: '@nx/jest:jest',
-                ...patch,
-            });
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-        return;
-    }
-    let didUpdate = false;
-    for (const existing of existingEntries) {
-        const patch = createJestDefaultPatch(existing, productionFileSet, presetExt);
-        if (Object.keys(patch).length === 0) {
-            continue;
-        }
-        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-            target: existing.target,
-            executor: existing.executor,
-            projects: existing.projects,
-            plugin: existing.plugin,
-            ...patch,
-        });
-        didUpdate = true;
-    }
-    if (didUpdate) {
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-    }
-}
-function createJestDefaultPatch(existing, productionFileSet, presetExt) {
-    const patch = {};
-    if (existing?.cache === undefined)
-        patch.cache = true;
+    nxJson.targetDefaults['@nx/jest:jest'].cache ??= true;
     // Test targets depend on all their project's sources + production sources of dependencies
-    if (existing?.inputs === undefined) {
-        patch.inputs = [
-            'default',
-            productionFileSet ? '^production' : '^default',
-            `{workspaceRoot}/jest.preset.${presetExt}`,
-        ];
-    }
-    if (existing?.options === undefined) {
-        patch.options = { passWithNoTests: true };
-    }
-    if (existing?.configurations === undefined) {
-        patch.configurations = {
-            ci: {
-                ci: true,
-                codeCoverage: true,
-            },
-        };
-    }
-    return patch;
-}
-function findExistingJestDefaults(td) {
-    return (0, internal_1.normalizeTargetDefaults)(td).filter((e) => e.executor === '@nx/jest:jest');
+    nxJson.targetDefaults['@nx/jest:jest'].inputs ??= [
+        'default',
+        productionFileSet ? '^production' : '^default',
+        `{workspaceRoot}/jest.preset.${presetExt}`,
+    ];
+    nxJson.targetDefaults['@nx/jest:jest'].options ??= {
+        passWithNoTests: true,
+    };
+    nxJson.targetDefaults['@nx/jest:jest'].configurations ??= {
+        ci: {
+            ci: true,
+            codeCoverage: true,
+        },
+    };
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function updateDependencies(tree, options) {
     const { jestVersion, nxVersion } = (0, versions_1.versions)(tree);

package/dist/src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor.js

@@ -4,7 +4,6 @@ exports.default = default_1;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const EXECUTOR_TO_MIGRATE = '@nx/jest:jest';
-const ENTRY_META_KEYS = new Set(['target', 'executor', 'projects', 'plugin']);
 async function default_1(tree) {
     // update options from project configs
     (0, internal_1.forEachExecutorOptions)(tree, EXECUTOR_TO_MIGRATE, (options, project, target, configuration) => {
@@ -23,61 +22,30 @@ async function default_1(tree) {
     // update options from nx.json target defaults
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson.targetDefaults) {
-        if (Array.isArray(nxJson.targetDefaults)) {
-            const next = [];
-            for (const entry of nxJson.targetDefaults) {
-                if (entry.target !== EXECUTOR_TO_MIGRATE &&
-                    entry.executor !== EXECUTOR_TO_MIGRATE) {
-                    next.push(entry);
-                    continue;
-                }
-                if (entry.options)
-                    updateOptions(entry);
-                Object.keys(entry.configurations ?? {}).forEach((config) => {
-                    updateConfiguration(entry, config);
-                });
-                if (!isEntryEmpty(entry)) {
-                    next.push(entry);
-                }
+        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+            if (targetOrExecutor !== EXECUTOR_TO_MIGRATE &&
+                targetConfig.executor !== EXECUTOR_TO_MIGRATE) {
+                continue;
             }
-            if (next.length === 0) {
-                delete nxJson.targetDefaults;
+            if (targetConfig.options) {
+                updateOptions(targetConfig);
             }
-            else {
-                nxJson.targetDefaults = next;
+            Object.keys(targetConfig.configurations ?? {}).forEach((config) => {
+                updateConfiguration(targetConfig, config);
+            });
+            if (!Object.keys(targetConfig).length ||
+                (Object.keys(targetConfig).length === 1 &&
+                    Object.keys(targetConfig)[0] === 'executor')) {
+                delete nxJson.targetDefaults[targetOrExecutor];
             }
-        }
-        else {
-            for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-                if (targetOrExecutor !== EXECUTOR_TO_MIGRATE &&
-                    targetConfig.executor !== EXECUTOR_TO_MIGRATE) {
-                    continue;
-                }
-                if (targetConfig.options) {
-                    updateOptions(targetConfig);
-                }
-                Object.keys(targetConfig.configurations ?? {}).forEach((config) => {
-                    updateConfiguration(targetConfig, config);
-                });
-                if (!Object.keys(targetConfig).length ||
-                    (Object.keys(targetConfig).length === 1 &&
-                        Object.keys(targetConfig)[0] === 'executor')) {
-                    delete nxJson.targetDefaults[targetOrExecutor];
-                }
-                if (!Object.keys(nxJson.targetDefaults).length) {
-                    delete nxJson.targetDefaults;
-                }
+            if (!Object.keys(nxJson.targetDefaults).length) {
+                delete nxJson.targetDefaults;
             }
         }
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     await (0, devkit_1.formatFiles)(tree);
 }
-// An entry is "empty" once only filter/meta keys remain (target, executor,
-// projects, plugin) — nothing else worth keeping around.
-function isEntryEmpty(entry) {
-    return Object.keys(entry).every((k) => ENTRY_META_KEYS.has(k));
-}
 function updateOptions(target) {
     delete target.options.tsConfig;
     if (!Object.keys(target.options).length) {

package/dist/src/migrations/update-21-3-0/rename-test-path-pattern.js

@@ -19,33 +19,17 @@ async function default_1(tree) {
     if (!nxJson.targetDefaults) {
         return;
     }
-    if (Array.isArray(nxJson.targetDefaults)) {
-        for (const entry of nxJson.targetDefaults) {
-            if (entry.target !== '@nx/jest:jest' &&
-                entry.executor !== '@nx/jest:jest') {
-                continue;
-            }
-            if (entry.options) {
-                renameTestPathPattern(entry.options);
-            }
-            Object.values(entry.configurations ?? {}).forEach((config) => {
-                renameTestPathPattern(config);
-            });
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (targetOrExecutor !== '@nx/jest:jest' &&
+            targetConfig.executor !== '@nx/jest:jest') {
+            continue;
         }
-    }
-    else {
-        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-            if (targetOrExecutor !== '@nx/jest:jest' &&
-                targetConfig.executor !== '@nx/jest:jest') {
-                continue;
-            }
-            if (targetConfig.options) {
-                renameTestPathPattern(targetConfig.options);
-            }
-            Object.values(targetConfig.configurations ?? {}).forEach((config) => {
-                renameTestPathPattern(config);
-            });
+        if (targetConfig.options) {
+            renameTestPathPattern(targetConfig.options);
         }
+        Object.values(targetConfig.configurations ?? {}).forEach((config) => {
+            renameTestPathPattern(config);
+        });
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "23.0.0-rc.2",
+  "version": "23.0.0-rc.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -116,11 +116,11 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nx/devkit": "23.0.0-rc.2",
-    "@nx/js": "23.0.0-rc.2"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/js": "23.0.0-rc.4"
   },
   "devDependencies": {
-    "nx": "23.0.0-rc.2"
+    "nx": "23.0.0-rc.4"
   },
   "publishConfig": {
     "access": "public"