@nx/jest 21.2.1 → 21.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "21.2.1",
+  "version": "21.2.3",
   "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": "21.2.1",
-    "@nx/js": "21.2.1",
+    "@nx/devkit": "21.2.3",
+    "@nx/js": "21.2.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^29.4.1",

package/src/generators/configuration/configuration.js

@@ -58,6 +58,10 @@ function configurationGenerator(tree, schema) {
 }
 async function configurationGeneratorInternal(tree, schema) {
     const options = normalizeOptions(tree, schema);
+    // we'll only add the vscode recommended extension if the jest preset does
+    // not exist, which most likely means this is a first run, in the cases it's
+    // not a first run, we'll skip adding it but it's not a critical thing to do
+    const shouldAddVsCodeRecommendations = (0, config_file_1.findRootJestPreset)(tree) === null;
     const tasks = [];
     tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
     tasks.push(await (0, init_1.jestInitGenerator)(tree, { ...options, skipFormat: true }));
@@ -69,7 +73,9 @@ async function configurationGeneratorInternal(tree, schema) {
     (0, check_for_test_target_1.checkForTestTarget)(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);
+    if (shouldAddVsCodeRecommendations) {
+        (0, update_vscode_recommended_extensions_1.updateVsCodeRecommendedExtensions)(tree);
+    }
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const hasPlugin = nxJson.plugins?.some((p) => {
         if (typeof p === 'string') {

package/src/plugins/plugin.js

@@ -32,11 +32,11 @@ exports.createNodesV2 = [
         const targetsCache = readTargetsCache(cachePath);
         // Cache jest preset(s) to avoid penalties of module load times. Most of jest configs will use the same preset.
         const presetCache = {};
-        const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
+        const isInPackageManagerWorkspaces = buildPackageJsonWorkspacesMatcher(context.workspaceRoot);
         options = normalizeOptions(options);
         const { roots: projectRoots, configFiles: validConfigFiles } = configFiles.reduce((acc, configFile) => {
             const potentialRoot = (0, path_1.dirname)(configFile);
-            if (checkIfConfigFileShouldBeProject(configFile, potentialRoot, packageManagerWorkspacesGlob, context)) {
+            if (checkIfConfigFileShouldBeProject(configFile, potentialRoot, isInPackageManagerWorkspaces, context)) {
                 acc.roots.push(potentialRoot);
                 acc.configFiles.push(configFile);
             }
@@ -77,8 +77,8 @@ exports.createNodes = [
     async (configFilePath, options, context) => {
         devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
         const projectRoot = (0, path_1.dirname)(configFilePath);
-        const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
-        if (!checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageManagerWorkspacesGlob, context)) {
+        const isInPackageManagerWorkspaces = buildPackageJsonWorkspacesMatcher(context.workspaceRoot);
+        if (!checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPackageManagerWorkspaces, context)) {
             return {};
         }
         options = normalizeOptions(options);
@@ -94,7 +94,14 @@ exports.createNodes = [
         };
     },
 ];
-function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageManagerWorkspacesGlob, context) {
+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));
+    return (path) => (0, minimatch_1.minimatch)(path, packageManagerWorkspacesGlob);
+}
+function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPackageManagerWorkspaces, context) {
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
     if (!siblingFiles.includes('package.json') &&
@@ -104,7 +111,7 @@ function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageMa
     else if (!siblingFiles.includes('project.json') &&
         siblingFiles.includes('package.json')) {
         const path = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
-        const isPackageJsonProject = (0, minimatch_1.minimatch)(path, packageManagerWorkspacesGlob);
+        const isPackageJsonProject = isInPackageManagerWorkspaces(path);
         if (!isPackageJsonProject) {
             return false;
         }
@@ -122,7 +129,14 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
     const absConfigFilePath = (0, path_1.resolve)(context.workspaceRoot, configFilePath);
     if (require.cache[absConfigFilePath])
         (0, config_utils_1.clearRequireCache)();
-    const rawConfig = await (0, config_utils_1.loadConfigFile)(absConfigFilePath);
+    const rawConfig = await (0, config_utils_1.loadConfigFile)(absConfigFilePath, 
+    // lookup for the same files we look for in the resolver and fall back to tsconfig.json
+    [
+        'tsconfig.spec.json',
+        'tsconfig.test.json',
+        'tsconfig.jest.json',
+        'tsconfig.json',
+    ]);
     const targets = {};
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const tsNodeCompilerOptions = JSON.stringify({