@nrwl/angular 13.3.0-beta.3 → 13.3.0-rc.1

package/src/generators/setup-mfe/lib/setup-serve-target.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupServeTarget = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function setupServeTarget(host, options) {
-    var _a;
+    var _a, _b;
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
-    appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: '@nrwl/angular:webpack-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined }) });
+    appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: '@nrwl/angular:webpack-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: options.host
+                ? undefined
+                : `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
     if (options.mfeType === 'host') {
         const remoteServeCommands = options.remotes
             ? options.remotes.map((r) => `nx serve ${r}`)

package/src/generators/setup-mfe/lib/setup-serve-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EAAE,8BAA8B,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,MAElC,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO;YACzC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,mBAAmB;YAClC,CAAC,CAAC,CAAC,GAAG,mBAAmB,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;YAC/B,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE;gBACP,QAAQ;aACT;SACF,CAAC;KACH;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,mCAC7B,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KACrC,OAAO,kCACF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,KAC7C,QAAQ,EAAE;oBACR,YAAY,OAAO,CAAC,OAAO,EAAE;oBAC7B,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ;iBACvD,MAEJ,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC/D;AACH,CAAC;AA7CD,4CA6CC"}
+{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EAAE,8BAA8B,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,OAAO,CAAC,IAAI;gBACtB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEjD,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO;YACzC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,mBAAmB;YAClC,CAAC,CAAC,CAAC,GAAG,mBAAmB,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;YAC/B,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE;gBACP,QAAQ;aACT;SACF,CAAC;KACH;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,mCAC7B,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KACrC,OAAO,kCACF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,KAC7C,QAAQ,EAAE;oBACR,YAAY,OAAO,CAAC,OAAO,EAAE;oBAC7B,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ;iBACvD,MAEJ,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC/D;AACH,CAAC;AAhDD,4CAgDC"}

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("../../utils/versions");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
@@ -12,19 +10,11 @@ function storybookConfigurationGenerator(tree, options) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
         (0, validate_options_1.validateOptions)(options);
-        // TODO(coly010/juristr): remove when @nrwl/storybook has been updated
-        const angularStorybookInstallTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@storybook/angular': versions_1.storybookVersion,
-            '@storybook/manager-webpack5': versions_1.storybookVersion,
-            '@storybook/builder-webpack5': versions_1.storybookVersion,
-            '@storybook/addon-essentials': versions_1.storybookVersion,
-        });
         const storybookGeneratorInstallTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, options);
         if (options.generateStories) {
             (0, generate_stories_1.generateStories)(tree, options);
         }
         return () => {
-            angularStorybookInstallTask();
             storybookGeneratorInstallTask();
         };
     });

package/src/generators/storybook-configuration/storybook-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,yCAA4D;AAC5D,mDAAwD;AACxD,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,sEAAsE;QACtE,MAAM,2BAA2B,GAAG,IAAA,qCAA4B,EAC9D,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,2BAAgB;YACtC,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;SAChD,CACF,CAAC;QACF,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,GAAG,EAAE;YACV,2BAA2B,EAAE,CAAC;YAC9B,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,0EA+BC;AAED,kBAAe,+BAA+B,CAAC"}
+{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,GAAG,EAAE;YACV,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AAnBD,0EAmBC;AAED,kBAAe,+BAA+B,CAAC"}

package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts

@@ -1,5 +1,4 @@
 import type { GeneratorCallback, Tree } from '@nrwl/devkit';
-import storybookConfigurationGenerator from '../storybook-configuration/storybook-configuration';
 import type { StorybookMigrateDefault5to6Schema } from './schema';
 export declare function storybookMigrateDefaults5To6Generator(tree: Tree, options: StorybookMigrateDefault5to6Schema): GeneratorCallback;
-export default storybookConfigurationGenerator;
+export default storybookMigrateDefaults5To6Generator;

package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookMigrateDefaults5To6Generator = void 0;
 const storybook_1 = require("@nrwl/storybook");
-const storybook_configuration_1 = require("../storybook-configuration/storybook-configuration");
 function storybookMigrateDefaults5To6Generator(tree, options) {
     return (0, storybook_1.migrateDefaultsGenerator)(tree, {
         name: options.name,
@@ -11,5 +10,5 @@ function storybookMigrateDefaults5To6Generator(tree, options) {
     });
 }
 exports.storybookMigrateDefaults5To6Generator = storybookMigrateDefaults5To6Generator;
-exports.default = storybook_configuration_1.default;
+exports.default = storybookMigrateDefaults5To6Generator;
 //# sourceMappingURL=storybook-migrate-defaults-5-to-6.js.map

package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map

@@ -1 +1 @@
-{"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,gGAAiG;AAGjG,SAAgB,qCAAqC,CACnD,IAAU,EACV,OAA0C;IAE1C,OAAO,IAAA,oCAAwB,EAAC,IAAI,EAAE;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAED,kBAAe,iCAA+B,CAAC"}
+{"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAG3D,SAAgB,qCAAqC,CACnD,IAAU,EACV,OAA0C;IAE1C,OAAO,IAAA,oCAAwB,EAAC,IAAI,EAAE;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAED,kBAAe,qCAAqC,CAAC"}

package/src/migrations/update-13-2-0/opt-out-testbed-teardown.d.ts

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

package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js

@@ -0,0 +1,231 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const path_1 = require("path");
+const ts = require("typescript");
+function default_1(tree) {
+    var _a, _b, _c;
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(tree);
+        for (const [projectName, project] of projects.entries()) {
+            // only interested in projects with @nrwl/jest:jest executor
+            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.test) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/jest:jest') {
+                continue;
+            }
+            const jestConfigPath = (_c = project.targets.test.options) === null || _c === void 0 ? void 0 : _c.jestConfig;
+            // if there's not jestConfigPath, we don't process it
+            if (!jestConfigPath) {
+                devkit_1.logger.warn(`The "jestConfig" property is not configured for the test target of the project "${projectName}". Skipping it.`);
+                continue;
+            }
+            if (!tree.exists(jestConfigPath)) {
+                devkit_1.logger.warn(`The specified "jestConfig" path "${jestConfigPath}" for the project "${projectName}" can not be found. Skipping it.`);
+                continue;
+            }
+            let jestConfigContents = tree.read(jestConfigPath, 'utf-8');
+            // check if it's an angular project by looking for jest-preset-angular
+            if (!jestConfigContents.includes('jest-preset-angular')) {
+                continue;
+            }
+            const { shouldUpdate, testSetupFilePath } = shouldUpdateTeardownConfig(tree, projectName, jestConfigPath, jestConfigContents);
+            if (!shouldUpdate) {
+                continue;
+            }
+            const printer = ts.createPrinter();
+            if (shouldUpdate === 'testSetup') {
+                optOutTestTeardownFromTestSetupFile(tree, testSetupFilePath, printer);
+            }
+            else {
+                optOutTestTeardownFromTestFiles(tree, projectName, printer);
+            }
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function shouldUpdateTeardownConfig(tree, projectName, jestConfigPath, jestConfigContents) {
+    const jestConfigAst = tsquery_1.tsquery.ast(jestConfigContents);
+    const setupFilesAfterEnvSelector = 'PropertyAssignment:has(Identifier[name=setupFilesAfterEnv])';
+    const setupFilesAfterEnvProperty = (0, tsquery_1.tsquery)(jestConfigAst, setupFilesAfterEnvSelector, {
+        visitAllChildren: true,
+    })[0];
+    // no property specified, we try to migrate test files
+    if (!setupFilesAfterEnvProperty) {
+        return { shouldUpdate: 'testFiles' };
+    }
+    const setupFilesValueSelector = 'ArrayLiteralExpression StringLiteral';
+    const setupFilesValue = (0, tsquery_1.tsquery)(setupFilesAfterEnvProperty, setupFilesValueSelector, {
+        visitAllChildren: true,
+    })[0];
+    // not setup file specified, we try to migrate test files
+    if (!setupFilesValue) {
+        return { shouldUpdate: 'testFiles' };
+    }
+    const testSetupFilePath = setupFilesValue
+        .getText()
+        .replace('<rootDir>', (0, path_1.dirname)(jestConfigPath))
+        .replace(/['"]/g, '');
+    // the specified file is invalid, we migrate test files
+    if (!tree.exists(testSetupFilePath)) {
+        return { shouldUpdate: 'testFiles' };
+    }
+    let testSetupFileContents = tree.read(testSetupFilePath, 'utf-8');
+    const testSetupFileAst = tsquery_1.tsquery.ast(testSetupFileContents);
+    const initTestEnvironmentSelector = 'CallExpression:has(PropertyAccessExpression:has(Identifier[name=initTestEnvironment]))';
+    const initTestEnvironmentCall = (0, tsquery_1.tsquery)(testSetupFileAst, initTestEnvironmentSelector, {
+        visitAllChildren: true,
+    })[0];
+    // no initTestEnvironment call, we migrate the test setup file
+    if (!initTestEnvironmentCall) {
+        return { shouldUpdate: 'testSetup', testSetupFilePath };
+    }
+    // no third arg, we migrate the test setup file
+    if (initTestEnvironmentCall.arguments.length === 2) {
+        return { shouldUpdate: 'testSetup', testSetupFilePath };
+    }
+    // this would be a type error, we migrate test files
+    if (initTestEnvironmentCall.arguments.length < 2) {
+        return { shouldUpdate: 'testFiles' };
+    }
+    const optionsArg = initTestEnvironmentCall.arguments[2];
+    // the options arg is an object that has a teardown property, no migration is needed
+    if (isObjectLiteralWithTeardown(optionsArg)) {
+        return { shouldUpdate: false };
+    }
+    // the options arg is an object that doesn't have a teardown property, we migrate the test setup file
+    if (isObjectLiteralWithoutTeardown(optionsArg)) {
+        return { shouldUpdate: 'testSetup', testSetupFilePath };
+    }
+    // the options arg is an `aotSummaries` function, we migrate the test setup file
+    if (isFunction(optionsArg)) {
+        return { shouldUpdate: 'testSetup', testSetupFilePath };
+    }
+    // we fallback to migrate the test files
+    return { shouldUpdate: 'testFiles' };
+}
+function optOutTestTeardownFromTestFiles(tree, projectName, printer) {
+    const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : root, (path) => {
+        if (!['.ts', '.js'].includes((0, path_1.extname)(path))) {
+            return;
+        }
+        let fileContents = tree.read(path, 'utf-8');
+        const ast = tsquery_1.tsquery.ast(fileContents);
+        const configureTestingModulePropertyAccessExpressionSelector = 'CallExpression > PropertyAccessExpression:has(Identifier[name=configureTestingModule])';
+        const configureTestingModulePropertyAccessExpressions = (0, tsquery_1.tsquery)(ast, configureTestingModulePropertyAccessExpressionSelector, {
+            visitAllChildren: true,
+        });
+        // no calls to configureTestingModule, we skip it
+        if (!configureTestingModulePropertyAccessExpressions.length) {
+            return;
+        }
+        // reverse the order to not mess with positions as we update the AST
+        const reversedConfigureTestingModulePropertyAccessExpressions = sortInReverseSourceOrder(configureTestingModulePropertyAccessExpressions);
+        reversedConfigureTestingModulePropertyAccessExpressions.forEach((propertyAccessExpression) => {
+            const configureTestingModuleCall = propertyAccessExpression.parent;
+            if (configureTestingModuleCall.arguments.length === 0 ||
+                !isObjectLiteralWithoutTeardown(configureTestingModuleCall.arguments[0])) {
+                return;
+            }
+            const testModuleMetadata = configureTestingModuleCall.arguments[0];
+            const replacement = getTestModuleMetadataLiteralReplacement(testModuleMetadata, printer);
+            fileContents = `${fileContents.slice(0, testModuleMetadata.getStart())}${replacement}${fileContents.slice(testModuleMetadata.getEnd())}`;
+            tree.write(path, fileContents);
+        });
+    });
+}
+function optOutTestTeardownFromTestSetupFile(tree, testSetupFilePath, printer) {
+    let testSetupFileContents = tree.read(testSetupFilePath, 'utf-8');
+    const testSetupFileAst = tsquery_1.tsquery.ast(testSetupFileContents);
+    const initTestEnvironmentSelector = 'CallExpression:has(PropertyAccessExpression:has(Identifier[name=initTestEnvironment]))';
+    const initTestEnvironmentCall = (0, tsquery_1.tsquery)(testSetupFileAst, initTestEnvironmentSelector, {
+        visitAllChildren: true,
+    })[0];
+    if (!initTestEnvironmentCall) {
+        testSetupFileContents += `
+      import { getTestBed } from '@angular/core/testing';
+      import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+      getTestBed().resetTestEnvironment();
+      getTestBed().initTestEnvironment(
+        BrowserDynamicTestingModule,
+        platformBrowserDynamicTesting(),
+        { teardown: { destroyAfterEach: false } },
+      );
+    `;
+        tree.write(testSetupFilePath, testSetupFileContents);
+        return;
+    }
+    const { span, text } = getInitTestEnvironmentLiteralReplacement(initTestEnvironmentCall, printer);
+    testSetupFileContents = `${testSetupFileContents.slice(0, span.start)}${text}${testSetupFileContents.slice(span.end)}`;
+    tree.write(testSetupFilePath, testSetupFileContents);
+}
+function getInitTestEnvironmentLiteralReplacement(initTestEnvironmentCall, printer) {
+    const literalProperties = [];
+    const options = initTestEnvironmentCall.arguments[initTestEnvironmentCall.arguments.length - 1];
+    let span;
+    let prefix;
+    // update the last argument of the initTestEnvironment call
+    if (initTestEnvironmentCall.arguments.length === 3) {
+        if (isFunction(options)) {
+            // If the last argument is a function, add the function as the `aotSummaries` property.
+            literalProperties.push(ts.factory.createPropertyAssignment('aotSummaries', options));
+        }
+        else if (ts.isObjectLiteralExpression(options)) {
+            // If the property is an object literal, copy over all the properties.
+            literalProperties.push(...options.properties);
+        }
+        prefix = '';
+        span = {
+            start: options.getStart(),
+            end: options.getEnd(),
+        };
+    }
+    else {
+        const start = options.getEnd();
+        prefix = ', ';
+        span = { start, end: start };
+    }
+    // finally push the teardown object so that it appears last
+    literalProperties.push(createTeardownAssignment());
+    return {
+        span,
+        text: `${prefix}${printer.printNode(ts.EmitHint.Unspecified, ts.factory.createObjectLiteralExpression(literalProperties), initTestEnvironmentCall.getSourceFile())}`,
+    };
+}
+function getTestModuleMetadataLiteralReplacement(testModuleMetadataObjectLiteral, printer) {
+    return printer.printNode(ts.EmitHint.Unspecified, ts.factory.createObjectLiteralExpression([
+        ...testModuleMetadataObjectLiteral.properties,
+        createTeardownAssignment(),
+    ], testModuleMetadataObjectLiteral.properties.length > 0), testModuleMetadataObjectLiteral.getSourceFile());
+}
+function isObjectLiteralWithTeardown(node) {
+    return (ts.isObjectLiteralExpression(node) &&
+        node.properties.some((prop) => {
+            var _a;
+            return ((_a = prop.name) === null || _a === void 0 ? void 0 : _a.getText()) === 'teardown';
+        }));
+}
+function isObjectLiteralWithoutTeardown(node) {
+    return (ts.isObjectLiteralExpression(node) &&
+        !node.properties.find((prop) => {
+            var _a;
+            return ((_a = prop.name) === null || _a === void 0 ? void 0 : _a.getText()) === 'teardown';
+        }));
+}
+function isFunction(node) {
+    return (ts.isArrowFunction(node) ||
+        ts.isFunctionExpression(node) ||
+        ts.isFunctionDeclaration(node));
+}
+function createTeardownAssignment() {
+    return ts.factory.createPropertyAssignment('teardown', ts.factory.createObjectLiteralExpression([
+        ts.factory.createPropertyAssignment('destroyAfterEach', ts.factory.createFalse()),
+    ]));
+}
+function sortInReverseSourceOrder(nodes) {
+    return nodes.sort((a, b) => b.getEnd() - a.getEnd());
+}
+//# sourceMappingURL=opt-out-testbed-teardown.js.map

package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"opt-out-testbed-teardown.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/opt-out-testbed-teardown.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-13-2-0/update-testing-imports.js

@@ -4,6 +4,9 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const typescript_1 = require("typescript");
 const path_1 = require("path");
+const workspace_1 = require("@nrwl/workspace");
+const semver_1 = require("semver");
+const versions_1 = require("../../utils/versions");
 function default_1(tree) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const identifiers = ['hot', 'cold', 'getTestScheduler', 'time'];
@@ -16,8 +19,18 @@ function default_1(tree) {
             shouldAddJasmineMarbles = shouldAddJasmineMarbles || updated;
         });
         if (shouldAddJasmineMarbles) {
+            let rxjsVersion;
+            try {
+                rxjsVersion = (0, workspace_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+            }
+            catch (_a) {
+                rxjsVersion = (0, workspace_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
+            }
+            const jasmineMarblesVersion = (0, semver_1.gte)(rxjsVersion, '7.0.0')
+                ? '~0.9.1'
+                : '~0.8.3';
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                'jasmine-marbles': '~0.8.3',
+                'jasmine-marbles': jasmineMarblesVersion,
             });
         }
         yield (0, devkit_1.formatFiles)(tree);

package/src/migrations/update-13-2-0/update-testing-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-testing-imports.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-testing-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-testing-imports.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-testing-imports.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-13-3-0/update-mfe-webpack-config.d.ts

@@ -0,0 +1,6 @@
+import type { Tree } from '@nrwl/devkit';
+export default function (tree: Tree): Promise<void>;
+export declare function addExperimentsObject(webpackConfig: string): string;
+export declare function addLibraryModuleType(webpackConfig: string): string;
+export declare function removeRemoteName(webpackConfig: string): string;
+export declare function addPublicHost(tree: Tree, projects: string[]): void;

package/src/migrations/update-13-3-0/update-mfe-webpack-config.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addPublicHost = exports.removeRemoteName = exports.addLibraryModuleType = exports.addExperimentsObject = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+function default_1(tree) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const NRWL_WEBPACK_BROWSER_BUILDER = '@nrwl/angular:webpack-browser';
+        const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
+        const projects = [];
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, NRWL_WEBPACK_BROWSER_BUILDER, (opts, projectName) => {
+            var _a;
+            // Update the webpack config
+            const webpackPath = (_a = opts[CUSTOM_WEBPACK_OPTION]) === null || _a === void 0 ? void 0 : _a.path;
+            if (!tree.exists(webpackPath)) {
+                devkit_1.logger.warn(`Webpack config file for project: ${projectName} does not exist. Skipping project.`);
+                return;
+            }
+            const webpackConfig = tree.read(webpackPath, 'utf-8');
+            const ast = tsquery_1.tsquery.ast(webpackConfig);
+            const moduleFederationWebpackConfig = (0, tsquery_1.tsquery)(ast, 'Identifier[name=ModuleFederationPlugin]', {
+                visitAllChildren: true,
+            });
+            if (!moduleFederationWebpackConfig ||
+                moduleFederationWebpackConfig.length === 0) {
+                return;
+            }
+            projects.push(projectName);
+            let updatedWebpackFile = addExperimentsObject(webpackConfig);
+            updatedWebpackFile = addLibraryModuleType(updatedWebpackFile);
+            updatedWebpackFile = removeRemoteName(updatedWebpackFile);
+            tree.write(webpackPath, updatedWebpackFile);
+        });
+        addPublicHost(tree, projects);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function addExperimentsObject(webpackConfig) {
+    const WEBPACK_EXPERIMENTS_QUERY = 'PropertyAssignment > Identifier[name=experiments] ~ ObjectLiteralExpression';
+    const ast = tsquery_1.tsquery.ast(webpackConfig);
+    const webpackExperimentsNode = (0, tsquery_1.tsquery)(ast, WEBPACK_EXPERIMENTS_QUERY, {
+        visitAllChildren: true,
+    });
+    if (webpackExperimentsNode && webpackExperimentsNode.length > 0) {
+        if (webpackExperimentsNode[0].getText().includes('outputModule')) {
+            return webpackConfig;
+        }
+        return `${webpackConfig.slice(0, webpackExperimentsNode[0].getStart() + 1)}\noutputModule: true,${webpackConfig.slice(webpackExperimentsNode[0].getStart() + 1)}`;
+    }
+    const WEBPACK_EXPORT = 'module.exports = {';
+    const openingBracePos = webpackConfig.indexOf(WEBPACK_EXPORT) + WEBPACK_EXPORT.length;
+    return `${webpackConfig.slice(0, openingBracePos)}
+  experiments: {
+    outputModule: true  
+  },${webpackConfig.slice(openingBracePos)}`;
+}
+exports.addExperimentsObject = addExperimentsObject;
+function addLibraryModuleType(webpackConfig) {
+    const LIBRARY_NODE_QUERY = 'PropertyAssignment > Identifier[name=library] ~ ObjectLiteralExpression';
+    const ast = tsquery_1.tsquery.ast(webpackConfig);
+    const libraryModuleNode = (0, tsquery_1.tsquery)(ast, LIBRARY_NODE_QUERY);
+    if (libraryModuleNode && libraryModuleNode.length > 0) {
+        return webpackConfig;
+    }
+    const MODULE_FEDERATION_PLUGIN_INSTANTIATION = 'new ModuleFederationPlugin({';
+    const openingBracePos = webpackConfig.indexOf(MODULE_FEDERATION_PLUGIN_INSTANTIATION) +
+        +MODULE_FEDERATION_PLUGIN_INSTANTIATION.length;
+    return `${webpackConfig.slice(0, openingBracePos)}
+  library: {
+      type: 'module'
+  },${webpackConfig.slice(openingBracePos)}`;
+}
+exports.addLibraryModuleType = addLibraryModuleType;
+function removeRemoteName(webpackConfig) {
+    const REMOTES_QUERY = 'Identifier[name=remotes] ~ ObjectLiteralExpression';
+    const ast = tsquery_1.tsquery.ast(webpackConfig);
+    const remotesObjectNode = (0, tsquery_1.tsquery)(ast, REMOTES_QUERY, {
+        visitAllChildren: true,
+    })[0];
+    if (!remotesObjectNode) {
+        return webpackConfig;
+    }
+    const remoteProps = (0, tsquery_1.tsquery)(remotesObjectNode, 'PropertyAssignment', {
+        visitAllChildren: true,
+    });
+    const updatedRemoteProps = [];
+    for (const prop of remoteProps) {
+        const stringValue = (0, tsquery_1.tsquery)(prop, 'StringLiteral', {
+            visitAllChildren: true,
+        })[0];
+        if (!stringValue.getText().match(/\w*@*http/)) {
+            continue;
+        }
+        const identifier = (0, tsquery_1.tsquery)(prop, 'Identifier', {
+            visitAllChildren: true,
+        })[0];
+        const updatedRemoteStringValue = stringValue
+            .getText()
+            .slice(stringValue.getText().indexOf('@') + 1, -1);
+        updatedRemoteProps.push(`${identifier.getText()}: '${updatedRemoteStringValue}'`);
+    }
+    const updatedRemotesObject = `{
+    ${updatedRemoteProps.join(',\n')}
+  }`;
+    return `${webpackConfig.slice(0, remotesObjectNode.getStart())}${updatedRemotesObject}${webpackConfig.slice(remotesObjectNode.getEnd())}`;
+}
+exports.removeRemoteName = removeRemoteName;
+function addPublicHost(tree, projects) {
+    var _a, _b;
+    for (const projectName of projects) {
+        const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const updatedProject = Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { serve: Object.assign(Object.assign({}, project.targets.serve), { options: Object.assign(Object.assign({}, project.targets.serve.options), { publicHost: `http://localhost:${(_b = (_a = project.targets.serve.options) === null || _a === void 0 ? void 0 : _a.port) !== null && _b !== void 0 ? _b : 4200}` }) }) }) });
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, updatedProject);
+    }
+}
+exports.addPublicHost = addPublicHost;
+//# sourceMappingURL=update-mfe-webpack-config.js.map

package/src/migrations/update-13-3-0/update-mfe-webpack-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-mfe-webpack-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-3-0/update-mfe-webpack-config.ts"],"names":[],"mappings":"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"}

package/src/runtime/nx/data-persistence.d.ts

@@ -3,6 +3,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Actions } from '@ngrx/effects';
 import { Action, Store, ActionCreator } from '@ngrx/store';
 import { Observable } from 'rxjs';
+import * as i0 from "@angular/core";
 /**
  * See {@link DataPersistence.pessimisticUpdate} for more information.
  */
@@ -241,4 +242,6 @@ export declare class DataPersistence<T> {
      * ```
      */
     navigation(component: Type<any>, opts: HandleNavigationOpts<T>): Observable<any>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DataPersistence<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<DataPersistence<any>>;
 }

package/src/runtime/nx/nx.module.d.ts

@@ -1,4 +1,5 @@
 import { ModuleWithProviders } from '@angular/core';
+import * as i0 from "@angular/core";
 /**
  * @whatItDoes Provides services for enterprise Angular applications.
  *
@@ -6,4 +7,7 @@ import { ModuleWithProviders } from '@angular/core';
  */
 export declare class NxModule {
     static forRoot(): ModuleWithProviders<NxModule>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NxModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<NxModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<NxModule>;
 }

package/src/utils/nx-devkit/ast-utils.d.ts

@@ -4,6 +4,8 @@ export declare function getDecoratorMetadata(source: ts.SourceFile, identifier:
 export declare function removeFromNgModule(host: Tree, source: ts.SourceFile, modulePath: string, property: string): ts.SourceFile;
 export declare function addImportToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
 export declare function addImportToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string): ts.SourceFile;
+export declare function addDeclarationsToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string[]): ts.SourceFile;
+export declare function replaceIntoToTestBed(host: Tree, source: ts.SourceFile, specPath: string, newSymbol: string, previousSymbol: string): ts.SourceFile;
 export declare function getBootstrapComponent(source: ts.SourceFile, moduleClassName: string): string;
 export declare function addRoute(host: Tree, ngModulePath: string, source: ts.SourceFile, route: string): ts.SourceFile;
 export declare function addProviderToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;

package/src/utils/nx-devkit/ast-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRoute = exports.getBootstrapComponent = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.getDecoratorMetadata = void 0;
+exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRoute = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.getDecoratorMetadata = void 0;
 const ts = require("typescript");
 const find_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/find-nodes");
 const get_source_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/get-source-nodes");
@@ -240,6 +240,40 @@ function addImportToTestBed(host, source, specPath, symbolName) {
     return source;
 }
 exports.addImportToTestBed = addImportToTestBed;
+function addDeclarationsToTestBed(host, source, specPath, symbolName) {
+    const allCalls = ((0, find_nodes_1.findNodes)(source, ts.SyntaxKind.CallExpression));
+    const configureTestingModuleObjectLiterals = allCalls
+        .filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
+        .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
+        .map((c) => c.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression
+        ? c.arguments[0]
+        : null);
+    if (configureTestingModuleObjectLiterals.length > 0) {
+        const startPosition = configureTestingModuleObjectLiterals[0]
+            .getFirstToken(source)
+            .getEnd();
+        return (0, ast_utils_1.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
+    }
+    return source;
+}
+exports.addDeclarationsToTestBed = addDeclarationsToTestBed;
+function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol) {
+    const allCalls = ((0, find_nodes_1.findNodes)(source, ts.SyntaxKind.CallExpression));
+    const configureTestingModuleObjectLiterals = allCalls
+        .filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
+        .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
+        .map((c) => c.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression
+        ? c.arguments[0]
+        : null);
+    if (configureTestingModuleObjectLiterals.length > 0) {
+        const startPosition = configureTestingModuleObjectLiterals[0]
+            .getFirstToken(source)
+            .getEnd();
+        return (0, ast_utils_1.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
+    }
+    return source;
+}
+exports.replaceIntoToTestBed = replaceIntoToTestBed;
 function getBootstrapComponent(source, moduleClassName) {
     const bootstrap = getMatchingProperty(source, 'bootstrap', 'NgModule', '@angular/core');
     if (!bootstrap) {