@nx/jest 18.0.3 → 18.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "18.0.3",
+  "version": "18.0.5",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -45,9 +45,9 @@
     "minimatch": "9.0.3",
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.3",
-    "@nx/js": "18.0.3",
-    "@nrwl/jest": "18.0.3"
+    "@nx/devkit": "18.0.5",
+    "@nx/js": "18.0.5",
+    "@nrwl/jest": "18.0.5"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -11,6 +11,7 @@ const update_vscode_recommended_extensions_1 = require("./lib/update-vscode-reco
 const update_workspace_1 = require("./lib/update-workspace");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const is_preset_cjs_1 = require("../../utils/config/is-preset-cjs");
 const schemaDefaults = {
     setupFile: 'none',
     babelJest: false,
@@ -57,9 +58,10 @@ async function configurationGeneratorInternal(tree, schema) {
     if (!schema.skipPackageJson) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     }
-    await (0, create_jest_config_1.createJestConfig)(tree, options);
+    const presetExt = (0, is_preset_cjs_1.isPresetCjs)(tree) ? 'cjs' : 'js';
+    await (0, create_jest_config_1.createJestConfig)(tree, options, presetExt);
     (0, check_for_test_target_1.checkForTestTarget)(tree, options);
-    (0, create_files_1.createFiles)(tree, options);
+    (0, create_files_1.createFiles)(tree, options, presetExt);
     (0, update_tsconfig_1.updateTsConfig)(tree, options);
     (0, update_vscode_recommended_extensions_1.updateVsCodeRecommendedExtensions)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);

package/src/generators/configuration/files/jest.config.ts__tmpl__

@@ -1,7 +1,7 @@
 /* eslint-disable */
 <% if(js){ %>module.exports =<% } else{ %>export default<% } %> {
   displayName: '<%= project %>',
-  preset: '<%= offsetFromRoot %>jest.preset.js',<% if(setupFile !== 'none') { %>
+  preset: '<%= offsetFromRoot %>jest.preset.<%= presetExt %>',<% if(setupFile !== 'none') { %>
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% } %><% if(testEnvironment) { %>
   testEnvironment: '<%= testEnvironment %>',<% } %><% if(skipSerializers){ %>
   transform: {

package/src/generators/configuration/files-angular/jest.config.ts__tmpl__

@@ -1,7 +1,7 @@
 /* eslint-disable */
 <% if(js){ %>module.exports =<% } else{ %>export default<% } %> {
   displayName: '<%= project %>',
-  preset: '<%= offsetFromRoot %>jest.preset.js',
+  preset: '<%= offsetFromRoot %>jest.preset.<%= presetExt %>',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% if(testEnvironment) { %>
   testEnvironment: '<%= testEnvironment %>',<% } %>
   coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>',

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

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedJestProjectSchema } from '../schema';
-export declare function createFiles(tree: Tree, options: NormalizedJestProjectSchema): void;
+export declare function createFiles(tree: Tree, options: NormalizedJestProjectSchema, presetExt: 'cjs' | 'js'): void;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-function createFiles(tree, options) {
+function createFiles(tree, options, presetExt) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const filesFolder = options.setupFile === 'angular' ? '../files-angular' : '../files';
     let transformer;
@@ -35,6 +35,7 @@ function createFiles(tree, options) {
         rootProject: options.rootProject,
         projectRoot: options.rootProject ? options.project : projectConfig.root,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        presetExt,
     });
     if (options.setupFile === 'none') {
         tree.delete((0, path_1.join)(projectConfig.root, './src/test-setup.ts'));

package/src/generators/configuration/lib/create-jest-config.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
 import type { NormalizedJestProjectSchema } from '../schema';
-export declare function createJestConfig(tree: Tree, options: Partial<NormalizedJestProjectSchema>): Promise<void>;
+export declare function createJestConfig(tree: Tree, options: Partial<NormalizedJestProjectSchema>, presetExt: 'cjs' | 'js'): Promise<void>;

package/src/generators/configuration/lib/create-jest-config.js

@@ -4,10 +4,10 @@ exports.createJestConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
 const find_root_jest_files_1 = require("../../../utils/config/find-root-jest-files");
-async function createJestConfig(tree, options) {
-    if (!tree.exists('jest.preset.js')) {
+async function createJestConfig(tree, options, presetExt) {
+    if (!tree.exists(`jest.preset.${presetExt}`)) {
         // preset is always js file.
-        tree.write(`jest.preset.js`, `
+        tree.write(`jest.preset.${presetExt}`, `
       const nxPreset = require('@nx/jest/preset').default;
 
       module.exports = { ...nxPreset }`);
@@ -44,9 +44,9 @@ async function createJestConfig(tree, options) {
             const [jestTargetName, jestTargetConfigInGraph] = jestTarget;
             // if root project doesn't have jest target, there's nothing to migrate
             const rootProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, rootProject.name);
-            if (rootProjectConfig.targets['test']?.executor === 'nx:run-commands'
-                ? rootProjectConfig.targets['test']?.command !== 'jest'
-                : rootProjectConfig.targets['test']?.options?.jestConfig !==
+            if (rootProjectConfig.targets?.['test']?.executor === 'nx:run-commands'
+                ? rootProjectConfig.targets?.['test']?.command !== 'jest'
+                : rootProjectConfig.targets?.['test']?.options?.jestConfig !==
                     rootJestPath) {
                 // Jest target has already been updated
                 return;

package/src/generators/init/init.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
+const is_preset_cjs_1 = require("../../utils/config/is-preset-cjs");
 function addPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.plugins ??= [];
@@ -20,7 +21,7 @@ function addPlugin(tree) {
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function updateProductionFileSet(tree) {
+function updateProductionFileSet(tree, presetExt) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
@@ -40,7 +41,7 @@ function updateProductionFileSet(tree) {
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function addJestTargetDefaults(tree) {
+function addJestTargetDefaults(tree, presetEnv) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults['@nx/jest:jest'] ??= {};
@@ -50,7 +51,7 @@ function addJestTargetDefaults(tree) {
     nxJson.targetDefaults['@nx/jest:jest'].inputs ??= [
         'default',
         productionFileSet ? '^production' : '^default',
-        '{workspaceRoot}/jest.preset.js',
+        `{workspaceRoot}/jest.preset.${presetEnv}`,
     ];
     nxJson.targetDefaults['@nx/jest:jest'].options ??= {
         passWithNoTests: true,
@@ -75,13 +76,14 @@ function jestInitGenerator(tree, options) {
 exports.jestInitGenerator = jestInitGenerator;
 async function jestInitGeneratorInternal(tree, options) {
     options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
-    if (!tree.exists('jest.preset.js')) {
-        updateProductionFileSet(tree);
+    const presetExt = (0, is_preset_cjs_1.isPresetCjs)(tree) ? 'cjs' : 'js';
+    if (!tree.exists('jest.preset.js') && !tree.exists('jest.preset.cjs')) {
+        updateProductionFileSet(tree, presetExt);
         if (options.addPlugin) {
             addPlugin(tree);
         }
         else {
-            addJestTargetDefaults(tree);
+            addJestTargetDefaults(tree, presetExt);
         }
     }
     const tasks = [];

package/src/utils/config/find-root-jest-files.js

@@ -15,6 +15,9 @@ function findRootJestPreset(tree) {
     if (tree.exists('jest.preset.js')) {
         return 'jest.preset.js';
     }
+    if (tree.exists('jest.preset.cjs')) {
+        return 'jest.preset.cjs';
+    }
     return null;
 }
 exports.findRootJestPreset = findRootJestPreset;

package/src/utils/config/is-preset-cjs.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function isPresetCjs(tree: Tree): boolean;

package/src/utils/config/is-preset-cjs.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPresetCjs = void 0;
+const devkit_1 = require("@nx/devkit");
+function isPresetCjs(tree) {
+    if (tree.exists('jest.preset.cjs')) {
+        return true;
+    }
+    const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    if (rootPkgJson.type && rootPkgJson.type === 'module') {
+        return true;
+    }
+    return false;
+}
+exports.isPresetCjs = isPresetCjs;