@nx/jest 17.0.5 → 17.0.6

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2023 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -1,9 +1,4 @@
-<p style="text-align: center;">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
-  </picture>
-</p>
+<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
 <div style="text-align: center;">
 
@@ -20,9 +15,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart, Fast and Extensible Build System
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a next generation build system with first class monorepo support and powerful integrations.
 
 This package is a [Jest plugin for Nx](https://nx.dev/jest/overview).
 
@@ -64,5 +59,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
 

package/generators.json

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

package/index.d.ts

@@ -5,4 +5,4 @@ export declare const jestProjectGenerator: typeof configurationGenerator;
 export { addPropertyToJestConfig, removePropertyFromJestConfig, } from './src/utils/config/update-config';
 export { jestConfigObjectAst } from './src/utils/config/functions';
 export { jestInitGenerator } from './src/generators/init/init';
-export { getJestProjects, getJestProjectsAsync, getNestedJestProjects, } from './src/utils/config/get-jest-projects';
+export { getJestProjects, getNestedJestProjects, } from './src/utils/config/get-jest-projects';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNestedJestProjects = exports.getJestProjectsAsync = exports.getJestProjects = exports.jestInitGenerator = exports.jestConfigObjectAst = exports.removePropertyFromJestConfig = exports.addPropertyToJestConfig = exports.jestProjectGenerator = exports.configurationGenerator = void 0;
+exports.getNestedJestProjects = exports.getJestProjects = exports.jestInitGenerator = exports.jestConfigObjectAst = exports.removePropertyFromJestConfig = exports.addPropertyToJestConfig = exports.jestProjectGenerator = exports.configurationGenerator = void 0;
 const configuration_1 = require("./src/generators/configuration/configuration");
 Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
 // Exported for backwards compatibility in case a plugin is using the old name.
@@ -15,5 +15,4 @@ var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "jestInitGenerator", { enumerable: true, get: function () { return init_1.jestInitGenerator; } });
 var get_jest_projects_1 = require("./src/utils/config/get-jest-projects");
 Object.defineProperty(exports, "getJestProjects", { enumerable: true, get: function () { return get_jest_projects_1.getJestProjects; } });
-Object.defineProperty(exports, "getJestProjectsAsync", { enumerable: true, get: function () { return get_jest_projects_1.getJestProjectsAsync; } });
 Object.defineProperty(exports, "getNestedJestProjects", { enumerable: true, get: function () { return get_jest_projects_1.getNestedJestProjects; } });

package/migrations.json

@@ -29,11 +29,6 @@
       "version": "16.5.0-beta.2",
       "description": "Add test-setup.ts to ignored files in production input",
       "implementation": "./src/migrations/update-16-5-0/add-test-setup-to-inputs-ignore"
-    },
-    "move-options-to-target-defaults": {
-      "version": "17.1.0-beta.2",
-      "description": "Move jest executor options to nx.json targetDefaults",
-      "implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults"
     }
   },
   "packageJsonUpdates": {
@@ -91,15 +86,6 @@
           "alwaysAddToPackageJson": false
         }
       }
-    },
-    "17.2.0": {
-      "version": "17.2.0-beta.2",
-      "packages": {
-        "@types/node": {
-          "version": "18.16.9",
-          "alwaysAddToPackageJson": false
-        }
-      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "17.0.5",
+  "version": "v17.0.6",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -36,19 +36,17 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "17.0.5",
-    "@nx/js": "17.0.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^29.4.1",
     "jest-resolve": "^29.4.1",
     "jest-util": "^29.4.1",
-    "minimatch": "9.0.3",
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
-    "yargs-parser": "21.1.1",
-    "@nrwl/jest": "17.0.5"
+    "@nx/devkit": "v17.0.6",
+    "@nx/js": "v17.0.6",
+    "@nrwl/jest": "v17.0.6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,5 +1,4 @@
 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,17 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGeneratorInternal = exports.configurationGenerator = void 0;
+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");
-const create_jest_config_1 = require("./lib/create-jest-config");
-const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
-const update_vscode_recommended_extensions_1 = require("./lib/update-vscode-recommended-extensions");
 const update_workspace_1 = require("./lib/update-workspace");
 const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
-const is_preset_cjs_1 = require("../../utils/config/is-preset-cjs");
 const schemaDefaults = {
     setupFile: 'none',
     babelJest: false,
@@ -24,11 +19,6 @@ function normalizeOptions(tree, options) {
     if (!options.testEnvironment) {
         options.testEnvironment = 'jsdom';
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
-    options.targetName ??= 'test';
     if (!options.hasOwnProperty('supportTsx')) {
         options.supportTsx = false;
     }
@@ -49,42 +39,17 @@ function normalizeOptions(tree, options) {
         rootProject: project.root === '.' || project.root === '',
     };
 }
-function configurationGenerator(tree, schema) {
-    return configurationGeneratorInternal(tree, { addPlugin: false, ...schema });
-}
-exports.configurationGenerator = configurationGenerator;
-async function configurationGeneratorInternal(tree, schema) {
+async function configurationGenerator(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, skipFormat: true }));
-    if (!schema.skipPackageJson) {
-        tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
-    }
-    const presetExt = (0, is_preset_cjs_1.isPresetCjs)(tree) ? 'cjs' : 'js';
-    await (0, create_jest_config_1.createJestConfig)(tree, options, presetExt);
+    const installTask = await (0, init_1.default)(tree, options);
     (0, check_for_test_target_1.checkForTestTarget)(tree, options);
-    (0, create_files_1.createFiles)(tree, options, presetExt);
+    (0, create_files_1.createFiles)(tree, options);
     (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) => {
-        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 || options.addExplicitTargets) {
-        (0, update_workspace_1.updateWorkspace)(tree, options);
-    }
+    (0, update_workspace_1.updateWorkspace)(tree, options);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
-exports.configurationGeneratorInternal = configurationGeneratorInternal;
+exports.configurationGenerator = configurationGenerator;
 exports.default = configurationGenerator;

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

@@ -1,7 +1,7 @@
 /* eslint-disable */
 <% if(js){ %>module.exports =<% } else{ %>export default<% } %> {
   displayName: '<%= project %>',
-  preset: '<%= offsetFromRoot %>jest.preset.<%= presetExt %>',<% if(setupFile !== 'none') { %>
+  preset: '<%= offsetFromRoot %>jest.preset.js',<% if(setupFile !== 'none') { %>
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% } %><% if(testEnvironment) { %>
   testEnvironment: '<%= testEnvironment %>',<% } %><% if(skipSerializers){ %>
   transform: {

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

@@ -1,7 +1,7 @@
 /* eslint-disable */
 <% if(js){ %>module.exports =<% } else{ %>export default<% } %> {
   displayName: '<%= project %>',
-  preset: '<%= offsetFromRoot %>jest.preset.<%= presetExt %>',
+  preset: '<%= offsetFromRoot %>jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% if(testEnvironment) { %>
   testEnvironment: '<%= testEnvironment %>',<% } %>
   coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>',

package/src/generators/configuration/lib/create-files.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedJestProjectSchema } from '../schema';
-export declare function createFiles(tree: Tree, options: NormalizedJestProjectSchema, presetExt: 'cjs' | 'js'): void;
+export declare function createFiles(tree: Tree, options: NormalizedJestProjectSchema): void;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-function createFiles(tree, options, presetExt) {
+function createFiles(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const filesFolder = options.setupFile === 'angular' ? '../files-angular' : '../files';
     let transformer;
@@ -35,7 +35,6 @@ function createFiles(tree, options, presetExt) {
         rootProject: options.rootProject,
         projectRoot: options.rootProject ? options.project : projectConfig.root,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
-        presetExt,
     });
     if (options.setupFile === 'none') {
         tree.delete((0, path_1.join)(projectConfig.root, './src/test-setup.ts'));

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

@@ -6,12 +6,7 @@ const update_config_1 = require("../../../utils/config/update-config");
 const devkit_1 = require("@nx/devkit");
 function isUsingUtilityFunction(host) {
     const rootConfig = (0, find_root_jest_files_1.findRootJestConfig)(host);
-    if (!rootConfig) {
-        return false;
-    }
-    const rootConfigContent = host.read(rootConfig, 'utf-8');
-    return (rootConfigContent.includes('getJestProjects()') ||
-        rootConfigContent.includes('getJestProjectsAsync()'));
+    return (rootConfig && host.read(rootConfig).toString().includes('getJestProjects()'));
 }
 function updateJestConfig(host, options) {
     if (isUsingUtilityFunction(host)) {

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

@@ -7,7 +7,7 @@ function updateWorkspace(tree, options) {
     if (!projectConfig.targets) {
         projectConfig.targets = {};
     }
-    projectConfig.targets[options.targetName] = {
+    projectConfig.targets.test = {
         executor: '@nx/jest:jest',
         outputs: [
             options.rootProject
@@ -16,6 +16,13 @@ function updateWorkspace(tree, options) {
         ],
         options: {
             jestConfig: (0, devkit_1.joinPathFragments)((0, devkit_1.normalizePath)(projectConfig.root), `jest.config.${options.js ? 'js' : 'ts'}`),
+            passWithNoTests: true,
+        },
+        configurations: {
+            ci: {
+                ci: true,
+                codeCoverage: true,
+            },
         },
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);

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

@@ -1,6 +1,5 @@
 export interface JestProjectSchema {
   project: string;
-  targetName?: string;
   supportTsx?: boolean;
   /**
    * @deprecated use setupFile instead
@@ -14,16 +13,9 @@ export interface JestProjectSchema {
    */
   babelJest?: boolean;
   skipFormat?: boolean;
-
-  addPlugin?: boolean;
   compiler?: 'tsc' | 'babel' | 'swc';
   skipPackageJson?: boolean;
   js?: boolean;
-
-  /**
-   * @internal
-   */
-  addExplicitTargets?: boolean;
 }
 
 export type NormalizedJestProjectSchema = JestProjectSchema & {

package/src/generators/configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxJestProject",
   "cli": "nx",
   "title": "Add Jest Configuration to a project",

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

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

package/src/generators/init/init.js

@@ -1,27 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jestInitGeneratorInternal = exports.jestInitGenerator = void 0;
+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");
+const js_1 = require("@nx/js");
+const find_root_jest_files_1 = require("../../utils/config/find-root-jest-files");
 const versions_1 = require("../../utils/versions");
-const is_preset_cjs_1 = require("../../utils/config/is-preset-cjs");
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    if (!nxJson.plugins.some((p) => typeof p === 'string'
-        ? p === '@nx/jest/plugin'
-        : p.plugin === '@nx/jest/plugin')) {
-        nxJson.plugins.push({
-            plugin: '@nx/jest/plugin',
-            options: {
-                targetName: 'test',
-            },
-        });
+const schemaDefaults = {
+    compiler: 'tsc',
+    js: false,
+    rootProject: false,
+    testEnvironment: 'jsdom',
+};
+function generateGlobalConfig(tree, isJS) {
+    const contents = isJS
+        ? (0, devkit_1.stripIndents) `
+    const { getJestProjects } = require('@nx/jest');
+
+    module.exports = {
+      projects: getJestProjects()
+    };`
+        : (0, devkit_1.stripIndents) `
+    import { getJestProjects } from '@nx/jest';
+
+    export default {
+     projects: getJestProjects()
+    };`;
+    tree.write(`jest.config.${isJS ? 'js' : 'ts'}`, contents);
+}
+function createJestConfig(tree, options) {
+    if (!tree.exists('jest.preset.js')) {
+        // preset is always js file.
+        tree.write(`jest.preset.js`, `
+      const nxPreset = require('@nx/jest/preset').default;
+
+      module.exports = { ...nxPreset }`);
+        addTestInputs(tree);
+    }
+    if (options.rootProject) {
+        // we don't want any config to be made because the `configurationGenerator` will do it.
+        // will copy the template config file
+        return;
+    }
+    const rootJestPath = (0, find_root_jest_files_1.findRootJestConfig)(tree);
+    if (!rootJestPath) {
+        // if there's not root jest config, we will create one and return
+        // this can happen when:
+        // - root jest config was renamed => in which case there is migration needed
+        // - root project didn't have jest setup => again, no migration is needed
+        generateGlobalConfig(tree, options.js);
+        return;
+    }
+    if (tree.exists(rootJestPath)) {
+        // moving from root project config to monorepo-style config
+        const projects = (0, devkit_1.getProjects)(tree);
+        const projectNames = Array.from(projects.keys());
+        const rootProject = projectNames.find((projectName) => projects.get(projectName)?.root === '.');
+        // root project might have been removed,
+        // if it's missing there's nothing to migrate
+        if (rootProject) {
+            const rootProjectConfig = projects.get(rootProject);
+            const jestTarget = Object.values(rootProjectConfig.targets || {}).find((t) => t?.executor === '@nx/jest:jest' || t?.executor === '@nrwl/jest:jest');
+            const isProjectConfig = jestTarget?.options?.jestConfig === rootJestPath;
+            // if root project doesn't have jest target, there's nothing to migrate
+            if (isProjectConfig) {
+                const jestProjectConfig = `jest.config.${rootProjectConfig.projectType === 'application' ? 'app' : 'lib'}.${options.js ? 'js' : 'ts'}`;
+                tree.rename(rootJestPath, jestProjectConfig);
+                jestTarget.options.jestConfig = jestProjectConfig;
+                (0, devkit_1.updateProjectConfiguration)(tree, rootProject, rootProjectConfig);
+            }
+            // generate new global config as it was move to project config or is missing
+            generateGlobalConfig(tree, options.js);
+        }
     }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function updateProductionFileSet(tree, presetExt) {
+function addTestInputs(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
@@ -39,68 +91,80 @@ function updateProductionFileSet(tree, presetExt) {
         // Dedupe and set
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
-function addJestTargetDefaults(tree, presetEnv) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults['@nx/jest:jest'] ??= {};
-    const productionFileSet = nxJson.namedInputs?.production;
-    nxJson.targetDefaults['@nx/jest:jest'].cache ??= true;
     // Test targets depend on all their project's sources + production sources of dependencies
-    nxJson.targetDefaults['@nx/jest:jest'].inputs ??= [
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults.test ??= {};
+    nxJson.targetDefaults.test.inputs ??= [
         'default',
         productionFileSet ? '^production' : '^default',
-        `{workspaceRoot}/jest.preset.${presetEnv}`,
     ];
-    nxJson.targetDefaults['@nx/jest:jest'].options ??= {
-        passWithNoTests: true,
-    };
-    nxJson.targetDefaults['@nx/jest:jest'].configurations ??= {
-        ci: {
-            ci: true,
-            codeCoverage: true,
-        },
-    };
+    nxJson.targetDefaults.test.inputs.push('{workspaceRoot}/jest.preset.js');
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function updateDependencies(tree, options) {
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+    const dependencies = {
+        tslib: versions_1.tslibVersion,
+    };
+    const devDeps = {
         '@nx/jest': versions_1.nxVersion,
         jest: versions_1.jestVersion,
-    }, undefined, options.keepExistingVersions);
-}
-function jestInitGenerator(tree, options) {
-    return jestInitGeneratorInternal(tree, { addPlugin: false, ...options });
+        // because the default jest-preset uses ts-jest,
+        // jest will throw an error if it's not installed
+        // even if not using it in overriding transformers
+        'ts-jest': versions_1.tsJestVersion,
+    };
+    if (options.testEnvironment !== 'none') {
+        devDeps[`jest-environment-${options.testEnvironment}`] = versions_1.jestVersion;
+    }
+    if (!options.js) {
+        devDeps['ts-node'] = versions_1.tsNodeVersion;
+        devDeps['@types/jest'] = versions_1.jestTypesVersion;
+        devDeps['@types/node'] = versions_1.typesNodeVersion;
+    }
+    if (options.compiler === 'babel' || options.babelJest) {
+        devDeps['babel-jest'] = versions_1.babelJestVersion;
+        // in some cases @nx/js will not already be present i.e. node only projects
+        devDeps['@nx/js'] = versions_1.nxVersion;
+    }
+    else if (options.compiler === 'swc') {
+        devDeps['@swc/jest'] = versions_1.swcJestVersion;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDeps);
 }
-exports.jestInitGenerator = jestInitGenerator;
-async function jestInitGeneratorInternal(tree, options) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPluginDefault;
-    const presetExt = (0, is_preset_cjs_1.isPresetCjs)(tree) ? 'cjs' : 'js';
-    if (!tree.exists('jest.preset.js') && !tree.exists('jest.preset.cjs')) {
-        updateProductionFileSet(tree, presetExt);
-        if (options.addPlugin) {
-            addPlugin(tree);
-        }
-        else {
-            addJestTargetDefaults(tree, presetExt);
-        }
+function updateExtensions(host) {
+    if (!host.exists('.vscode/extensions.json')) {
+        return;
     }
+    (0, devkit_1.updateJson)(host, '.vscode/extensions.json', (json) => {
+        json.recommendations = json.recommendations || [];
+        const extension = 'firsttris.vscode-jest-runner';
+        if (!json.recommendations.includes(extension)) {
+            json.recommendations.push(extension);
+        }
+        return json;
+    });
+}
+async function jestInitGenerator(tree, schema) {
+    const options = normalizeOptions(schema);
     const tasks = [];
+    tasks.push(await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        skipFormat: true,
+    }));
+    createJestConfig(tree, options);
     if (!options.skipPackageJson) {
-        tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/jest'], []));
-        tasks.push(updateDependencies(tree, options));
-    }
-    if (options.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
-    }
-    if (!options.skipFormat) {
-        await (0, devkit_1.formatFiles)(tree);
+        (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/jest'], []);
+        const installTask = updateDependencies(tree, options);
+        tasks.push(installTask);
     }
+    updateExtensions(tree);
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.jestInitGeneratorInternal = jestInitGeneratorInternal;
+exports.jestInitGenerator = jestInitGenerator;
+function normalizeOptions(options) {
+    return {
+        ...schemaDefaults,
+        ...options,
+    };
+}
 exports.default = jestInitGenerator;

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

@@ -1,8 +1,11 @@
 export interface JestInitSchema {
-  skipFormat?: boolean;
+  compiler?: 'tsc' | 'babel' | 'swc';
+  js?: boolean;
   skipPackageJson?: boolean;
-  keepExistingVersions?: boolean;
-  updatePackageScripts?: boolean;
-
-  addPlugin?: boolean;
+  testEnvironment?: 'node' | 'jsdom' | 'none';
+  /**
+   * @deprecated
+   */
+  babelJest?: boolean;
+  rootProject?: boolean;
 }