@nx/jest 19.0.4 → 19.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "19.0.4",
+  "version": "19.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": {
@@ -36,8 +36,8 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "19.0.4",
-    "@nx/js": "19.0.4",
+    "@nx/devkit": "19.0.5",
+    "@nx/js": "19.0.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
@@ -48,7 +48,7 @@
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nrwl/jest": "19.0.4"
+    "@nrwl/jest": "19.0.5"
   },
   "publishConfig": {
     "access": "public"

package/preset.d.ts

@@ -0,0 +1,3 @@
+import { nxPreset } from './preset/jest-preset';
+export { nxPreset };
+export default nxPreset;

package/preset.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nxPreset = void 0;
+const jest_preset_1 = require("./preset/jest-preset");
+Object.defineProperty(exports, "nxPreset", { enumerable: true, get: function () { return jest_preset_1.nxPreset; } });
+exports.default = jest_preset_1.nxPreset;

package/src/generators/configuration/configuration.js

@@ -11,7 +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 config_file_1 = require("../../utils/config/config-file");
 const schemaDefaults = {
     setupFile: 'none',
     babelJest: false,
@@ -61,7 +61,7 @@ async function configurationGeneratorInternal(tree, schema) {
     if (!schema.skipPackageJson) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     }
-    const presetExt = (0, is_preset_cjs_1.isPresetCjs)(tree) ? 'cjs' : 'js';
+    const presetExt = (0, config_file_1.getPresetExt)(tree);
     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, presetExt);

package/src/generators/configuration/files/src/test-setup.ts__tmpl__

@@ -0,0 +1 @@
+<% if(setupFile === 'react-native') { %>import '@testing-library/jest-native/extend-expect';<% } %>

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

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

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

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

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

@@ -3,21 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
+const config_file_1 = require("../../../utils/config/config-file");
 async function createJestConfig(tree, options, presetExt) {
     if (!tree.exists(`jest.preset.${presetExt}`)) {
-        // preset is always js file.
-        tree.write(`jest.preset.${presetExt}`, `
-      const nxPreset = require('@nx/jest/preset').default;
+        if (presetExt === 'mjs') {
+            tree.write(`jest.preset.${presetExt}`, `import { nxPreset } from '@nx/jest/preset.js';
 
-      module.exports = { ...nxPreset }`);
+export default { ...nxPreset };`);
+        }
+        else {
+            // js or cjs
+            tree.write(`jest.preset.${presetExt}`, `const nxPreset = require('@nx/jest/preset').default;
+  
+module.exports = { ...nxPreset };`);
+        }
     }
     if (options.rootProject) {
         // we don't want any config to be made because the `configurationGenerator` will do it.
         // will copy the template config file
         return;
     }
-    const rootJestPath = (0, find_root_jest_files_1.findRootJestConfig)(tree);
+    const rootJestPath = (0, config_file_1.findRootJestConfig)(tree);
     if (!rootJestPath) {
         // if there's not root jest config, we will create one and return
         // this can happen when:

package/src/generators/configuration/lib/update-jestconfig.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 updateJestConfig(host: Tree, options: NormalizedJestProjectSchema): void;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = void 0;
-const find_root_jest_files_1 = require("../../../utils/config/find-root-jest-files");
-const update_config_1 = require("../../../utils/config/update-config");
 const devkit_1 = require("@nx/devkit");
+const config_file_1 = require("../../../utils/config/config-file");
+const update_config_1 = require("../../../utils/config/update-config");
 function isUsingUtilityFunction(host) {
-    const rootConfig = (0, find_root_jest_files_1.findRootJestConfig)(host);
+    const rootConfig = (0, config_file_1.findRootJestConfig)(host);
     if (!rootConfig) {
         return false;
     }
@@ -18,9 +18,9 @@ function updateJestConfig(host, options) {
         return;
     }
     const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const rootConfig = (0, find_root_jest_files_1.findRootJestConfig)(host);
+    const rootConfig = (0, config_file_1.findRootJestConfig)(host);
     if (rootConfig) {
-        (0, update_config_1.addPropertyToJestConfig)(host, (0, find_root_jest_files_1.findRootJestConfig)(host), 'projects', `<rootDir>/${project.root}`);
+        (0, update_config_1.addPropertyToJestConfig)(host, (0, config_file_1.findRootJestConfig)(host), 'projects', `<rootDir>/${project.root}`);
     }
 }
 exports.updateJestConfig = updateJestConfig;

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

@@ -6,7 +6,7 @@ export interface JestProjectSchema {
    * @deprecated use setupFile instead
    */
   skipSetupFile?: boolean;
-  setupFile?: 'angular' | 'web-components' | 'none';
+  setupFile?: 'angular' | 'web-components' | 'react-native' | 'none';
   skipSerializers?: boolean;
   testEnvironment?: 'node' | 'jsdom' | 'none';
   /**

package/src/generators/init/init.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jestInitGeneratorInternal = exports.jestInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
+const config_file_1 = require("../../utils/config/config-file");
 const versions_1 = require("../../utils/versions");
-const is_preset_cjs_1 = require("../../utils/config/is-preset-cjs");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-function updateProductionFileSet(tree, presetExt) {
+function updateProductionFileSet(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
@@ -26,7 +26,7 @@ function updateProductionFileSet(tree, presetExt) {
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function addJestTargetDefaults(tree, presetEnv) {
+function addJestTargetDefaults(tree, presetExt) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults['@nx/jest:jest'] ??= {};
@@ -36,7 +36,7 @@ function addJestTargetDefaults(tree, presetEnv) {
     nxJson.targetDefaults['@nx/jest:jest'].inputs ??= [
         'default',
         productionFileSet ? '^production' : '^default',
-        `{workspaceRoot}/jest.preset.${presetEnv}`,
+        `{workspaceRoot}/jest.preset.${presetExt}`,
     ];
     nxJson.targetDefaults['@nx/jest:jest'].options ??= {
         passWithNoTests: true,
@@ -64,9 +64,9 @@ async function jestInitGeneratorInternal(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    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);
+    const presetExt = (0, config_file_1.getPresetExt)(tree);
+    if (!tree.exists(`jest.preset.${presetExt}`)) {
+        updateProductionFileSet(tree);
         if (options.addPlugin) {
             await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/jest/plugin', plugin_1.createNodes, {
                 targetName: ['test', 'jest:test', 'jest-test'],

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

@@ -0,0 +1,8 @@
+import { type Tree } from '@nx/devkit';
+export declare const jestConfigExtensions: readonly ["js", "ts", "mjs", "cjs", "mts", "cts"];
+export type JestConfigExtension = typeof jestConfigExtensions[number];
+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 findRootJestPreset(tree: Tree): string | null;

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findRootJestPreset = exports.findRootJestConfig = exports.getPresetExt = exports.jestPresetExtensions = exports.jestConfigExtensions = void 0;
+const devkit_1 = require("@nx/devkit");
+exports.jestConfigExtensions = [
+    'js',
+    'ts',
+    'mjs',
+    'cjs',
+    'mts',
+    'cts',
+];
+exports.jestPresetExtensions = ['js', 'cjs', 'mjs'];
+function getPresetExt(tree) {
+    const ext = exports.jestPresetExtensions.find((ext) => tree.exists(`jest.preset.${ext}`));
+    if (ext) {
+        return ext;
+    }
+    const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    if (rootPkgJson.type && rootPkgJson.type === 'module') {
+        // use cjs if package.json type is module
+        return 'cjs';
+    }
+    // default to js
+    return 'js';
+}
+exports.getPresetExt = getPresetExt;
+function findRootJestConfig(tree) {
+    const ext = exports.jestConfigExtensions.find((ext) => tree.exists(`jest.config.${ext}`));
+    return ext ? `jest.config.${ext}` : null;
+}
+exports.findRootJestConfig = findRootJestConfig;
+function findRootJestPreset(tree) {
+    const ext = exports.jestPresetExtensions.find((ext) => tree.exists(`jest.preset.${ext}`));
+    return ext ? `jest.preset.${ext}` : null;
+}
+exports.findRootJestPreset = findRootJestPreset;

package/src/utils/config/find-root-jest-files.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function findRootJestConfig(tree: Tree): string | null;
-export declare function findRootJestPreset(tree: Tree): string | null;

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

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findRootJestPreset = exports.findRootJestConfig = void 0;
-function findRootJestConfig(tree) {
-    if (tree.exists('jest.config.js')) {
-        return 'jest.config.js';
-    }
-    if (tree.exists('jest.config.ts')) {
-        return 'jest.config.ts';
-    }
-    return null;
-}
-exports.findRootJestConfig = findRootJestConfig;
-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

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

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

@@ -1,15 +0,0 @@
-"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;