@nx/jest 23.0.0-beta.21 → 23.0.0-beta.23

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

@@ -42,7 +42,6 @@ function getExtraArgs(options, schema) {
     return extraArgs;
 }
 async function parseJestConfig(options, context, multiProjects = false) {
-    let jestConfig;
     // support passing extra args to jest cli supporting 3rd party plugins
     // like 'jest-runner-groups' --group arg
     const extraArgs = getExtraArgs(options, schema_json_1.default);
@@ -84,15 +83,6 @@ async function parseJestConfig(options, context, multiProjects = false) {
     };
     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);

package/dist/src/executors/jest/schema.d.ts

@@ -37,11 +37,4 @@ export interface JestExecutorOptions {
   watchAll?: boolean;
   testLocationInResults?: boolean;
   testTimeout?: number;
-
-  /**
-   * @deprecated Use the `setupFilesAfterEnv` option in the Jest configuration
-   * file instead. See https://jestjs.io/docs/configuration#setupfilesafterenv-array.
-   * It will be removed in Nx v22.
-   */
-  setupFile?: string;
 }

package/dist/src/executors/jest/schema.json

@@ -66,11 +66,6 @@
             "x-completion-type": "file",
             "x-completion-glob": "tsconfig.*.json"
         },
-        "setupFile": {
-            "description": "The name of a setup file used by Jest.",
-            "type": "string",
-            "x-deprecated": "Use the `setupFilesAfterEnv` option in the Jest configuration file instead. See https://jestjs.io/docs/configuration#setupfilesafterenv-array. It will be removed in Nx v22."
-        },
         "bail": {
             "alias": "b",
             "description": "Exit the test suite immediately after `n` number of failing tests. (https://jestjs.io/docs/cli#--bail)",

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

@@ -8,6 +8,7 @@ const js_1 = require("@nx/js");
 const internal_2 = 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");
 const deprecation_1 = require("../../utils/deprecation");
 const check_for_test_target_1 = require("./lib/check-for-test-target");
 const create_files_1 = require("./lib/create-files");
@@ -20,7 +21,6 @@ const schemaDefaults = {
     setupFile: 'none',
     babelJest: false,
     supportTsx: false,
-    skipSetupFile: false,
     skipSerializers: false,
     testEnvironment: 'jsdom',
 };
@@ -42,10 +42,6 @@ function normalizeOptions(tree, options) {
         ['swc', 'babel'].includes(options.compiler)) {
         options.skipSerializers = true;
     }
-    if (options.skipSetupFile) {
-        // setupFile is always 'none'
-        options.setupFile = schemaDefaults.setupFile;
-    }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     return {
         ...schemaDefaults,
@@ -59,6 +55,7 @@ function configurationGenerator(tree, schema) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function configurationGeneratorInternal(tree, schema) {
+    (0, assert_supported_jest_version_1.assertSupportedJestVersion)(tree);
     const options = normalizeOptions(tree, schema);
     // we'll only add the vscode recommended extension if the jest preset does
     // not exist, which most likely means this is a first run, in the cases it's

package/dist/src/generators/configuration/lib/ensure-dependencies.js

@@ -32,5 +32,5 @@ function ensureDependencies(tree, options) {
     else if (options.compiler === 'swc') {
         devDeps['@swc/jest'] = swcJestVersion;
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDeps, undefined, options.keepExistingVersions);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDeps, undefined, options.keepExistingVersions ?? true);
 }

package/dist/src/generators/configuration/schema.d.ts

@@ -26,10 +26,6 @@ export interface JestProjectSchema {
    * @deprecated Use the `compiler` option instead. It will be removed in Nx v22.
    */
   babelJest?: boolean;
-  /**
-   * @deprecated Use the `setupFile` option instead. It will be removed in Nx v22.
-   */
-  skipSetupFile?: boolean;
   keepExistingVersions?: boolean;
 }
 

package/dist/src/generators/configuration/schema.json

@@ -14,12 +14,6 @@
             },
             "x-priority": "important"
         },
-        "skipSetupFile": {
-            "type": "boolean",
-            "description": "Skips the setup file required for angular.",
-            "default": false,
-            "x-deprecated": "Use the `setupFile` option instead. It will be removed in Nx v22."
-        },
         "setupFile": {
             "type": "string",
             "enum": ["none", "angular", "web-components"],

package/dist/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -7,8 +7,10 @@ const jest_config_1 = require("jest-config");
 const node_path_1 = require("node:path");
 const plugin_1 = require("../../plugins/plugin");
 const config_file_1 = require("../../utils/config/config-file");
+const assert_supported_jest_version_1 = require("../../utils/assert-supported-jest-version");
 const versions_1 = require("../../utils/versions");
 async function convertToInferred(tree, options) {
+    (0, assert_supported_jest_version_1.assertSupportedJestVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/jest/plugin', plugin_1.createNodesV2, { targetName: 'test' }, [
         {

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

@@ -6,6 +6,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const plugin_1 = require("../../plugins/plugin");
 const config_file_1 = require("../../utils/config/config-file");
+const assert_supported_jest_version_1 = require("../../utils/assert-supported-jest-version");
 const versions_1 = require("../../utils/versions");
 function updateProductionFileSet(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -94,16 +95,13 @@ function updateDependencies(tree, options) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@nx/jest': nxVersion,
         jest: jestVersion,
-    }, undefined, options.keepExistingVersions);
+    }, undefined, options.keepExistingVersions ?? true);
 }
 function jestInitGenerator(tree, options) {
     return jestInitGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function jestInitGeneratorInternal(tree, options) {
-    const installedJestVersion = (0, versions_1.getInstalledJestVersion)(tree);
-    if (installedJestVersion) {
-        (0, versions_1.validateInstalledJestVersion)(tree);
-    }
+    (0, assert_supported_jest_version_1.assertSupportedJestVersion)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

package/dist/src/generators/init/schema.json

@@ -22,7 +22,7 @@
             "type": "boolean",
             "x-priority": "internal",
             "description": "Keep existing dependencies versions",
-            "default": false
+            "default": true
         },
         "updatePackageScripts": {
             "type": "boolean",

package/dist/src/migrations/update-23-0-0/migrate-jest-configuration-skip-setup-file.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/dist/src/migrations/update-23-0-0/migrate-jest-configuration-skip-setup-file.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const GENERATOR_NAME = '@nx/jest:configuration';
+const PACKAGE = '@nx/jest';
+const GENERATOR = 'configuration';
+const SKIP_SETUP_FILE = 'skipSetupFile';
+const SETUP_FILE = 'setupFile';
+// Migrate the deprecated `skipSetupFile` option of `@nx/jest:configuration`
+// generator defaults. `skipSetupFile: true` was equivalent to setting
+// `setupFile: 'none'`, so rewrite to that. `skipSetupFile: false` was a no-op
+// — drop it. Run on both `nx.json` `generators` and per-project
+// `project.json` `generators`, in both flat (`@nx/jest:configuration`) and
+// nested (`@nx/jest` → `configuration`) forms.
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson?.generators && transformGenerators(nxJson.generators)) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    for (const [projectName, projectConfig] of (0, devkit_1.getProjects)(tree)) {
+        if (projectConfig.generators &&
+            transformGenerators(projectConfig.generators)) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function transformGenerators(generators) {
+    let changed = false;
+    if (transformDefaults(generators[GENERATOR_NAME])) {
+        if (Object.keys(generators[GENERATOR_NAME]).length === 0) {
+            delete generators[GENERATOR_NAME];
+        }
+        changed = true;
+    }
+    const nested = generators[PACKAGE];
+    if (nested &&
+        typeof nested === 'object' &&
+        transformDefaults(nested[GENERATOR])) {
+        if (nested[GENERATOR] && Object.keys(nested[GENERATOR]).length === 0) {
+            delete nested[GENERATOR];
+        }
+        if (Object.keys(nested).length === 0) {
+            delete generators[PACKAGE];
+        }
+        changed = true;
+    }
+    return changed;
+}
+function transformDefaults(defaults) {
+    if (!defaults || typeof defaults !== 'object')
+        return false;
+    if (!(SKIP_SETUP_FILE in defaults))
+        return false;
+    if (defaults[SKIP_SETUP_FILE] === true &&
+        defaults[SETUP_FILE] === undefined) {
+        defaults[SETUP_FILE] = 'none';
+    }
+    delete defaults[SKIP_SETUP_FILE];
+    return true;
+}

package/dist/src/migrations/update-23-0-0/migrate-jest-configuration-skip-setup-file.md

@@ -0,0 +1,91 @@
+#### Migrate `skipSetupFile` Generator Default to `setupFile`
+
+Migrates the previously deprecated `skipSetupFile` option of the `@nx/jest:configuration` generator. When set as a default in `nx.json` `generators` or per-project `project.json` `generators`, it is rewritten as follows:
+
+- `skipSetupFile: true` becomes `setupFile: 'none'` (preserving the original behavior of skipping the setup file). Existing `setupFile` values are left untouched.
+- `skipSetupFile: false` is dropped (it was a no-op).
+
+Both flat (`@nx/jest:configuration`) and nested (`@nx/jest` → `configuration`) forms are handled.
+
+#### Examples
+
+Rewrite a `nx.json` generator default:
+
+##### Before
+
+```json title="nx.json" {4}
+{
+  "generators": {
+    "@nx/jest:configuration": {
+      "skipSetupFile": true
+    }
+  }
+}
+```
+
+##### After
+
+```json title="nx.json"
+{
+  "generators": {
+    "@nx/jest:configuration": {
+      "setupFile": "none"
+    }
+  }
+}
+```
+
+Drop the option when set to `false`:
+
+##### Before
+
+```json title="nx.json" {4}
+{
+  "generators": {
+    "@nx/jest:configuration": {
+      "skipSetupFile": false,
+      "testEnvironment": "jsdom"
+    }
+  }
+}
+```
+
+##### After
+
+```json title="nx.json"
+{
+  "generators": {
+    "@nx/jest:configuration": {
+      "testEnvironment": "jsdom"
+    }
+  }
+}
+```
+
+Rewrite a per-project generator default:
+
+##### Before
+
+```json title="apps/myapp/project.json" {4}
+{
+  "generators": {
+    "@nx/jest:configuration": {
+      "skipSetupFile": true
+    }
+  }
+}
+```
+
+##### After
+
+```json title="apps/myapp/project.json"
+{
+  "generators": {
+    "@nx/jest:configuration": {
+      "setupFile": "none"
+    }
+  }
+}
+```
+
+The nested form (`@nx/jest` → `configuration`) is handled the same way.

package/dist/src/migrations/update-23-0-0/migrate-jest-executor-setup-file.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void | (() => void)>;