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

package/generators.json

@@ -3,14 +3,14 @@
   "version": "0.1",
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#jestInitGenerator",
+      "factory": "./src/generators/init/init#jestInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nrwl/jest` plugin.",
       "aliases": ["ng-add"],
       "hidden": true
     },
     "configuration": {
-      "factory": "./src/generators/configuration/configuration",
+      "factory": "./src/generators/configuration/configuration#configurationGeneratorInternal",
       "schema": "./src/generators/configuration/schema.json",
       "description": "Add Jest configuration to a project.",
       "hidden": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.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": {
@@ -45,9 +45,9 @@
     "minimatch": "9.0.3",
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.0-beta.1",
-    "@nx/js": "18.0.0-beta.1",
-    "@nrwl/jest": "18.0.0-beta.1"
+    "@nx/devkit": "18.0.0-beta.2",
+    "@nx/js": "18.0.0-beta.2",
+    "@nrwl/jest": "18.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,4 +1,5 @@
 import { JestProjectSchema } from './schema';
 import { Tree, GeneratorCallback } from '@nx/devkit';
 export declare function configurationGenerator(tree: Tree, schema: JestProjectSchema): Promise<GeneratorCallback>;
+export declare function configurationGeneratorInternal(tree: Tree, schema: JestProjectSchema): Promise<GeneratorCallback>;
 export default configurationGenerator;

package/src/generators/configuration/configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGenerator = void 0;
+exports.configurationGeneratorInternal = exports.configurationGenerator = void 0;
 const init_1 = require("../init/init");
 const check_for_test_target_1 = require("./lib/check-for-test-target");
 const create_files_1 = require("./lib/create-files");
@@ -23,6 +23,8 @@ function normalizeOptions(tree, options) {
     if (!options.testEnvironment) {
         options.testEnvironment = 'jsdom';
     }
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    options.targetName ??= 'test';
     if (!options.hasOwnProperty('supportTsx')) {
         options.supportTsx = false;
     }
@@ -43,11 +45,15 @@ function normalizeOptions(tree, options) {
         rootProject: project.root === '.' || project.root === '',
     };
 }
-async function configurationGenerator(tree, schema) {
+function configurationGenerator(tree, schema) {
+    return configurationGeneratorInternal(tree, { addPlugin: false, ...schema });
+}
+exports.configurationGenerator = configurationGenerator;
+async function configurationGeneratorInternal(tree, schema) {
     const options = normalizeOptions(tree, schema);
     const tasks = [];
     tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
-    tasks.push(await (0, init_1.jestInitGenerator)(tree, options));
+    tasks.push(await (0, init_1.jestInitGenerator)(tree, { ...options, skipFormat: true }));
     if (!schema.skipPackageJson) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     }
@@ -57,9 +63,16 @@ async function configurationGenerator(tree, schema) {
     (0, update_tsconfig_1.updateTsConfig)(tree, options);
     (0, update_vscode_recommended_extensions_1.updateVsCodeRecommendedExtensions)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/jest/plugin'
-        : p.plugin === '@nx/jest/plugin');
+    const hasPlugin = nxJson.plugins?.some((p) => {
+        if (typeof p === 'string') {
+            return p === '@nx/jest/plugin' && options.targetName === 'test';
+        }
+        else {
+            return (p.plugin === '@nx/jest/plugin' &&
+                (p.options?.targetName ?? 'test') ===
+                    options.targetName);
+        }
+    });
     if (!hasPlugin) {
         (0, update_workspace_1.updateWorkspace)(tree, options);
     }
@@ -68,5 +81,5 @@ async function configurationGenerator(tree, schema) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.configurationGenerator = configurationGenerator;
+exports.configurationGeneratorInternal = configurationGeneratorInternal;
 exports.default = configurationGenerator;

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

@@ -7,7 +7,7 @@ function updateWorkspace(tree, options) {
     if (!projectConfig.targets) {
         projectConfig.targets = {};
     }
-    projectConfig.targets.test = {
+    projectConfig.targets[options.targetName] = {
         executor: '@nx/jest:jest',
         outputs: [
             options.rootProject

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

@@ -1,5 +1,6 @@
 export interface JestProjectSchema {
   project: string;
+  targetName?: string;
   supportTsx?: boolean;
   /**
    * @deprecated use setupFile instead
@@ -13,6 +14,8 @@ export interface JestProjectSchema {
    */
   babelJest?: boolean;
   skipFormat?: boolean;
+
+  addPlugin?: boolean;
   compiler?: 'tsc' | 'babel' | 'swc';
   skipPackageJson?: boolean;
   js?: boolean;

package/src/generators/init/init.d.ts

@@ -1,4 +1,5 @@
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { JestInitSchema } from './schema';
 export declare function jestInitGenerator(tree: Tree, options: JestInitSchema): Promise<GeneratorCallback>;
+export declare function jestInitGeneratorInternal(tree: Tree, options: JestInitSchema): Promise<GeneratorCallback>;
 export default jestInitGenerator;

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jestInitGenerator = void 0;
+exports.jestInitGeneratorInternal = exports.jestInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
@@ -69,10 +69,15 @@ function updateDependencies(tree, options) {
         jest: versions_1.jestVersion,
     }, undefined, options.keepExistingVersions);
 }
-async function jestInitGenerator(tree, options) {
+function jestInitGenerator(tree, options) {
+    return jestInitGeneratorInternal(tree, { addPlugin: false, ...options });
+}
+exports.jestInitGenerator = jestInitGenerator;
+async function jestInitGeneratorInternal(tree, options) {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     if (!tree.exists('jest.preset.js')) {
         updateProductionFileSet(tree);
-        if (process.env.NX_PCV3 === 'true') {
+        if (options.addPlugin) {
             addPlugin(tree);
         }
         else {
@@ -92,5 +97,5 @@ async function jestInitGenerator(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.jestInitGenerator = jestInitGenerator;
+exports.jestInitGeneratorInternal = jestInitGeneratorInternal;
 exports.default = jestInitGenerator;

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

@@ -3,4 +3,6 @@ export interface JestInitSchema {
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
   updatePackageScripts?: boolean;
+
+  addPlugin?: boolean;
 }

package/src/plugins/plugin.js

@@ -64,7 +64,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
     const config = await (0, jest_config_1.readConfig)({
         _: [],
         $0: undefined,
-    }, (0, path_1.resolve)(context.workspaceRoot, configFilePath), true, null, undefined, true);
+    }, (0, path_1.resolve)(context.workspaceRoot, configFilePath));
     const targetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.targetName, context.nxJsonConfiguration.targetDefaults, 'nx:run-commands');
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};