@nx/workspace 22.1.0-beta.5 → 22.1.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "22.1.0-beta.5",
+  "version": "22.1.0-beta.6",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,7 +38,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.1.0-beta.5",
+    "@nx/devkit": "22.1.0-beta.6",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
@@ -46,10 +46,10 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "22.1.0-beta.5"
+    "nx": "22.1.0-beta.6"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.5"
+    "nx": "22.1.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/move/lib/extract-base-configs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-base-configs.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/extract-base-configs.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CASzD;AAED,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1E;AAED,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,oBAAoB,GAChC,IAAI,CAgBN"}
+{"version":3,"file":"extract-base-configs.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/extract-base-configs.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CASzD;AAED,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1E;AAED,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,oBAAoB,GAChC,IAAI,CAaN"}

package/src/generators/move/lib/extract-base-configs.js

@@ -4,6 +4,7 @@ exports.maybeExtractTsConfigBase = maybeExtractTsConfigBase;
 exports.maybeExtractJestConfigBase = maybeExtractJestConfigBase;
 exports.maybeMigrateEslintConfigIfRootProject = maybeMigrateEslintConfigIfRootProject;
 const devkit_1 = require("@nx/devkit");
+const jest_config_1 = require("../../utils/jest-config");
 function maybeExtractTsConfigBase(tree) {
     let extractTsConfigBase;
     try {
@@ -35,8 +36,5 @@ function maybeMigrateEslintConfigIfRootProject(tree, rootProject) {
     catch {
         // eslint not installed
     }
-    migrateConfigToMonorepoStyle?.(Array.from((0, devkit_1.getProjects)(tree).values()), tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
-        tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.js'))
-        ? 'jest'
-        : 'none');
+    migrateConfigToMonorepoStyle?.(Array.from((0, devkit_1.getProjects)(tree).values()), tree, (0, jest_config_1.findProjectJestConfig)(tree, rootProject.root) ? 'jest' : 'none');
 }

package/src/generators/move/lib/update-jest-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-jest-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,oBAAoB,QAiE9B"}
+{"version":3,"file":"update-jest-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAM7C;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,oBAAoB,QAiE9B"}

package/src/generators/move/lib/update-jest-config.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = updateJestConfig;
-const path = require("path");
 const jest_config_1 = require("../../utils/jest-config");
 /**
  * Updates the project name and coverage folder in the jest.config.js if it exists
@@ -11,8 +10,8 @@ const jest_config_1 = require("../../utils/jest-config");
  * @param schema The options provided to the schematic
  */
 function updateJestConfig(tree, schema, project) {
-    const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.ts');
-    if (tree.exists(jestConfigPath)) {
+    const jestConfigPath = (0, jest_config_1.findProjectJestConfig)(tree, schema.relativeToRootDestination);
+    if (jestConfigPath) {
         const oldContent = tree.read(jestConfigPath, 'utf-8');
         let newContent = oldContent;
         if (schema.projectName !== schema.newProjectName) {

package/src/generators/move/lib/update-project-root-files.js

@@ -6,7 +6,7 @@ exports.updateFilesForNonRootProjects = updateFilesForNonRootProjects;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const path_1 = require("path");
-const allowedExt = ['.ts', '.js', '.json'];
+const allowedExt = ['.ts', '.js', '.json', '.cts', '.cjs'];
 /**
  * Updates the files in the root of the project
  *

package/src/generators/remove/lib/update-jest-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-jest-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAqCnC;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,oBAAoB,QAgFpC"}
+{"version":3,"file":"update-jest-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAuCnC;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,oBAAoB,QAiFpC"}

package/src/generators/remove/lib/update-jest-config.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = updateJestConfig;
 const devkit_1 = require("@nx/devkit");
 const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nodes");
-const path_1 = require("path");
 const typescript_1 = require("../../../utilities/typescript");
 const jest_config_1 = require("../../utils/jest-config");
 let tsModule;
@@ -37,9 +36,10 @@ function updateJestConfig(tree, schema, projectConfig) {
     const { createSourceFile, ScriptTarget, isPropertyAssignment, isArrayLiteralExpression, isStringLiteral, } = tsModule;
     const projectToRemove = schema.projectName;
     const rootConfigPath = (0, jest_config_1.findRootJestConfig)(tree);
+    const projectJestConfig = (0, jest_config_1.findProjectJestConfig)(tree, projectConfig.root);
     if (!rootConfigPath ||
         !tree.exists(rootConfigPath) ||
-        !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
+        !projectJestConfig ||
         isUsingUtilityFunction(tree) ||
         !isMonorepoConfig(tree)) {
         return;

package/src/generators/utils/jest-config.d.ts

@@ -1,3 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 export declare function findRootJestConfig(tree: Tree): string | null;
+export declare function findProjectJestConfig(tree: Tree, projectRoot: string): string | null;
 //# sourceMappingURL=jest-config.d.ts.map

package/src/generators/utils/jest-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAU5D"}
+{"version":3,"file":"jest-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE1D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAc5D;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAWf"}

package/src/generators/utils/jest-config.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findRootJestConfig = findRootJestConfig;
+exports.findProjectJestConfig = findProjectJestConfig;
+const devkit_1 = require("@nx/devkit");
 function findRootJestConfig(tree) {
     if (tree.exists('jest.config.js')) {
         return 'jest.config.js';
@@ -8,5 +10,18 @@ function findRootJestConfig(tree) {
     if (tree.exists('jest.config.ts')) {
         return 'jest.config.ts';
     }
+    if (tree.exists('jest.config.cts')) {
+        return 'jest.config.cts';
+    }
+    return null;
+}
+function findProjectJestConfig(tree, projectRoot) {
+    const extensions = ['js', 'ts', 'cts'];
+    for (const ext of extensions) {
+        const configPath = (0, devkit_1.joinPathFragments)(projectRoot, `jest.config.${ext}`);
+        if (tree.exists(configPath)) {
+            return configPath;
+        }
+    }
     return null;
 }