@nx/jest 22.1.0-beta.4 → 22.1.0-beta.6

package/index.d.ts

@@ -8,4 +8,5 @@ export { addPropertyToJestConfig, removePropertyFromJestConfig, } from './src/ut
 export { jestConfigObjectAst } from './src/utils/config/functions';
 export { jestInitGenerator } from './src/generators/init/init';
 export { getJestProjectsAsync } from './src/utils/config/get-jest-projects';
+export { findJestConfig } from './src/utils/config/config-file';
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/jest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAGlC;;GAEG;AACH,eAAO,MAAM,oBAAoB,+BAAyB,CAAC;AAE3D,OAAO,EACL,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/jest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAGlC;;GAEG;AACH,eAAO,MAAM,oBAAoB,+BAAyB,CAAC;AAE3D,OAAO,EACL,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC"}

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJestProjectsAsync = exports.jestInitGenerator = exports.jestConfigObjectAst = exports.removePropertyFromJestConfig = exports.addPropertyToJestConfig = exports.jestProjectGenerator = exports.configurationGenerator = void 0;
+exports.findJestConfig = exports.getJestProjectsAsync = exports.jestInitGenerator = exports.jestConfigObjectAst = exports.removePropertyFromJestConfig = exports.addPropertyToJestConfig = exports.jestProjectGenerator = exports.configurationGenerator = void 0;
 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.
@@ -17,3 +17,5 @@ var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "jestInitGenerator", { enumerable: true, get: function () { return init_1.jestInitGenerator; } });
 var get_jest_projects_1 = require("./src/utils/config/get-jest-projects");
 Object.defineProperty(exports, "getJestProjectsAsync", { enumerable: true, get: function () { return get_jest_projects_1.getJestProjectsAsync; } });
+var config_file_1 = require("./src/utils/config/config-file");
+Object.defineProperty(exports, "findJestConfig", { enumerable: true, get: function () { return config_file_1.findJestConfig; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "22.1.0-beta.4",
+  "version": "22.1.0-beta.6",
   "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": "^30.0.2",
     "@jest/test-result": "^30.0.2",
-    "@nx/devkit": "22.1.0-beta.4",
-    "@nx/js": "22.1.0-beta.4",
+    "@nx/devkit": "22.1.0-beta.6",
+    "@nx/js": "22.1.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^30.0.2",
@@ -52,7 +52,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.4"
+    "nx": "22.1.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/files/common/tsconfig.spec.json__tmpl__

@@ -9,6 +9,7 @@
   "files": ["src/test-setup.ts"],<% } %>
   "include": [
     "jest.config.ts",
+    "jest.config.cts",
     "src/**/*.test.ts",
     "src/**/*.spec.ts",<% if (supportTsx) { %>
     "src/**/*.test.tsx",

package/src/generators/configuration/lib/create-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/configuration/lib/create-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAExD,wBAAgB,WAAW,CACzB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,EACpC,SAAS,EAAE,mBAAmB,QAoG/B"}
+{"version":3,"file":"create-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/configuration/lib/create-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAExD,wBAAgB,WAAW,CACzB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,EACpC,SAAS,EAAE,mBAAmB,QA4G/B"}

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

@@ -4,8 +4,14 @@ exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
 const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 const path_1 = require("path");
+const versions_1 = require("../../../utils/versions");
 function createFiles(tree, options, presetExt) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    // Detect Jest 30+ to use .cts config files (CommonJS TypeScript)
+    // Treat null (version cannot be determined) as Jest 30+
+    const jestMajorVersion = (0, versions_1.getInstalledJestMajorVersion)(tree);
+    const useCommonJsConfig = jestMajorVersion === null || jestMajorVersion >= 30;
+    const useJsSyntax = useCommonJsConfig || !!options.js;
     const commonFilesFolder = options.setupFile === 'angular' ? '../files-angular' : '../files/common';
     let transformer;
     let transformerOptions = null;
@@ -46,7 +52,7 @@ function createFiles(tree, options, presetExt) {
         testEnvironment,
         transformer,
         transformerOptions,
-        js: !!options.js,
+        js: useJsSyntax,
         rootProject: options.rootProject,
         projectRoot,
         offsetFromRoot: rootOffset,
@@ -71,7 +77,7 @@ function createFiles(tree, options, presetExt) {
             testEnvironment,
             transformer,
             transformerOptions,
-            js: !!options.js,
+            js: useJsSyntax,
             rootProject: options.rootProject,
             offsetFromRoot: rootOffset,
             presetExt,
@@ -81,7 +87,13 @@ function createFiles(tree, options, presetExt) {
     if (options.setupFile === 'none') {
         tree.delete((0, path_1.join)(projectConfig.root, './src/test-setup.ts'));
     }
-    if (options.js) {
-        tree.rename((0, path_1.join)(projectConfig.root, 'jest.config.ts'), (0, path_1.join)(projectConfig.root, 'jest.config.js'));
+    const configPath = (0, path_1.join)(projectConfig.root, 'jest.config.ts');
+    if (tree.exists(configPath)) {
+        if (options.js) {
+            tree.rename(configPath, (0, path_1.join)(projectConfig.root, 'jest.config.js'));
+        }
+        else if (useCommonJsConfig) {
+            tree.rename(configPath, (0, path_1.join)(projectConfig.root, 'jest.config.cts'));
+        }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/configuration/lib/update-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAG7D,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,QAyErC"}
+{"version":3,"file":"update-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/configuration/lib/update-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAG7D,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,QAsFrC"}

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

@@ -15,6 +15,14 @@ function updateTsConfig(host, options) {
                 path: './tsconfig.spec.json',
             });
         }
+        // If compilerOptions.types is defined, ensure "node" is included to support
+        // module.exports syntax in jest.config.cts. If types is not defined,
+        // TypeScript automatically loads @types/node.
+        if (json.compilerOptions?.types) {
+            if (!json.compilerOptions.types.includes('node')) {
+                json.compilerOptions.types.push('node');
+            }
+        }
         return json;
     });
     const projectType = (0, ts_solution_setup_1.getProjectType)(host, root, _projectType);
@@ -37,7 +45,9 @@ function updateTsConfig(host, options) {
         (0, devkit_1.updateJson)(host, runtimeTsconfigPath, (json) => {
             const uniqueExclude = new Set([
                 ...(json.exclude || []),
-                options.js ? 'jest.config.js' : 'jest.config.ts',
+                ...(options.js
+                    ? ['jest.config.js']
+                    : ['jest.config.ts', 'jest.config.cts']),
                 'src/**/*.spec.ts',
                 'src/**/*.test.ts',
                 ...(options.js ? ['src/**/*.spec.js', 'src/**/*.test.js'] : []),

package/src/generators/configuration/lib/update-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-workspace.d.ts","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/configuration/lib/update-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAE7D,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,QAiCrC"}
+{"version":3,"file":"update-workspace.d.ts","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/configuration/lib/update-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAE7D,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,QAsCrC"}

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

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWorkspace = updateWorkspace;
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
 function updateWorkspace(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (!projectConfig.targets) {
         projectConfig.targets = {};
     }
+    // Detect Jest 30+ to use .cts config files (CommonJS TypeScript)
+    const jestMajorVersion = (0, versions_1.getInstalledJestMajorVersion)(tree);
+    const useCommonJsConfig = jestMajorVersion === null || jestMajorVersion >= 30;
+    const jestConfigExt = options.js ? 'js' : useCommonJsConfig ? 'cts' : 'ts';
     projectConfig.targets[options.targetName] = {
         executor: '@nx/jest:jest',
         outputs: [
@@ -15,7 +20,7 @@ function updateWorkspace(tree, options) {
                 : (0, devkit_1.joinPathFragments)('{workspaceRoot}', 'coverage', options.rootProject ? '{projectName}' : '{projectRoot}'),
         ],
         options: {
-            jestConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, `jest.config.${options.js ? 'js' : 'ts'}`),
+            jestConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, `jest.config.${jestConfigExt}`),
         },
     };
     if (options.setupFile === 'angular') {

package/src/utils/config/config-file.d.ts

@@ -5,5 +5,6 @@ export declare const jestPresetExtensions: readonly ["js", "cjs", "mjs"];
 export type JestPresetExtension = (typeof jestPresetExtensions)[number];
 export declare function getPresetExt(tree: Tree): JestPresetExtension;
 export declare function findRootJestConfig(tree: Tree): string | null;
+export declare function findJestConfig(tree: Tree, projectPath: string): string | null;
 export declare function findRootJestPreset(tree: Tree): string | null;
 //# sourceMappingURL=config-file.d.ts.map

package/src/utils/config/config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../../../../../packages/jest/src/utils/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEjD,eAAO,MAAM,oBAAoB,mDAOvB,CAAC;AACX,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE,eAAO,MAAM,oBAAoB,+BAAgC,CAAC;AAClE,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,mBAAmB,CAiB5D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAM5D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAM5D"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../../../../../packages/jest/src/utils/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEjD,eAAO,MAAM,oBAAoB,mDAOvB,CAAC;AACX,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE,eAAO,MAAM,oBAAoB,+BAAgC,CAAC;AAClE,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,mBAAmB,CAiB5D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAM5D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAM7E;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAM5D"}

package/src/utils/config/config-file.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.jestPresetExtensions = exports.jestConfigExtensions = void 0;
 exports.getPresetExt = getPresetExt;
 exports.findRootJestConfig = findRootJestConfig;
+exports.findJestConfig = findJestConfig;
 exports.findRootJestPreset = findRootJestPreset;
 const devkit_1 = require("@nx/devkit");
 exports.jestConfigExtensions = [
@@ -31,6 +32,10 @@ function findRootJestConfig(tree) {
     const ext = exports.jestConfigExtensions.find((ext) => tree.exists(`jest.config.${ext}`));
     return ext ? `jest.config.${ext}` : null;
 }
+function findJestConfig(tree, projectPath) {
+    const ext = exports.jestConfigExtensions.find((ext) => tree.exists(`${projectPath}/jest.config.${ext}`));
+    return ext ? `${projectPath}/jest.config.${ext}` : null;
+}
 function findRootJestPreset(tree) {
     const ext = exports.jestPresetExtensions.find((ext) => tree.exists(`jest.preset.${ext}`));
     return ext ? `jest.preset.${ext}` : null;