@nx/jest 19.8.0 → 20.0.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "19.8.0",
+  "version": "20.0.0-beta.0",
   "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": "19.8.0",
-    "@nx/js": "19.8.0",
+    "@nx/devkit": "20.0.0-beta.0",
+    "@nx/js": "20.0.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
@@ -50,7 +50,7 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nrwl/jest": "19.8.0"
+    "@nrwl/jest": "20.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/lib/update-tsconfig.d.ts

@@ -1,3 +1,3 @@
-import { NormalizedJestProjectSchema } from '../schema';
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
+import type { NormalizedJestProjectSchema } from '../schema';
 export declare function updateTsConfig(host: Tree, options: NormalizedJestProjectSchema): void;

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

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = updateTsConfig;
-const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 function updateTsConfig(host, options) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    if (!host.exists((0, path_1.join)(projectConfig.root, 'tsconfig.json'))) {
-        throw new Error(`Expected ${(0, path_1.join)(projectConfig.root, 'tsconfig.json')} to exist. Please create one.`);
+    const { root, projectType } = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    if (!host.exists((0, devkit_1.joinPathFragments)(root, 'tsconfig.json'))) {
+        throw new Error(`Expected ${(0, devkit_1.joinPathFragments)(root, 'tsconfig.json')} to exist. Please create one.`);
     }
-    (0, devkit_1.updateJson)(host, (0, path_1.join)(projectConfig.root, 'tsconfig.json'), (json) => {
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(root, 'tsconfig.json'), (json) => {
         if (json.references &&
             !json.references.some((r) => r.path === './tsconfig.spec.json')) {
             json.references.push({
@@ -17,4 +16,30 @@ function updateTsConfig(host, options) {
         }
         return json;
     });
+    // fall-back runtime tsconfig file path in case the user didn't provide one
+    let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(root, projectType === 'application' ? 'tsconfig.app.json' : 'tsconfig.lib.json');
+    if (options.runtimeTsconfigFileName) {
+        runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(root, options.runtimeTsconfigFileName);
+        if (!host.exists(runtimeTsconfigPath)) {
+            // the user provided a runtimeTsconfigFileName that doesn't exist, so we throw an error
+            throw new Error(`Cannot find the provided runtimeTsConfigFileName ("${options.runtimeTsconfigFileName}") at the project root "${root}".`);
+        }
+    }
+    if (host.exists(runtimeTsconfigPath)) {
+        (0, devkit_1.updateJson)(host, runtimeTsconfigPath, (json) => {
+            const uniqueExclude = new Set([
+                ...(json.exclude || []),
+                options.js ? 'jest.config.js' : 'jest.config.ts',
+                'src/**/*.spec.ts',
+                'src/**/*.test.ts',
+                ...(options.js ? ['src/**/*.spec.js', 'src/**/*.test.js'] : []),
+            ]);
+            json.exclude = [...uniqueExclude];
+            return json;
+        });
+    }
+    else {
+        devkit_1.logger.warn(`Couldn't find a runtime tsconfig file at ${runtimeTsconfigPath} to exclude the test files from. ` +
+            `If you're using a different filename for your runtime tsconfig, please provide it with the '--runtimeTsconfigFileName' flag.`);
+    }
 }

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

@@ -19,6 +19,7 @@ export interface JestProjectSchema {
   compiler?: 'tsc' | 'babel' | 'swc';
   skipPackageJson?: boolean;
   js?: boolean;
+  runtimeTsconfigFileName?: string;
 
   /**
    * @internal

package/src/generators/configuration/schema.json

@@ -74,6 +74,10 @@
       "type": "boolean",
       "default": false,
       "description": "Use JavaScript instead of TypeScript for config files"
+    },
+    "runtimeTsconfigFileName": {
+      "type": "string",
+      "description": "The name of the project's tsconfig file that includes the runtime source files. If not provided, it will default to `tsconfig.lib.json` for libraries and `tsconfig.app.json` for applications."
     }
   },
   "required": []