@nx/jest 20.1.0 → 20.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "20.1.0",
+  "version": "20.2.0-beta.0",
   "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.1.0",
-    "@nx/js": "20.1.0",
+    "@nx/devkit": "20.2.0-beta.0",
+    "@nx/js": "20.2.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",

package/src/generators/configuration/configuration.js

@@ -4,6 +4,7 @@ exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const config_file_1 = require("../../utils/config/config-file");
 const init_1 = require("../init/init");
 const check_for_test_target_1 = require("./lib/check-for-test-target");
@@ -48,6 +49,7 @@ function normalizeOptions(tree, options) {
         ...schemaDefaults,
         ...options,
         rootProject: project.root === '.' || project.root === '',
+        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
 }
 function configurationGenerator(tree, schema) {
@@ -81,9 +83,23 @@ async function configurationGeneratorInternal(tree, schema) {
     if (!hasPlugin || options.addExplicitTargets) {
         (0, update_workspace_1.updateWorkspace)(tree, options);
     }
+    if (options.isTsSolutionSetup) {
+        ignoreTestOutput(tree);
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function ignoreTestOutput(tree) {
+    if (!tree.exists('.gitignore')) {
+        devkit_1.logger.warn(`Couldn't find a root .gitignore file to update.`);
+    }
+    let content = tree.read('.gitignore', 'utf-8');
+    if (/^test-output$/gm.test(content)) {
+        return;
+    }
+    content = `${content}\ntest-output\n`;
+    tree.write('.gitignore', content);
+}
 exports.default = configurationGenerator;

package/src/generators/configuration/files/jest.config.ts__tmpl__

@@ -7,7 +7,7 @@
     <% 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: '<%= offsetFromRoot %>coverage/<%= projectRoot %>'<% if(rootProject){ %>,
+  coverageDirectory: '<%= coverageDirectory %>'<% if(rootProject){ %>,
   testMatch: [
     '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
     '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',

package/src/generators/configuration/files/tsconfig.spec.json__tmpl__

@@ -1,8 +1,8 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "<%= extendedConfig %>",
   "compilerOptions": {
-    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
-    "module": "commonjs",
+    "outDir": "<%= outDir %>",<% if (module) { %>
+    "module": "<%= module %>",<% } %>
     "types": ["jest", "node"]
   },<% if(setupFile !== 'none') { %>
   "files": ["src/test-setup.ts"],<% } %>

package/src/generators/configuration/files-angular/jest.config.ts__tmpl__

@@ -3,7 +3,7 @@
   preset: '<%= offsetFromRoot %>jest.preset.<%= presetExt %>',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% if(testEnvironment) { %>
   testEnvironment: '<%= testEnvironment %>',<% } %>
-  coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>',
+  coverageDirectory: '<%= coverageDirectory %>',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',

package/src/generators/configuration/files-angular/tsconfig.spec.json__tmpl__

@@ -1,8 +1,8 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "<%= extendedConfig %>",
   "compilerOptions": {
-    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
-    "module": "commonjs",
+    "outDir": "<%= outDir %>",<% if (module) { %>
+    "module": "<%= module %>",<% } %>
     "target": "es2016",
     "types": ["jest", "node"]
   },<% if(setupFile !== 'none') { %>

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 function createFiles(tree, options, presetExt) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -22,6 +23,11 @@ function createFiles(tree, options, presetExt) {
         transformer = 'ts-jest';
         transformerOptions = "{ tsconfig: '<rootDir>/tsconfig.spec.json' }";
     }
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    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, {
         tmpl: '',
         ...options,
@@ -33,9 +39,17 @@ function createFiles(tree, options, presetExt) {
         transformerOptions,
         js: !!options.js,
         rootProject: options.rootProject,
-        projectRoot: options.rootProject ? options.project : projectConfig.root,
-        offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        projectRoot,
+        offsetFromRoot: rootOffset,
         presetExt,
+        coverageDirectory: isTsSolutionSetup
+            ? `test-output/jest/coverage`
+            : `${rootOffset}coverage/${projectRoot}`,
+        extendedConfig: isTsSolutionSetup
+            ? `${rootOffset}tsconfig.base.json`
+            : './tsconfig.json',
+        outDir: isTsSolutionSetup ? `./out-tsc/jest` : `${rootOffset}dist/out-tsc`,
+        module: !isTsSolutionSetup ? 'commonjs' : undefined,
     });
     if (options.setupFile === 'none') {
         tree.delete((0, path_1.join)(projectConfig.root, './src/test-setup.ts'));

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

@@ -10,9 +10,9 @@ function updateWorkspace(tree, options) {
     projectConfig.targets[options.targetName] = {
         executor: '@nx/jest:jest',
         outputs: [
-            options.rootProject
-                ? (0, devkit_1.joinPathFragments)('{workspaceRoot}', 'coverage', '{projectName}')
-                : (0, devkit_1.joinPathFragments)('{workspaceRoot}', 'coverage', '{projectRoot}'),
+            options.isTsSolutionSetup
+                ? '{projectRoot}/test-output/jest/coverage'
+                : (0, devkit_1.joinPathFragments)('{workspaceRoot}', 'coverage', options.rootProject ? '{projectName}' : '{projectRoot}'),
         ],
         options: {
             jestConfig: (0, devkit_1.joinPathFragments)((0, devkit_1.normalizePath)(projectConfig.root), `jest.config.${options.js ? 'js' : 'ts'}`),

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

@@ -29,4 +29,5 @@ export interface JestProjectSchema {
 
 export type NormalizedJestProjectSchema = JestProjectSchema & {
   rootProject: boolean;
+  isTsSolutionSetup: boolean;
 };