@nx/jest 21.0.0-beta.10 → 21.0.0-beta.12

package/index.d.ts

@@ -1,6 +1,8 @@
 import { configurationGenerator } from './src/generators/configuration/configuration';
 export { configurationGenerator };
-/** @deprecated Use `configurationGenerator` instead. */
+/**
+ * @deprecated Use `configurationGenerator` instead. It will be removed in Nx v22.
+ */
 export declare const jestProjectGenerator: typeof configurationGenerator;
 export { addPropertyToJestConfig, removePropertyFromJestConfig, } from './src/utils/config/update-config';
 export { jestConfigObjectAst } from './src/utils/config/functions';

package/index.js

@@ -4,7 +4,9 @@ exports.getJestProjectsAsync = exports.jestInitGenerator = exports.jestConfigObj
 const configuration_1 = require("./src/generators/configuration/configuration");
 Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
 // Exported for backwards compatibility in case a plugin is using the old name.
-/** @deprecated Use `configurationGenerator` instead. */
+/**
+ * @deprecated Use `configurationGenerator` instead. It will be removed in Nx v22.
+ */
 exports.jestProjectGenerator = configuration_1.configurationGenerator;
 var update_config_1 = require("./src/utils/config/update-config");
 Object.defineProperty(exports, "addPropertyToJestConfig", { enumerable: true, get: function () { return update_config_1.addPropertyToJestConfig; } });

package/migrations.json

@@ -11,6 +11,11 @@
       "version": "21.0.0-beta.9",
       "description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.",
       "implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync"
+    },
+    "remove-tsconfig-option-from-jest-executor": {
+      "version": "21.0.0-beta.10",
+      "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.",
+      "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "21.0.0-beta.10",
+  "version": "21.0.0-beta.12",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -37,8 +37,8 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "21.0.0-beta.10",
-    "@nx/js": "21.0.0-beta.10",
+    "@nx/devkit": "21.0.0-beta.12",
+    "@nx/js": "21.0.0-beta.12",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^29.4.1",

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

@@ -6,10 +6,6 @@ export interface JestExecutorOptions {
   detectLeaks?: boolean;
   jestConfig: string;
   testFile?: string;
-  /**
-   * @deprecated set in the jest config file instead
-   **/
-  setupFile?: string;
   bail?: boolean | number;
   ci?: boolean;
   color?: boolean;
@@ -41,4 +37,11 @@ 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/src/executors/jest/schema.json

@@ -59,15 +59,10 @@
         "index": 0
       }
     },
-    "tsConfig": {
-      "description": "The name of the Typescript configuration file.",
-      "type": "string",
-      "x-deprecated": "Use the ts-jest configuration options in the jest config file instead."
-    },
     "setupFile": {
       "description": "The name of a setup file used by Jest.",
       "type": "string",
-      "x-deprecated": "Use the setupFilesAfterEnv option in the jest config file. https://jestjs.io/docs/en/configuration#setupfilesafterenv-array"
+      "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",

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

@@ -2,10 +2,6 @@ export interface JestProjectSchema {
   project: string;
   targetName?: string;
   supportTsx?: boolean;
-  /**
-   * @deprecated use setupFile instead
-   */
-  skipSetupFile?: boolean;
   setupFile?:
     | 'angular'
     | 'web-components'
@@ -14,12 +10,7 @@ export interface JestProjectSchema {
     | 'none';
   skipSerializers?: boolean;
   testEnvironment?: 'node' | 'jsdom' | 'none';
-  /**
-   * @deprecated use compiler: "babel" instead
-   */
-  babelJest?: boolean;
   skipFormat?: boolean;
-
   addPlugin?: boolean;
   compiler?: 'tsc' | 'babel' | 'swc';
   skipPackageJson?: boolean;
@@ -30,6 +21,15 @@ export interface JestProjectSchema {
    * @internal
    */
   addExplicitTargets?: boolean;
+
+  /**
+   * @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;
 }
 
 export type NormalizedJestProjectSchema = JestProjectSchema & {

package/src/generators/configuration/schema.json

@@ -18,7 +18,7 @@
       "type": "boolean",
       "description": "Skips the setup file required for angular.",
       "default": false,
-      "x-deprecated": "Use `--setup-file` instead."
+      "x-deprecated": "Use the `setupFile` option instead. It will be removed in Nx v22."
     },
     "setupFile": {
       "type": "string",
@@ -55,7 +55,7 @@
       "type": "boolean",
       "alias": "babel-jest",
       "description": "Use `babel-jest` instead of `ts-jest`.",
-      "x-deprecated": "Use `--compiler=babel` instead.",
+      "x-deprecated": "Use the `compiler` option instead. It will be removed in Nx v22.",
       "default": false
     },
     "skipFormat": {

package/src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor.d.ts

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

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

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const EXECUTOR_TO_MIGRATE = '@nx/jest:jest';
+async function default_1(tree) {
+    // update options from project configs
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, EXECUTOR_TO_MIGRATE, (options, project, target, configuration) => {
+        if (options.tsConfig === undefined) {
+            return;
+        }
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, project);
+        if (configuration) {
+            updateConfiguration(projectConfiguration.targets[target], configuration);
+        }
+        else {
+            updateOptions(projectConfiguration.targets[target]);
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
+    });
+    // update options from nx.json target defaults
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.targetDefaults) {
+        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;
+            }
+        }
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function updateOptions(target) {
+    delete target.options.tsConfig;
+    if (!Object.keys(target.options).length) {
+        delete target.options;
+    }
+}
+function updateConfiguration(target, configuration) {
+    delete target.configurations[configuration].tsConfig;
+    if (!Object.keys(target.configurations[configuration]).length &&
+        (!target.defaultConfiguration ||
+            target.defaultConfiguration !== configuration)) {
+        delete target.configurations[configuration];
+    }
+    if (!Object.keys(target.configurations).length) {
+        delete target.configurations;
+    }
+}