@nx/jest 22.7.0-rc.2 → 22.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "22.7.0-rc.2",
+  "version": "22.7.1",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -38,8 +38,8 @@
   "dependencies": {
     "@jest/reporters": "^30.0.2",
     "@jest/test-result": "^30.0.2",
-    "@nx/devkit": "22.7.0-rc.2",
-    "@nx/js": "22.7.0-rc.2",
+    "@nx/devkit": "22.7.1",
+    "@nx/js": "22.7.1",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^30.0.2",
@@ -53,7 +53,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "nx": "22.7.0-rc.2"
+    "nx": "22.7.1"
   },
   "publishConfig": {
     "access": "public"

package/src/migrations/update-22-2-0/convert-jest-config-to-cjs.d.ts

@@ -5,8 +5,6 @@ import { Tree } from '@nx/devkit';
  * in newer versions (22+, 24+) can cause issues with ESM syntax in .ts files
  * when the project is configured for CommonJS.
  *
- * This migration only runs if @nx/jest/plugin is registered in nx.json.
- *
  * Conversions:
  * - `export default { ... }` -> `module.exports = { ... }`
  * - `import { x } from 'y'` -> `const { x } = require('y')`
@@ -16,8 +14,8 @@ import { Tree } from '@nx/devkit';
  * - `import.meta`
  * - top-level `await`
  *
- * Projects with `type: module` in package.json will be warned as they are
- * incompatible with @nx/jest/plugin which forces CommonJS resolution.
+ * Projects with `type: module` in package.json are skipped and warned about,
+ * as they use ESM semantics and don't need the CJS conversion.
  */
 export default function convertJestConfigToCjs(tree: Tree): Promise<() => void>;
 //# sourceMappingURL=convert-jest-config-to-cjs.d.ts.map

package/src/migrations/update-22-2-0/convert-jest-config-to-cjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-jest-config-to-cjs.d.ts","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-22-2-0/convert-jest-config-to-cjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAA8B,sBAAsB,CAAC,IAAI,EAAE,IAAI,uBA+F9D"}
+{"version":3,"file":"convert-jest-config-to-cjs.d.ts","sourceRoot":"","sources":["../../../../../../packages/jest/src/migrations/update-22-2-0/convert-jest-config-to-cjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,sBAAsB,CAAC,IAAI,EAAE,IAAI,uBAmF9D"}

package/src/migrations/update-22-2-0/convert-jest-config-to-cjs.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = convertJestConfigToCjs;
 const devkit_1 = require("@nx/devkit");
-const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const path_1 = require("path");
 /**
  * Migration to convert jest.config.ts files from ESM to CJS syntax for projects
@@ -10,8 +9,6 @@ const path_1 = require("path");
  * in newer versions (22+, 24+) can cause issues with ESM syntax in .ts files
  * when the project is configured for CommonJS.
  *
- * This migration only runs if @nx/jest/plugin is registered in nx.json.
- *
  * Conversions:
  * - `export default { ... }` -> `module.exports = { ... }`
  * - `import { x } from 'y'` -> `const { x } = require('y')`
@@ -21,24 +18,16 @@ const path_1 = require("path");
  * - `import.meta`
  * - top-level `await`
  *
- * Projects with `type: module` in package.json will be warned as they are
- * incompatible with @nx/jest/plugin which forces CommonJS resolution.
+ * Projects with `type: module` in package.json are skipped and warned about,
+ * as they use ESM semantics and don't need the CJS conversion.
  */
 async function convertJestConfigToCjs(tree) {
-    // If @nx/jest/plugin not used, then there will not be any problems with graph construction, which
-    // is what we're trying to address.
-    if (!isJestPluginRegistered(tree))
-        return;
     const { ast: parseAst, query } = require('@phenomnomnominal/tsquery');
     const jestConfigPaths = await (0, devkit_1.globAsync)(tree, ['**/jest.config.ts']);
     const projectsWithEsmOnlyFeatures = [];
     const projectsWithTypeModule = [];
     const modifiedFiles = [];
     for (const configPath of jestConfigPaths) {
-        // Skip config files that are excluded from the plugin via include/exclude patterns
-        const pluginRegistration = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, '@nx/jest/plugin', configPath);
-        if (!pluginRegistration)
-            continue;
         const projectRoot = (0, path_1.dirname)(configPath);
         const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
         const rootPackageJsonPath = 'package.json';
@@ -52,8 +41,8 @@ async function convertJestConfigToCjs(tree) {
             rootPackageJson = (0, devkit_1.readJson)(tree, rootPackageJsonPath);
         }
         const effectiveType = projectPackageJson?.type ?? rootPackageJson?.type ?? 'commonjs'; // CJS is default if missing
-        // If type is "module", warn user - this is incompatible with @nx/jest/plugin
-        // Should not be possible, but it's possible that there's a way to get this working that we're unaware of
+        // If type is "module", skip conversion: the file already runs under ESM
+        // semantics and does not need the CJS rewrite.
         if (effectiveType === 'module') {
             projectsWithTypeModule.push(configPath);
             continue;
@@ -79,9 +68,9 @@ async function convertJestConfigToCjs(tree) {
     if (hasWarnings) {
         return () => {
             if (projectsWithTypeModule.length > 0) {
-                devkit_1.logger.warn(`The following projects have "type": "module" in their package.json which is incompatible ` +
-                    `with @nx/jest/plugin. Consider removing "type": "module" ` +
-                    `or using a different Jest configuration approach:\n` +
+                devkit_1.logger.warn(`The following jest.config.ts files belong to projects with "type": "module" in their package.json ` +
+                    `and were left as-is. If you use @nx/jest/plugin, it forces CommonJS resolution, so consider ` +
+                    `removing "type": "module" or using a different Jest configuration approach:\n` +
                     projectsWithTypeModule.map((p) => `  - ${p}`).join('\n'));
             }
             if (projectsWithEsmOnlyFeatures.length > 0) {
@@ -134,26 +123,36 @@ function convertImportsToRequire(content, parseAst, query) {
             content = replaceNode(content, importDecl, requireStatement);
             continue;
         }
+        // `import type ...` is erased by Node's type-stripping at runtime, so it
+        // can remain in the file untouched — this preserves editor/tsc type safety.
+        if (importClause.isTypeOnly) {
+            continue;
+        }
         const parts = [];
+        const typeOnlySpecifiers = [];
         // Default import: import x from 'module'
         if (importClause.name) {
             const defaultName = importClause.name.getText();
             parts.push(`const ${defaultName} = require('${moduleSpecifier}').default ?? require('${moduleSpecifier}')`);
         }
-        // Named imports: import { a, b } from 'module'
         if (importClause.namedBindings) {
             if (ts.isNamedImports(importClause.namedBindings)) {
-                const namedImports = importClause.namedBindings.elements
-                    .map((element) => {
+                const valueSpecifiers = [];
+                for (const element of importClause.namedBindings.elements) {
                     const name = element.name.getText();
                     const propertyName = element.propertyName?.getText();
-                    if (propertyName) {
-                        return `${propertyName}: ${name}`;
+                    if (element.isTypeOnly) {
+                        // Inline `type` modifier: `import { type Foo, bar } from 'x'`.
+                        // Preserve the type-only portion so type references still resolve.
+                        typeOnlySpecifiers.push(propertyName ? `${propertyName} as ${name}` : name);
+                    }
+                    else {
+                        valueSpecifiers.push(propertyName ? `${propertyName}: ${name}` : name);
                     }
-                    return name;
-                })
-                    .join(', ');
-                parts.push(`const { ${namedImports} } = require('${moduleSpecifier}')`);
+                }
+                if (valueSpecifiers.length) {
+                    parts.push(`const { ${valueSpecifiers.join(', ')} } = require('${moduleSpecifier}')`);
+                }
             }
             else if (ts.isNamespaceImport(importClause.namedBindings)) {
                 // Namespace import: import * as x from 'module'
@@ -161,8 +160,16 @@ function convertImportsToRequire(content, parseAst, query) {
                 parts.push(`const ${namespaceName} = require('${moduleSpecifier}')`);
             }
         }
-        const requireStatement = parts.join(';\n');
-        content = replaceNode(content, importDecl, requireStatement);
+        const replacementParts = [];
+        if (typeOnlySpecifiers.length) {
+            replacementParts.push(`import type { ${typeOnlySpecifiers.join(', ')} } from '${moduleSpecifier}'`);
+        }
+        replacementParts.push(...parts);
+        if (replacementParts.length === 0) {
+            continue;
+        }
+        const replacement = replacementParts.join(';\n');
+        content = replaceNode(content, importDecl, replacement);
     }
     return content;
 }
@@ -191,14 +198,3 @@ function replaceNode(content, node, replacement) {
     }
     return content.slice(0, start) + replacement + ';' + content.slice(endPos);
 }
-function isJestPluginRegistered(tree) {
-    if (!tree.exists('nx.json')) {
-        return false;
-    }
-    const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-    const plugins = nxJson.plugins ?? [];
-    return plugins.some((plugin) => {
-        const pluginName = typeof plugin === 'string' ? plugin : plugin.plugin;
-        return pluginName === '@nx/jest/plugin' || pluginName === '@nx/jest';
-    });
-}