@nx/jest 23.2.0-beta.4 → 23.2.0-beta.5

package/dist/src/executors/jest/jest.impl.d.ts

@@ -1,7 +1,7 @@
 import { JestExecutorOptions } from './schema';
 import { Config } from '@jest/types';
 import { ExecutorContext, TaskGraph } from '@nx/devkit';
-import type { BatchResults } from 'nx/src/tasks-runner/batch/batch-messages';
+import { type BatchResults } from '@nx/devkit/internal';
 export declare function jestExecutor(options: JestExecutorOptions, context: ExecutorContext): Promise<{
     success: boolean;
 }>;

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJestConfig = createJestConfig;
 const devkit_1 = require("@nx/devkit");
-const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
 const config_file_1 = require("../../../utils/config/config-file");
 const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/devkit/internal");
 async function createJestConfig(tree, options, presetExt) {
     if (!tree.exists(`jest.preset.${presetExt}`)) {
         if (presetExt === 'mjs') {
@@ -63,7 +63,7 @@ module.exports = { ...nxPreset };`);
                 : 'lib'}.${options.js ? 'js' : 'ts'}`;
             tree.rename(rootJestPath, jestProjectConfig);
             const nxJson = (0, devkit_1.readNxJson)(tree);
-            const targetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(jestTargetName, nxJson.targetDefaults, jestTargetConfigInGraph.executor);
+            const targetDefaults = (0, internal_2.readTargetDefaultsForTarget)(jestTargetName, nxJson.targetDefaults, jestTargetConfigInGraph.executor);
             const target = (rootProjectConfig.targets[jestTargetName] ??=
                 jestTargetConfigInGraph.executor === 'nx:run-commands'
                     ? { command: `jest --config ${jestProjectConfig}` }

package/dist/src/migrations/update-23-0-0/migrate-jest-executor-setup-file.js

@@ -4,8 +4,6 @@ exports.default = default_1;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const internal_2 = require("@nx/js/internal");
-const devkit_internals_1 = require("nx/src/devkit-internals");
-const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
 const path_1 = require("path");
 const functions_1 = require("../../utils/config/functions");
 const EXECUTOR_TO_MIGRATE = '@nx/jest:jest';
@@ -168,7 +166,7 @@ function migrateOneJestConfig(tree, jestConfigPath, setupFile, location, rewritt
 function migrateInheritedSetupFile(tree, project, target, nxJson, projectConfigCache, rewrittenJestConfigs, warnLists) {
     if (!nxJson?.targetDefaults)
         return;
-    const matched = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(target, nxJson.targetDefaults, EXECUTOR_TO_MIGRATE);
+    const matched = (0, internal_1.readTargetDefaultsForTarget)(target, nxJson.targetDefaults, EXECUTOR_TO_MIGRATE);
     const inheritedSetupFile = matched?.options?.[SETUP_FILE];
     if (inheritedSetupFile === undefined)
         return;
@@ -308,14 +306,14 @@ function resolveJestConfigPath(callbackJestConfig, targetJestConfig, projectRoot
         return expandWorkspaceRelativePath(explicit, projectRoot);
     if (!nxJson?.targetDefaults)
         return undefined;
-    const matched = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(target, nxJson.targetDefaults, EXECUTOR_TO_MIGRATE);
+    const matched = (0, internal_1.readTargetDefaultsForTarget)(target, nxJson.targetDefaults, EXECUTOR_TO_MIGRATE);
     const fromDefaults = matched?.options?.[JEST_CONFIG];
     if (fromDefaults)
         return expandWorkspaceRelativePath(fromDefaults, projectRoot);
     return undefined;
 }
 function expandWorkspaceRelativePath(value, projectRoot) {
-    return path_1.posix.normalize((0, devkit_internals_1.interpolate)(value, {
+    return path_1.posix.normalize((0, internal_1.interpolate)(value, {
         projectRoot: projectRoot || '.',
         workspaceRoot: '.',
     }));

package/dist/src/plugins/plugin.js

@@ -6,13 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const devkit_internals_1 = require("nx/src/devkit-internals");
-const package_json_1 = require("nx/src/plugins/package-json");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const globs_1 = require("nx/src/utils/globs");
-const installation_directory_1 = require("nx/src/utils/installation-directory");
-const plugins_1 = require("nx/src/utils/plugins");
-const workspace_context_1 = require("nx/src/utils/workspace-context");
 const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
 const versions_1 = require("../utils/versions");
@@ -21,8 +14,8 @@ const jestConfigGlob = '**/jest.config.{cjs,mjs,js,cts,mts,ts}';
 exports.createNodes = [
     jestConfigGlob,
     async (configFiles, options, context) => {
-        const optionsHash = (0, devkit_internals_1.hashObject)(options);
-        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `jest-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `jest-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         // Cache jest preset(s) to avoid penalties of module load times. Most of jest configs will use the same preset.
         const presetCache = {};
@@ -111,7 +104,7 @@ function buildPackageJsonWorkspacesMatcher(workspaceRoot) {
     if (process.env.NX_INFER_ALL_PACKAGE_JSONS === 'true') {
         return () => true;
     }
-    const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(workspaceRoot));
+    const packageManagerWorkspacesGlob = (0, internal_1.combineGlobPatterns)((0, internal_1.getGlobPatternsFromPackageManagerWorkspaces)(workspaceRoot));
     return (path) => (0, minimatch_1.minimatch)(path, packageManagerWorkspacesGlob);
 }
 function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPackageManagerWorkspaces, context) {
@@ -181,7 +174,7 @@ async function buildJestTargets(rawConfig, needsDtsInputs, configFilePath, proje
     const cache = (target.cache = true);
     const inputs = (target.inputs = await getInputs(namedInputs, rawConfig, rootDir, projectRoot, context.workspaceRoot, presetCache, needsDtsInputs, useJestResolver));
     let metadata;
-    const groupName = options?.ciGroupName ?? (0, plugins_1.deriveGroupNameFromTarget)(options?.ciTargetName);
+    const groupName = options?.ciGroupName ?? (0, internal_1.deriveGroupNameFromTarget)(options?.ciTargetName);
     if (disableJestRuntime) {
         const outputs = (target.outputs = getOutputs(projectRoot, rawConfig.coverageDirectory
             ? (0, node_path_1.join)(context.workspaceRoot, projectRoot, rawConfig.coverageDirectory)
@@ -567,7 +560,7 @@ function resolveJestPath(projectRoot, workspaceRoot) {
         return resolvedJestPaths[projectRoot];
     }
     resolvedJestPaths[projectRoot] = require.resolve('jest', {
-        paths: [projectRoot, ...(0, installation_directory_1.getNxRequirePaths)(workspaceRoot), __dirname],
+        paths: [projectRoot, ...(0, internal_1.getNxRequirePaths)(workspaceRoot), __dirname],
     });
     return resolvedJestPaths[projectRoot];
 }
@@ -590,7 +583,7 @@ function requireJestUtil(packageName, projectRoot, workspaceRoot) {
 }
 async function getTestPaths(projectRoot, rawConfig, rootDir, context, presetCache) {
     const testMatch = await getJestOption(rawConfig, rootDir, 'testMatch', presetCache);
-    let paths = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, (testMatch || [
+    let paths = await (0, internal_1.globWithWorkspaceContext)(context.workspaceRoot, (testMatch || [
         // Default copied from https://github.com/jestjs/jest/blob/d1a2ed7/packages/jest-config/src/Defaults.ts#L84
         '**/__tests__/**/*.?([mc])[jt]s?(x)',
         '**/?(*.)+(spec|test).?([mc])[jt]s?(x)',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.5",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -117,11 +117,11 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nx/devkit": "23.2.0-beta.4",
-    "@nx/js": "23.2.0-beta.4"
+    "@nx/devkit": "23.2.0-beta.5",
+    "@nx/js": "23.2.0-beta.5"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.5"
   },
   "publishConfig": {
     "access": "public"