@nrwl/nx-plugin 15.8.4 → 15.9.0-beta.0

package/migrations.json

@@ -17,6 +17,18 @@
       "version": "15.0.0-beta.0",
       "description": "Migrates executor schema files to v2",
       "factory": "./src/migrations/update-15-0-0/specify-output-capture"
+    },
+    "update-configs-jest-29": {
+      "version": "15.9.0-beta.0",
+      "cli": "nx",
+      "description": "Update nx plugin jest configs to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
+      "factory": "./src/migrations/update-15-9-0/jest-29-configs"
+    },
+    "update-tests-jest-29": {
+      "version": "15.9.0-beta.0",
+      "cli": "nx",
+      "description": "Update nx plugin jest test files to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
+      "factory": "./src/migrations/update-15-9-0/jest-29-tests"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/nx-plugin",
-  "version": "15.8.4",
+  "version": "15.9.0-beta.0",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -28,10 +28,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/devkit": "15.8.4",
-    "@nrwl/jest": "15.8.4",
-    "@nrwl/js": "15.8.4",
-    "@nrwl/linter": "15.8.4",
+    "@nrwl/devkit": "15.9.0-beta.0",
+    "@nrwl/jest": "15.9.0-beta.0",
+    "@nrwl/js": "15.9.0-beta.0",
+    "@nrwl/linter": "15.9.0-beta.0",
+    "@phenomnomnominal/tsquery": "4.1.1",
     "dotenv": "~10.0.0",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0"
@@ -39,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3c4c05244604022e56a7b4c782140d9d7092900d"
+  "gitHead": "e3e87f57fd740bf78945a4907745d03f18d057c3"
 }

package/src/executors/e2e/e2e.impl.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 require("dotenv/config");
 const devkit_1 = require("@nrwl/devkit");
 const jest_impl_1 = require("@nrwl/jest/src/executors/jest/jest.impl");
+// TODO(Caleb & Craigory): can we get rid of this and just use @nrwl/jest directly?
 function nxPluginE2EExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* nxPluginE2EExecutor_1() {
         var _a, e_1, _b, _c;

package/src/executors/e2e/e2e.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,yCAKsB;AAEtB,uEAAuE;AAGvE,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,MAAM,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAApC,UAA0B,CAAU,CAAC;QAE3C,IAAI,OAAgB,CAAC;;YACrB,KAAsB,eAAA,KAAA,sBAAA,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA/B,cAA+B;gBAA/B,WAA+B;;oBAA1C,MAAM,CAAC,KAAA,CAAA;oBAChB,IAAI;wBACF,OAAO,GAAG,sBAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;qBAChD;oBAAC,OAAO,CAAC,EAAE;wBACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxB,OAAO,GAAG,KAAK,CAAC;qBACjB;;;;;aACF;;;;;;;;;QAED,6BAAO,EAAE,OAAO,EAAE,EAAC;IACrB,CAAC;CAAA;AAjBD,kDAiBC;AAED,SAAgB,cAAc,CAC5B,WAAmB,EACnB,OAAwB;;;QAExB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,OAAO,CACR,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;;YAE9E,KAA2B,eAAA,KAAA,sBAAA,sBAAM,IAAA,oBAAW,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAC3C,OAAO,CACR,CAAA,CAAA,IAAA;gBAJ0B,cAI1B;gBAJ0B,WAI1B;;oBAJU,MAAM,MAAM,KAAA,CAAA;oBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;oBAC1D,4BAAM,MAAM,CAAC,OAAO,CAAA,CAAC;;;;;aACtB;;;;;;;;;IACH,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,WAAgC,EAChC,OAAwB;;QAExB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wBAAY,kCAC/B,WAAW,KAAE,KAAK,EAAE,KAAK,KAC9B,OAAO,CACR,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,yCAKsB;AAEtB,uEAAuE;AAGvE,mFAAmF;AACnF,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,MAAM,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAApC,UAA0B,CAAU,CAAC;QAE3C,IAAI,OAAgB,CAAC;;YACrB,KAAsB,eAAA,KAAA,sBAAA,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA/B,cAA+B;gBAA/B,WAA+B;;oBAA1C,MAAM,CAAC,KAAA,CAAA;oBAChB,IAAI;wBACF,OAAO,GAAG,sBAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;qBAChD;oBAAC,OAAO,CAAC,EAAE;wBACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxB,OAAO,GAAG,KAAK,CAAC;qBACjB;;;;;aACF;;;;;;;;;QAED,6BAAO,EAAE,OAAO,EAAE,EAAC;IACrB,CAAC;CAAA;AAjBD,kDAiBC;AAED,SAAgB,cAAc,CAC5B,WAAmB,EACnB,OAAwB;;;QAExB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,OAAO,CACR,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;;YAE9E,KAA2B,eAAA,KAAA,sBAAA,sBAAM,IAAA,oBAAW,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAC3C,OAAO,CACR,CAAA,CAAA,IAAA;gBAJ0B,cAI1B;gBAJ0B,WAI1B;;oBAJU,MAAM,MAAM,KAAA,CAAA;oBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;oBAC1D,4BAAM,MAAM,CAAC,OAAO,CAAA,CAAC;;;;;aACtB;;;;;;;;;IACH,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,WAAgC,EAChC,OAAwB;;QAExB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wBAAY,kCAC/B,WAAW,KAAE,KAAK,EAAE,KAAK,KAC9B,OAAO,CACR,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,kBAAe,mBAAmB,CAAC"}

package/src/generators/e2e-project/e2e.d.ts

@@ -1,5 +1,5 @@
-import { GeneratorCallback } from '@nrwl/devkit';
 import type { Tree } from '@nrwl/devkit';
+import { GeneratorCallback } from '@nrwl/devkit';
 import type { Schema } from './schema';
 export declare function e2eProjectGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default e2eProjectGenerator;

package/src/generators/e2e-project/e2e.js

@@ -7,7 +7,6 @@ const jest_1 = require("@nrwl/jest");
 const js_1 = require("@nrwl/js");
 const path = require("path");
 const linter_1 = require("@nrwl/linter");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 function normalizeOptions(host, options) {
     var _a, _b;
     const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
@@ -94,7 +93,7 @@ function e2eProjectGenerator(host, schema) {
             tasks.push(lintTask);
         }
         yield (0, devkit_1.formatFiles)(host);
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.e2eProjectGenerator = e2eProjectGenerator;

package/src/generators/e2e-project/e2e.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-15-9-0/jest-29-configs.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+export declare function updateConfigsJest29(tree: Tree): Promise<void>;
+export default updateConfigsJest29;

package/src/migrations/update-15-9-0/jest-29-configs.js

@@ -0,0 +1,154 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateConfigsJest29 = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
+const ast_utils_1 = require("@nrwl/jest/src/utils/ast-utils");
+const find_root_jest_files_1 = require("@nrwl/jest/src/utils/config/find-root-jest-files");
+// NOTE: this is a copy of the @nrwl/jest v15.8.0 migrations
+function updateConfigsJest29(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
+        const targetsWithJest = new Set();
+        // have to use graph so the negative configuration targets are expanded
+        const graph = yield (0, devkit_1.createProjectGraphAsync)();
+        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName, targetName) => {
+            if (options.jestConfig && tree.exists(options.jestConfig)) {
+                targetsWithJest.add(targetName);
+                // if the default root preset exists or if the project doesn't have a 'preset' configured
+                //  -> update snapshot config
+                if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
+                    addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
+                }
+                updateTsJestOptions(tree, options.jestConfig);
+                updateNgJestOptions(tree, options.jestConfig);
+            }
+        });
+        if (rootPreset && tree.exists(rootPreset)) {
+            const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
+            addSnapshotOptionsToConfig(tree, rootPreset, cmd);
+            updateTsJestOptions(tree, rootPreset);
+            updateNgJestOptions(tree, rootPreset);
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+        devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
+By default Nx kept the older style to prevent breaking of existing tests with snapshots.
+It's recommend you update to the latest format.
+You can do this in your project's jest config file.
+Remove the snapshotFormat property and re-run tests with the --update-snapshot flag.
+More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format`);
+    });
+}
+exports.updateConfigsJest29 = updateConfigsJest29;
+function addSnapshotOptionsToConfig(tree, configPath, updateSnapshotExample) {
+    const config = tree.read(configPath, 'utf-8');
+    const hasSnapshotOptions = tsquery_1.tsquery.query(config, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="snapshotFormat"])`);
+    if (hasSnapshotOptions.length > 0) {
+        return;
+    }
+    const updatedConfig = tsquery_1.tsquery.replace(config, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression`, (node) => {
+        return `{
+${node.properties.map((p) => getNodeWithComments(config, p)).join(',\n')},
+/* TODO: Update to latest Jest snapshotFormat
+ * By default Nx has kept the older style of Jest Snapshot formats
+ * to prevent breaking of any existing tests with snapshots.
+ * It's recommend you update to the latest format.
+ * You can do this by removing snapshotFormat property
+ * and running tests with --update-snapshot flag.
+ * Example: ${updateSnapshotExample}
+ * More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
+ */
+snapshotFormat: { escapeString: true, printBasicPrototype: true }
+}`;
+    }, { visitAllChildren: false });
+    tree.write(configPath, updatedConfig);
+}
+function hasPresetConfigured(tree, configPath) {
+    var _a;
+    const contents = tree.read(configPath, 'utf-8');
+    return (((_a = tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)) === null || _a === void 0 ? void 0 : _a.length) > 0);
+}
+function updateTsJestOptions(tree, configPath) {
+    // query for the globals property, if they don't have one then there's nothing to modify.
+    const contents = tree.read(configPath, 'utf-8');
+    let tsJestGlobalsConfig;
+    const noTsJestGlobals = tsquery_1.tsquery.replace(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="globals"])`, (node) => {
+        if (tsJestGlobalsConfig) {
+            devkit_1.logger.warn((0, devkit_1.stripIndents) `Found more than one "globals" object in the jest config, ${configPath}
+          Will use the first one`);
+            return;
+        }
+        tsJestGlobalsConfig = getGlobalTsJestConfig(node);
+        return getGlobalConfigWithoutTsJest(node);
+    });
+    if (!tsJestGlobalsConfig) {
+        return;
+    }
+    const updatedTsJestTransformer = tsquery_1.tsquery.replace(noTsJestGlobals, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX}> ObjectLiteralExpression PropertyAssignment:has(Identifier[name="transform"]) PropertyAssignment > :has(StringLiteral[value="ts-jest"], StringLiteral[value="jest-preset-angular"])`, (node) => {
+        return `[${node.getText()}, ${tsJestGlobalsConfig}]`;
+    });
+    tree.write(configPath, updatedTsJestTransformer);
+}
+function updateNgJestOptions(tree, configPath) {
+    const contents = tree.read(configPath, 'utf-8');
+    let ngJestTeardownConfig;
+    const noTeardownConfig = tsquery_1.tsquery.replace(contents, 'BinaryExpression:has(PropertyAccessExpression:has(Identifier[name=ngJest]))  PropertyAssignment:has(Identifier[name=teardown])', (node) => {
+        ngJestTeardownConfig = node.initializer.getText();
+        return ' ';
+    });
+    if (!ngJestTeardownConfig) {
+        return;
+    }
+    let maybeUpdatedTestEnvOpts = tsquery_1.tsquery.replace(noTeardownConfig, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="testEnvironmentOptions"]) ObjectLiteralExpression`, (node) => {
+        return `{
+  ${node.properties
+            .map((p) => getNodeWithComments(noTeardownConfig, p))
+            .join(',\n')},
+   teardown: ${ngJestTeardownConfig}
+  }`;
+    });
+    if (maybeUpdatedTestEnvOpts !== noTeardownConfig) {
+        tree.write(configPath, maybeUpdatedTestEnvOpts);
+        return;
+    }
+    // didn't find existing testEnvironmentOptions, so add the new property
+    const updatedConfig = tsquery_1.tsquery.replace(maybeUpdatedTestEnvOpts, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression`, (node) => {
+        return `{
+${node.properties
+            .map((p) => getNodeWithComments(maybeUpdatedTestEnvOpts, p))
+            .join(',\n')},
+testEnvironmentOptions: { teardown: ${ngJestTeardownConfig} }, 
+}`;
+    }, { visitAllChildren: false });
+    tree.write(configPath, updatedConfig);
+}
+function getGlobalTsJestConfig(node) {
+    var _a;
+    const globalObject = node.initializer;
+    const foundConfig = globalObject.properties.find((p) => ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
+    return ((_a = foundConfig === null || foundConfig === void 0 ? void 0 : foundConfig.initializer) === null || _a === void 0 ? void 0 : _a.getText()) || '';
+}
+function getGlobalConfigWithoutTsJest(node) {
+    var _a;
+    const globalObject = node === null || node === void 0 ? void 0 : node.initializer;
+    const withoutTsJest = (_a = globalObject === null || globalObject === void 0 ? void 0 : globalObject.properties) === null || _a === void 0 ? void 0 : _a.filter((p) => {
+        return !(ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
+    });
+    const globalConfigs = withoutTsJest.map((c) => c.getText()).join(',\n');
+    return `globals: { ${globalConfigs} }`;
+}
+function getNodeWithComments(fullText, node) {
+    const commentRanges = ts.getLeadingCommentRanges(fullText, node.getFullStart());
+    if ((commentRanges === null || commentRanges === void 0 ? void 0 : commentRanges.length) > 0) {
+        const withComments = `${commentRanges
+            .map((r) => fullText.slice(r.pos, r.end))
+            .join('\n')}\n${node.getText()}`;
+        return withComments;
+    }
+    return node.getText();
+}
+exports.default = updateConfigsJest29;
+//# sourceMappingURL=jest-29-configs.js.map

package/src/migrations/update-15-9-0/jest-29-configs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jest-29-configs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-15-9-0/jest-29-configs.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-15-9-0/jest-29-tests.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '@nrwl/devkit';
+export declare function updateTestsJest29(tree: Tree): Promise<void>;
+export declare function updateJestMockTypes(tree: Tree, filePath: string): void;
+export declare function updateJestMocked(tree: Tree, filePath: string): void;
+export default updateTestsJest29;

package/src/migrations/update-15-9-0/jest-29-tests.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateJestMocked = exports.updateJestMockTypes = exports.updateTestsJest29 = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const ast_utils_1 = require("@nrwl/jest/src/utils/ast-utils");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+// NOTE: this is a copy of the @nrwl/jest v15.8.0 migrations
+function updateTestsJest29(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const graph = yield (0, devkit_1.createProjectGraphAsync)();
+        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName) => {
+            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
+                if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
+                    return;
+                }
+                updateJestMockTypes(tree, file);
+                updateJestMocked(tree, file);
+            });
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.updateTestsJest29 = updateTestsJest29;
+function updateJestMockTypes(tree, filePath) {
+    const contents = tree.read(filePath, 'utf-8');
+    const updatedContent = tsquery_1.tsquery.replace(contents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="MaybeMockedDeep"], Identifier[name="MaybeMocked"]):has(StringLiteral[value="jest-mock"])', (node) => {
+        const text = node.getText();
+        return (text
+            // MaybeMockedDeep and MaybeMocked now are exported as Mocked and MockedShallow
+            .replace('MaybeMockedDeep', 'Mocked')
+            .replace('MaybeMocked', 'MockedShallow'));
+    });
+    tree.write(filePath, updatedContent);
+}
+exports.updateJestMockTypes = updateJestMockTypes;
+function updateJestMocked(tree, filePath) {
+    const contents = tree.read(filePath, 'utf-8');
+    const jestGlobalNodes = tsquery_1.tsquery.query(contents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="jest"]):has(StringLiteral[value="@jest/globals"])');
+    // this only applies if using jest from @jest/globals
+    if (jestGlobalNodes.length === 0) {
+        return;
+    }
+    const updatedJestMockTypes = tsquery_1.tsquery.replace(contents, 'CallExpression:has(Identifier[name="jest"]):has(Identifier[name="mocked"])', (node) => {
+        if (node.arguments.length === 2 &&
+            node.getText().startsWith('jest.mocked(')) {
+            const text = node.getText();
+            // jest.mocked(someObject, true); => jest.mocked(someObject);
+            if (node.arguments[1].getText() === 'true') {
+                return text.replace(/,\s*true/g, '');
+            }
+            // jest.mocked(someObject, false); => jest.mocked(someObject, {shallow: true});
+            // opt into the new behavior unless explicitly opting out
+            if (node.arguments[1].getText() === 'false') {
+                return text.replace('false', '{shallow: true}');
+            }
+        }
+    });
+    tree.write(filePath, updatedJestMockTypes);
+}
+exports.updateJestMocked = updateJestMocked;
+exports.default = updateTestsJest29;
+//# sourceMappingURL=jest-29-tests.js.map

package/src/migrations/update-15-9-0/jest-29-tests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jest-29-tests.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-15-9-0/jest-29-tests.ts"],"names":[],"mappings":"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"}