@nx/jest 20.4.0-beta.1 → 20.4.0-beta.2

package/package.json

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

package/src/generators/configuration/configuration.js

@@ -85,6 +85,15 @@ async function configurationGeneratorInternal(tree, schema) {
     }
     if (options.isTsSolutionSetup) {
         ignoreTestOutput(tree);
+        // in the TS solution setup, the test target depends on the build outputs
+        // so we need to setup the task pipeline accordingly
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults[options.targetName] ??= {};
+        nxJson.targetDefaults[options.targetName].dependsOn ??= [];
+        nxJson.targetDefaults[options.targetName].dependsOn.push('^build');
+        nxJson.targetDefaults[options.targetName].dependsOn = Array.from(new Set(nxJson.targetDefaults[options.targetName].dependsOn));
+        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/configuration/files/jest-config-ts-solution/jest.config.ts__tmpl__

@@ -0,0 +1,28 @@
+<%_ if (transformer === '@swc/jest') { _%>
+/* eslint-disable */
+<% if(js) {%>const { readFileSync } = require('fs')<% } else { %>import { readFileSync } from 'fs';<% } %>
+
+// Reading the SWC compilation config for the spec files
+const swcJestConfig = JSON.parse(
+  readFileSync(`${__dirname}/.spec.swcrc`, 'utf-8')
+);
+
+// Disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves
+swcJestConfig.swcrc = false;
+
+<%_ } _%>
+<% if(js){ %>module.exports =<% } else{ %>export default<% } %> {
+  displayName: '<%= project %>',
+  preset: '<%= offsetFromRoot %>jest.preset.<%= presetExt %>',<% if(setupFile !== 'none') { %>
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% } %><% if(testEnvironment) { %>
+  testEnvironment: '<%= testEnvironment %>',<% } %><% if(skipSerializers){ %>
+  transform: {
+    <% if (supportTsx){ %>'^.+\\.[tj]sx?$'<% } else { %>'^.+\\.[tj]s$'<% } %>: <% if (transformerOptions) { %>['<%= transformer %>', <%- transformerOptions %>]<% } else { %>'<%= transformer %>'<% } %>
+  },
+  <% if (supportTsx) { %>moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],<% } else { %>moduleFileExtensions: ['ts', 'js', 'html'],<% } %><% } %>
+  coverageDirectory: '<%= coverageDirectory %>'<% if(rootProject){ %>,
+  testMatch: [
+    '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
+    '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
+  ],<% } %>
+};

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
+const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 const path_1 = require("path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function createFiles(tree, options, presetExt) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const filesFolder = options.setupFile === 'angular' ? '../files-angular' : '../files';
+    const commonFilesFolder = options.setupFile === 'angular' ? '../files-angular' : '../files/common';
     let transformer;
     let transformerOptions = null;
     if (options.compiler === 'babel' || options.babelJest) {
@@ -14,7 +14,10 @@ function createFiles(tree, options, presetExt) {
     }
     else if (options.compiler === 'swc') {
         transformer = '@swc/jest';
-        if (options.supportTsx) {
+        if (options.isTsSolutionSetup) {
+            transformerOptions = 'swcJestConfig';
+        }
+        else if (options.supportTsx) {
             transformerOptions =
                 "{ jsc: { parser: { syntax: 'typescript', tsx: true }, transform: { react: { runtime: 'automatic' } } } }";
         }
@@ -23,18 +26,24 @@ function createFiles(tree, options, presetExt) {
         transformer = 'ts-jest';
         transformerOptions = "{ tsconfig: '<rootDir>/tsconfig.spec.json' }";
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    if (options.compiler === 'swc' && options.isTsSolutionSetup) {
+        (0, add_swc_config_1.addSwcTestConfig)(tree, projectConfig.root, 'es6', options.supportTsx);
+    }
     const projectRoot = options.rootProject
         ? options.project
         : projectConfig.root;
     const rootOffset = (0, devkit_1.offsetFromRoot)(projectConfig.root);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesFolder), projectConfig.root, {
+    // jsdom is the default in the nx preset
+    const testEnvironment = options.testEnvironment === 'none' || options.testEnvironment === 'jsdom'
+        ? ''
+        : options.testEnvironment;
+    const coverageDirectory = options.isTsSolutionSetup
+        ? `test-output/jest/coverage`
+        : `${rootOffset}coverage/${projectRoot}`;
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, commonFilesFolder), projectConfig.root, {
         tmpl: '',
         ...options,
-        // jsdom is the default
-        testEnvironment: options.testEnvironment === 'none' || options.testEnvironment === 'jsdom'
-            ? ''
-            : options.testEnvironment,
+        testEnvironment,
         transformer,
         transformerOptions,
         js: !!options.js,
@@ -42,15 +51,33 @@ function createFiles(tree, options, presetExt) {
         projectRoot,
         offsetFromRoot: rootOffset,
         presetExt,
-        coverageDirectory: isTsSolutionSetup
-            ? `test-output/jest/coverage`
-            : `${rootOffset}coverage/${projectRoot}`,
-        extendedConfig: isTsSolutionSetup
+        coverageDirectory,
+        extendedConfig: options.isTsSolutionSetup
             ? `${rootOffset}tsconfig.base.json`
             : './tsconfig.json',
-        outDir: isTsSolutionSetup ? `./out-tsc/jest` : `${rootOffset}dist/out-tsc`,
-        module: !isTsSolutionSetup || transformer === 'ts-jest' ? 'commonjs' : undefined,
+        outDir: options.isTsSolutionSetup
+            ? `./out-tsc/jest`
+            : `${rootOffset}dist/out-tsc`,
+        module: !options.isTsSolutionSetup || transformer === 'ts-jest'
+            ? 'commonjs'
+            : undefined,
     });
+    if (options.setupFile !== 'angular') {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, options.isTsSolutionSetup
+            ? '../files/jest-config-ts-solution'
+            : '../files/jest-config-non-ts-solution'), projectConfig.root, {
+            tmpl: '',
+            ...options,
+            testEnvironment,
+            transformer,
+            transformerOptions,
+            js: !!options.js,
+            rootProject: options.rootProject,
+            offsetFromRoot: rootOffset,
+            presetExt,
+            coverageDirectory,
+        });
+    }
     if (options.setupFile === 'none') {
         tree.delete((0, path_1.join)(projectConfig.root, './src/test-setup.ts'));
     }

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

@@ -4,6 +4,7 @@ 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function createJestConfig(tree, options, presetExt) {
     if (!tree.exists(`jest.preset.${presetExt}`)) {
         if (presetExt === 'mjs') {
@@ -57,7 +58,9 @@ module.exports = { ...nxPreset };`);
                 // Jest target has already been updated
                 return;
             }
-            const jestProjectConfig = `jest.config.${rootProjectConfig.projectType === 'application' ? 'app' : 'lib'}.${options.js ? 'js' : 'ts'}`;
+            const jestProjectConfig = `jest.config.${(0, ts_solution_setup_1.getProjectType)(tree, rootProjectConfig.root, rootProjectConfig.projectType) === 'application'
+                ? 'app'
+                : '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);

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

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = updateTsConfig;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function updateTsConfig(host, options) {
-    const { root, projectType } = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    const { root, projectType: _projectType } = (0, devkit_1.readProjectConfiguration)(host, options.project);
     if (!host.exists((0, devkit_1.joinPathFragments)(root, 'tsconfig.json'))) {
         throw new Error(`Expected ${(0, devkit_1.joinPathFragments)(root, 'tsconfig.json')} to exist. Please create one.`);
     }
@@ -16,6 +17,7 @@ function updateTsConfig(host, options) {
         }
         return json;
     });
+    const projectType = (0, ts_solution_setup_1.getProjectType)(host, root, _projectType);
     // fall-back runtime tsconfig file path in case the user didn't provide one
     let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(root, projectType === 'application' ? 'tsconfig.app.json' : 'tsconfig.lib.json');
     if (options.runtimeTsconfigFileName) {