@nrwl/angular 13.10.0-beta.7 → 13.10.0-beta.8

package/src/generators/ng-add/utilities/get-all-projects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-all-projects.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/get-all-projects.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAGjD,SAAgB,cAAc,CAAC,IAAU;IACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,MAAM,GAAsB;QAChC,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QACtC,MAAM,gBAAgB,GAAkC;YACtD,MAAM,EAAE,OAAO;YACf,IAAI;SACL,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wCAqBC"}

package/src/generators/ng-add/utilities/normalize-options.d.ts

@@ -0,0 +1,3 @@
+import { GeneratorOptions } from '../schema';
+import { WorkspaceProjects } from './types';
+export declare function normalizeOptions(options: GeneratorOptions, projects: WorkspaceProjects): GeneratorOptions;

package/src/generators/ng-add/utilities/normalize-options.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function normalizeOptions(options, projects) {
+    var _a;
+    // TODO: this restrictions will be removed, it's here temporarily to
+    // execute for both a full migration and a minimal one to maintain
+    // the current behavior
+    const hasLibraries = projects.libs.length > 0;
+    if (projects.apps.length > 2 || hasLibraries) {
+        throw new Error('Can only convert projects with one app');
+    }
+    let npmScope = (_a = options.npmScope) !== null && _a !== void 0 ? _a : options.name;
+    if (npmScope) {
+        npmScope = (0, devkit_1.names)(npmScope).fileName;
+    }
+    else {
+        npmScope = projects.apps[0].name;
+    }
+    return Object.assign(Object.assign({}, options), { npmScope });
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/ng-add/utilities/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAIrC,SAAgB,gBAAgB,CAC9B,OAAyB,EACzB,QAA2B;;IAE3B,oEAAoE;IACpE,kEAAkE;IAClE,uBAAuB;IACvB,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9C,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC3D;IAED,IAAI,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,CAAC,IAAI,CAAC;IAChD,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM;QACL,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAClC;IAED,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AApBD,4CAoBC"}

package/src/generators/ng-add/utilities/project.migrator.d.ts

@@ -0,0 +1,21 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { GeneratorOptions } from '../schema';
+import { MigrationProjectConfiguration, ValidationResult } from './types';
+export declare abstract class ProjectMigrator {
+    protected readonly tree: Tree;
+    protected readonly options: GeneratorOptions;
+    protected projectConfig: ProjectConfiguration;
+    protected project: {
+        name: string;
+        oldRoot: string;
+        oldSourceRoot: string;
+        newRoot: string;
+        newSourceRoot: string;
+    };
+    constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, rootDir: string);
+    abstract migrate(): Promise<void>;
+    abstract validate(): ValidationResult;
+    protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
+    protected moveDir(from: string, to: string): void;
+    protected moveFile(from: string, to: string, required?: boolean): void;
+}

package/src/generators/ng-add/utilities/project.migrator.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectMigrator = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+class ProjectMigrator {
+    constructor(tree, options, project, rootDir) {
+        var _a, _b, _c;
+        this.tree = tree;
+        this.options = options;
+        this.projectConfig = project.config;
+        this.project = {
+            name: project.name,
+            oldRoot: (_a = this.projectConfig.root) !== null && _a !== void 0 ? _a : '',
+            oldSourceRoot: (_c = (_b = this.projectConfig.sourceRoot) !== null && _b !== void 0 ? _b : this.projectConfig.root) !== null && _c !== void 0 ? _c : '',
+            newRoot: `${rootDir}/${project.name}`,
+            newSourceRoot: `${rootDir}/${project.name}/src`,
+        };
+    }
+    moveProjectRootFile(filePath, isRequired = true) {
+        if (!filePath) {
+            return;
+        }
+        const filename = !!filePath ? (0, path_1.basename)(filePath) : '';
+        const from = filePath;
+        const to = (0, devkit_1.joinPathFragments)(this.project.newRoot, filename);
+        this.moveFile(from, to, isRequired);
+    }
+    moveDir(from, to) {
+        (0, devkit_1.visitNotIgnoredFiles)(this.tree, from, (file) => {
+            this.moveFile(file, file.replace(from, to), true);
+        });
+    }
+    moveFile(from, to, required = true) {
+        if (!this.tree.exists(from)) {
+            if (required) {
+                console.warn(`Path: ${from} does not exist`);
+            }
+        }
+        else if (this.tree.exists(to)) {
+            if (required) {
+                console.warn(`Path: ${to} already exists`);
+            }
+        }
+        else {
+            const contents = this.tree.read(from);
+            this.tree.write(to, contents);
+            this.tree.delete(from);
+        }
+    }
+}
+exports.ProjectMigrator = ProjectMigrator;
+//# sourceMappingURL=project.migrator.js.map

package/src/generators/ng-add/utilities/project.migrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,+BAAgC;AAIhC,MAAsB,eAAe;IAUnC,YACqB,IAAU,EACV,OAAyB,EAC5C,OAAsC,EACtC,OAAe;;QAHI,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAkB;QAI5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YACtC,aAAa,EACX,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,UAAU,mCAAI,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YAChE,OAAO,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;YACrC,aAAa,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM;SAChD,CAAC;IACJ,CAAC;IAKS,mBAAmB,CAAC,QAAgB,EAAE,UAAU,GAAG,IAAI;QAC/D,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,QAAQ,CAAC;QACtB,MAAM,EAAE,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAES,OAAO,CAAC,IAAY,EAAE,EAAU;QACxC,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,IAAY,EAAE,EAAU,EAAE,WAAoB,IAAI;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAiB,CAAC,CAAC;aAC9C;SACF;aAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC/B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;aAC5C;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACxB;IACH,CAAC;CACF;AA9DD,0CA8DC"}

package/src/generators/ng-add/utilities/types.d.ts

@@ -0,0 +1,10 @@
+import { ProjectConfiguration } from '@nrwl/devkit';
+export declare type MigrationProjectConfiguration = {
+    config: ProjectConfiguration;
+    name: string;
+};
+export declare type WorkspaceProjects = {
+    apps: MigrationProjectConfiguration[];
+    libs: MigrationProjectConfiguration[];
+};
+export declare type ValidationResult = string | null;

package/src/generators/ng-add/utilities/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/src/generators/ng-add/utilities/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/types.ts"],"names":[],"mappings":""}

package/src/generators/ng-add/utilities/workspace.d.ts

@@ -0,0 +1,12 @@
+import { Tree } from '@nrwl/devkit';
+import { GeneratorOptions } from '../schema';
+import { WorkspaceProjects } from './types';
+export declare function validateWorkspace(tree: Tree, projects: WorkspaceProjects): void;
+export declare function createNxJson(tree: Tree, options: GeneratorOptions, setWorkspaceLayoutAsNewProjectRoot?: boolean): void;
+export declare function decorateAngularCli(tree: Tree): void;
+export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
+export declare function updateRootTsConfig(tree: Tree): void;
+export declare function updatePackageJson(tree: Tree): void;
+export declare function updateTsLint(tree: Tree): void;
+export declare function createWorkspaceFiles(tree: Tree): Promise<void>;
+export declare function createRootKarmaConfig(tree: Tree): void;

package/src/generators/ng-add/utilities/workspace.js

@@ -0,0 +1,258 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.updateTsLint = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.decorateAngularCli = exports.createNxJson = exports.validateWorkspace = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const workspace_1 = require("@nrwl/workspace/src/generators/workspace/workspace");
+const default_base_1 = require("@nrwl/workspace/src/utilities/default-base");
+const prettier_1 = require("@nrwl/workspace/src/utilities/prettier");
+const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const versions_1 = require("@nrwl/workspace/src/utils/versions");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const versions_2 = require("../../../utils/versions");
+const e2e_utils_1 = require("./e2e-utils");
+// TODO: most of the validation here will be moved to the app migrator when
+// support for multiple apps is added. This will only contain workspace-wide
+// validation.
+function validateWorkspace(tree, projects) {
+    try {
+        if (!tree.exists('package.json')) {
+            throw new Error('Cannot find package.json');
+        }
+        if (!tree.exists('angular.json')) {
+            throw new Error('Cannot find angular.json');
+        }
+        const e2eKey = (0, e2e_utils_1.getE2eKey)(projects);
+        const e2eApp = (0, e2e_utils_1.getE2eProject)(projects);
+        if (!e2eApp) {
+            return;
+        }
+        if ((0, e2e_utils_1.isProtractorE2eProject)(e2eApp.config)) {
+            if (tree.exists(e2eApp.config.targets.e2e.options.protractorConfig)) {
+                return;
+            }
+            console.info(`Make sure the "${e2eKey}.architect.e2e.options.protractorConfig" is valid or the "${e2eKey}" project is removed from "angular.json".`);
+            throw new Error(`An e2e project with Protractor was found but "${e2eApp.config.targets.e2e.options.protractorConfig}" could not be found.`);
+        }
+        if ((0, e2e_utils_1.isCypressE2eProject)(e2eApp.config)) {
+            const configFile = (0, e2e_utils_1.getCypressConfigFile)(e2eApp.config);
+            if (configFile && !tree.exists(configFile)) {
+                throw new Error(`An e2e project with Cypress was found but "${configFile}" could not be found.`);
+            }
+            if (!tree.exists('cypress')) {
+                throw new Error(`An e2e project with Cypress was found but the "cypress" directory could not be found.`);
+            }
+            return;
+        }
+        throw new Error(`An e2e project was found but it's using an unsupported executor "${e2eApp.config.targets.e2e.executor}".`);
+    }
+    catch (e) {
+        console.error(e.message);
+        console.error('Your workspace could not be converted into an Nx Workspace because of the above error.');
+        throw e;
+    }
+}
+exports.validateWorkspace = validateWorkspace;
+function createNxJson(tree, options, setWorkspaceLayoutAsNewProjectRoot = false) {
+    var _a;
+    const { projects = {}, newProjectRoot = '' } = (0, devkit_1.readJson)(tree, 'angular.json');
+    // TODO: temporarily leaving this here because it's the old behavior for a
+    // minimal migration, will be removed in a later PR
+    const hasLibraries = Object.keys(projects).find((project) => projects[project].projectType &&
+        projects[project].projectType !== 'application');
+    if (Object.keys(projects).length !== 1 || hasLibraries) {
+        throw new Error(`The schematic can only be used with Angular CLI workspaces with a single application.`);
+    }
+    (0, devkit_1.writeJson)(tree, 'nx.json', {
+        npmScope: options.npmScope,
+        affected: {
+            defaultBase: (_a = options.defaultBase) !== null && _a !== void 0 ? _a : (0, default_base_1.deduceDefaultBase)(),
+        },
+        implicitDependencies: {
+            'package.json': {
+                dependencies: '*',
+                devDependencies: '*',
+            },
+            '.eslintrc.json': '*',
+        },
+        tasksRunnerOptions: {
+            default: {
+                runner: 'nx/tasks-runners/default',
+                options: {
+                    cacheableOperations: ['build', 'lint', 'test', 'e2e'],
+                },
+            },
+        },
+        targetDependencies: {
+            build: [
+                {
+                    target: 'build',
+                    projects: 'dependencies',
+                },
+            ],
+        },
+        workspaceLayout: setWorkspaceLayoutAsNewProjectRoot
+            ? { appsDir: newProjectRoot, libsDir: newProjectRoot }
+            : undefined,
+    });
+}
+exports.createNxJson = createNxJson;
+function decorateAngularCli(tree) {
+    const nrwlWorkspacePath = require.resolve('@nrwl/workspace/package.json');
+    const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)((0, path_1.dirname)(nrwlWorkspacePath), 'src/generators/utils/decorate-angular-cli.js__tmpl__'), 'utf-8');
+    tree.write('decorate-angular-cli.js', decorateCli);
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.scripts &&
+            json.scripts.postinstall &&
+            !json.scripts.postinstall.includes('decorate-angular-cli.js')) {
+            // if exists, add execution of this script
+            json.scripts.postinstall += ' && node ./decorate-angular-cli.js';
+        }
+        else {
+            if (!json.scripts)
+                json.scripts = {};
+            // if doesn't exist, set to execute this script
+            json.scripts.postinstall = 'node ./decorate-angular-cli.js';
+        }
+        if (json.scripts.ng) {
+            json.scripts.ng = 'nx';
+        }
+        return json;
+    });
+}
+exports.decorateAngularCli = decorateAngularCli;
+function updateWorkspaceConfigDefaults(tree) {
+    var _a;
+    const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(tree);
+    delete workspaceConfig.newProjectRoot;
+    workspaceConfig.cli = (_a = workspaceConfig.cli) !== null && _a !== void 0 ? _a : {};
+    if (!workspaceConfig.cli.defaultCollection) {
+        workspaceConfig.cli.defaultCollection = '@nrwl/angular';
+    }
+    (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfig);
+}
+exports.updateWorkspaceConfigDefaults = updateWorkspaceConfigDefaults;
+function updateRootTsConfig(tree) {
+    (0, devkit_1.writeJson)(tree, 'tsconfig.base.json', setUpCompilerOptions((0, devkit_1.readJson)(tree, (0, typescript_1.getRootTsConfigPathInTree)(tree))));
+    if (tree.exists('tsconfig.json')) {
+        tree.delete('tsconfig.json');
+    }
+}
+exports.updateRootTsConfig = updateRootTsConfig;
+function updatePackageJson(tree) {
+    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
+        var _a, _b;
+        packageJson.scripts = packageJson.scripts || {};
+        packageJson.scripts = Object.assign(Object.assign({}, packageJson.scripts), { nx: 'nx', 'affected:apps': 'nx affected:apps', 'affected:libs': 'nx affected:libs', 'affected:build': 'nx affected:build', 'affected:e2e': 'nx affected:e2e', 'affected:test': 'nx affected:test', 'affected:lint': 'nx affected:lint', 'affected:graph': 'nx affected:graph', affected: 'nx affected', format: 'nx format:write', 'format:write': 'nx format:write', 'format:check': 'nx format:check', update: 'ng update @nrwl/workspace', 'update:check': 'ng update', lint: 'nx workspace-lint && ng lint', graph: 'nx graph', 'workspace-generator': 'nx workspace-generator', help: 'nx help' });
+        packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
+        packageJson.dependencies = (_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : {};
+        if (!packageJson.dependencies['@nrwl/angular']) {
+            packageJson.dependencies['@nrwl/angular'] = versions_2.nxVersion;
+        }
+        if (!packageJson.devDependencies['@angular/cli']) {
+            packageJson.devDependencies['@angular/cli'] = versions_2.angularDevkitVersion;
+        }
+        if (!packageJson.devDependencies['@nrwl/workspace']) {
+            packageJson.devDependencies['@nrwl/workspace'] = versions_2.nxVersion;
+        }
+        if (!packageJson.devDependencies['nx']) {
+            packageJson.devDependencies['nx'] = versions_2.nxVersion;
+        }
+        if (!packageJson.devDependencies['prettier']) {
+            packageJson.devDependencies['prettier'] = versions_1.prettierVersion;
+        }
+        return packageJson;
+    });
+}
+exports.updatePackageJson = updatePackageJson;
+function updateTsLint(tree) {
+    if (!tree.exists(`tslint.json`)) {
+        return;
+    }
+    (0, devkit_1.updateJson)(tree, 'tslint.json', (tslintJson) => {
+        var _a;
+        [
+            'no-trailing-whitespace',
+            'one-line',
+            'quotemark',
+            'typedef-whitespace',
+            'whitespace',
+        ].forEach((key) => {
+            tslintJson[key] = undefined;
+        });
+        tslintJson.rulesDirectory = (_a = tslintJson.rulesDirectory) !== null && _a !== void 0 ? _a : [];
+        tslintJson.rulesDirectory.push('node_modules/@nrwl/workspace/src/tslint');
+        tslintJson.rules['nx-enforce-module-boundaries'] = [
+            true,
+            {
+                allow: [],
+                depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
+            },
+        ];
+        return tslintJson;
+    });
+}
+exports.updateTsLint = updateTsLint;
+function createWorkspaceFiles(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        updateVsCodeRecommendedExtensions(tree);
+        yield updatePrettierConfig(tree);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/root'), '.', {
+            tmpl: '',
+            dot: '.',
+            rootTsConfigPath: (0, typescript_1.getRootTsConfigPathInTree)(tree),
+        });
+    });
+}
+exports.createWorkspaceFiles = createWorkspaceFiles;
+function createRootKarmaConfig(tree) {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/root-karma'), '.', {
+        tmpl: '',
+    });
+}
+exports.createRootKarmaConfig = createRootKarmaConfig;
+function updateVsCodeRecommendedExtensions(tree) {
+    const recommendations = [
+        'nrwl.angular-console',
+        'angular.ng-template',
+        'dbaeumer.vscode-eslint',
+        'esbenp.prettier-vscode',
+    ];
+    if (tree.exists('.vscode/extensions.json')) {
+        (0, devkit_1.updateJson)(tree, '.vscode/extensions.json', (json) => {
+            json.recommendations = json.recommendations || [];
+            recommendations.forEach((extension) => {
+                if (!json.recommendations.includes(extension)) {
+                    json.recommendations.push(extension);
+                }
+            });
+            return json;
+        });
+    }
+    else {
+        (0, devkit_1.writeJson)(tree, '.vscode/extensions.json', {
+            recommendations,
+        });
+    }
+}
+function updatePrettierConfig(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const existingPrettierConfig = yield (0, prettier_1.resolveUserExistingPrettierConfig)();
+        if (!existingPrettierConfig) {
+            (0, devkit_1.writeJson)(tree, '.prettierrc', workspace_1.DEFAULT_NRWL_PRETTIER_CONFIG);
+        }
+        if (!tree.exists('.prettierignore')) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/prettier'), '.', { tmpl: '', dot: '.' });
+        }
+    });
+}
+function setUpCompilerOptions(tsconfig) {
+    if (!tsconfig.compilerOptions.paths) {
+        tsconfig.compilerOptions.paths = {};
+    }
+    tsconfig.compilerOptions.baseUrl = '.';
+    tsconfig.compilerOptions.rootDir = '.';
+    return tsconfig;
+}
+//# sourceMappingURL=workspace.js.map

package/src/generators/ng-add/utilities/workspace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AACtB,kFAAkG;AAClG,6EAA+E;AAC/E,qEAA2F;AAC3F,yEAAqF;AACrF,iEAAqE;AACrE,2BAAkC;AAClC,+BAAqC;AACrC,sDAA0E;AAE1E,2CAMqB;AAGrB,2EAA2E;AAC3E,4EAA4E;AAC5E,cAAc;AACd,SAAgB,iBAAiB,CAC/B,IAAU,EACV,QAA2B;IAE3B,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,IAAA,yBAAa,EAAC,QAAQ,CAAC,CAAC;QAEvC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,IAAI,IAAA,kCAAsB,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACzC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBACnE,OAAO;aACR;YAED,OAAO,CAAC,IAAI,CACV,kBAAkB,MAAM,6DAA6D,MAAM,2CAA2C,CACvI,CAAC;YACF,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,uBAAuB,CAC3H,CAAC;SACH;QAED,IAAI,IAAA,+BAAmB,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACtC,MAAM,UAAU,GAAG,IAAA,gCAAoB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CACb,8CAA8C,UAAU,uBAAuB,CAChF,CAAC;aACH;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;gBAC3B,MAAM,IAAI,KAAK,CACb,uFAAuF,CACxF,CAAC;aACH;YAED,OAAO;SACR;QAED,MAAM,IAAI,KAAK,CACb,oEAAoE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,CAC3G,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,CAAC,KAAK,CACX,wFAAwF,CACzF,CAAC;QACF,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AA5DD,8CA4DC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,OAAyB,EACzB,qCAA8C,KAAK;;IAEnD,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,cAAc,GAAG,EAAE,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC9E,0EAA0E;IAC1E,mDAAmD;IACnD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC7C,CAAC,OAAO,EAAE,EAAE,CACV,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW;QAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,KAAK,aAAa,CAClD,CAAC;IACF,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,EAAE;QACtD,MAAM,IAAI,KAAK,CACb,uFAAuF,CACxF,CAAC;KACH;IAED,IAAA,kBAAS,EAAsB,IAAI,EAAE,SAAS,EAAE;QAC9C,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE;YACR,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,IAAA,gCAAiB,GAAE;SACxD;QACD,oBAAoB,EAAE;YACpB,cAAc,EAAE;gBACd,YAAY,EAAE,GAAG;gBACjB,eAAe,EAAE,GAAG;aACrB;YACD,gBAAgB,EAAE,GAAG;SACtB;QACD,kBAAkB,EAAE;YAClB,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE;oBACP,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBACtD;aACF;SACF;QACD,kBAAkB,EAAE;YAClB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,cAAc;iBACzB;aACF;SACF;QACD,eAAe,EAAE,kCAAkC;YACjD,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE;YACtD,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC;AAnDD,oCAmDC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,IAAA,iBAAY,EAC9B,IAAA,WAAI,EACF,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAC1B,sDAAsD,CACvD,EACD,OAAO,CACR,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;IAEnD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IACE,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,OAAO,CAAC,WAAW;YACxB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAC7D;YACA,0CAA0C;YAC1C,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,oCAAoC,CAAC;SAClE;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACrC,+CAA+C;YAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,gCAAgC,CAAC;SAC7D;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AA7BD,gDA6BC;AAED,SAAgB,6BAA6B,CAAC,IAAU;;IACtD,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IACzD,OAAQ,eAAuB,CAAC,cAAc,CAAC;IAC/C,eAAe,CAAC,GAAG,GAAG,MAAA,eAAe,CAAC,GAAG,mCAAI,EAAE,CAAC;IAChD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE;QAC1C,eAAe,CAAC,GAAG,CAAC,iBAAiB,GAAG,eAAe,CAAC;KACzD;IACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACtD,CAAC;AARD,sEAQC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,IAAA,kBAAS,EACP,IAAI,EACJ,oBAAoB,EACpB,oBAAoB,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC,CAAC,CACtE,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AATD,gDASC;AAED,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;;QAC/C,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;QAChD,WAAW,CAAC,OAAO,mCACd,WAAW,CAAC,OAAO,KACtB,EAAE,EAAE,IAAI,EACR,eAAe,EAAE,kBAAkB,EACnC,eAAe,EAAE,kBAAkB,EACnC,gBAAgB,EAAE,mBAAmB,EACrC,cAAc,EAAE,iBAAiB,EACjC,eAAe,EAAE,kBAAkB,EACnC,eAAe,EAAE,kBAAkB,EACnC,gBAAgB,EAAE,mBAAmB,EACrC,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,iBAAiB,EACzB,cAAc,EAAE,iBAAiB,EACjC,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,2BAA2B,EACnC,cAAc,EAAE,WAAW,EAC3B,IAAI,EAAE,8BAA8B,EACpC,KAAK,EAAE,UAAU,EACjB,qBAAqB,EAAE,wBAAwB,EAC/C,IAAI,EAAE,SAAS,GAChB,CAAC;QACF,WAAW,CAAC,eAAe,GAAG,MAAA,WAAW,CAAC,eAAe,mCAAI,EAAE,CAAC;QAChE,WAAW,CAAC,YAAY,GAAG,MAAA,WAAW,CAAC,YAAY,mCAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;YAC9C,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,oBAAS,CAAC;SACvD;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YAChD,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,+BAAoB,CAAC;SACpE;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE;YACnD,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,oBAAS,CAAC;SAC5D;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YACtC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,oBAAS,CAAC;SAC/C;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YAC5C,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,0BAAe,CAAC;SAC3D;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AA5CD,8CA4CC;AAED,SAAgB,YAAY,CAAC,IAAU;IACrC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,EAAE;;QAC7C;YACE,wBAAwB;YACxB,UAAU;YACV,WAAW;YACX,oBAAoB;YACpB,YAAY;SACb,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAChB,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,cAAc,GAAG,MAAA,UAAU,CAAC,cAAc,mCAAI,EAAE,CAAC;QAC5D,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QAC1E,UAAU,CAAC,KAAK,CAAC,8BAA8B,CAAC,GAAG;YACjD,IAAI;YACJ;gBACE,KAAK,EAAE,EAAE;gBACT,cAAc,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;aACtE;SACF,CAAC;QACF,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,oCA0BC;AAED,SAAsB,oBAAoB,CAAC,IAAU;;QACnD,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE;YACtE,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,GAAG;YACR,gBAAgB,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;CAAA;AATD,oDASC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACnD,GAAG,EACH;QACE,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AATD,sDASC;AAED,SAAS,iCAAiC,CAAC,IAAU;IACnD,MAAM,eAAe,GAAG;QACtB,sBAAsB;QACtB,qBAAqB;QACrB,wBAAwB;QACxB,wBAAwB;KACzB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAC1C,IAAA,mBAAU,EACR,IAAI,EACJ,yBAAyB,EACzB,CAAC,IAAoC,EAAE,EAAE;YACvC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;SAAM;QACL,IAAA,kBAAS,EAAC,IAAI,EAAE,yBAAyB,EAAE;YACzC,eAAe;SAChB,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAe,oBAAoB,CAAC,IAAU;;QAC5C,MAAM,sBAAsB,GAAG,MAAM,IAAA,4CAAiC,GAAE,CAAC;QACzE,IAAI,CAAC,sBAAsB,EAAE;YAC3B,IAAA,kBAAS,EAAC,IAAI,EAAE,aAAa,EAAE,wCAA4B,CAAC,CAAC;SAC9D;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACnC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,mBAAmB,CAAC,EACjD,GAAG,EACH,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CACvB,CAAC;SACH;IACH,CAAC;CAAA;AAED,SAAS,oBAAoB,CAAC,QAAa;IACzC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE;QACnC,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;KACrC;IACD,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IACvC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IAEvC,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/src/generators/setup-mfe/lib/add-remote-to-host.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from '@nrwl/devkit';
+import { Tree } from '@nrwl/devkit';
 import type { Schema } from '../schema';
 export declare function checkIsCommaNeeded(mfeRemoteText: string): boolean;
-export declare function addRemoteToHost(host: Tree, options: Schema): void;
+export declare function addRemoteToHost(tree: Tree, options: Schema): void;

package/src/generators/setup-mfe/lib/add-remote-to-host.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemoteToHost = exports.checkIsCommaNeeded = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const devkit_2 = require("@nrwl/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const ts = require("typescript");
+const ast_utils_2 = require("@nrwl/workspace/src/utilities/ast-utils");
 function checkIsCommaNeeded(mfeRemoteText) {
     const remoteText = mfeRemoteText.replace(/\s+/g, '');
     return !remoteText.endsWith(',]')
@@ -14,44 +16,68 @@ function checkIsCommaNeeded(mfeRemoteText) {
         : false;
 }
 exports.checkIsCommaNeeded = checkIsCommaNeeded;
-function addRemoteToHost(host, options) {
+function addRemoteToHost(tree, options) {
     if (options.mfeType === 'remote' && options.host) {
-        const hostProject = (0, devkit_1.readProjectConfiguration)(host, options.host);
-        const hostMfeConfigPath = (0, devkit_1.joinPathFragments)(hostProject.root, 'mfe.config.js');
-        if (!hostMfeConfigPath || !host.exists(hostMfeConfigPath)) {
-            throw new Error(`The selected host application, ${options.host}, does not contain a mfe.config.js. Are you sure it has been set up as a host application?`);
+        const hostProject = (0, devkit_2.readProjectConfiguration)(tree, options.host);
+        const pathToMfeManifest = (0, devkit_2.joinPathFragments)(hostProject.sourceRoot, 'assets/mfe.manifest.json');
+        const hostFederationType = determineHostFederationType(tree, pathToMfeManifest);
+        if (hostFederationType === 'static') {
+            addRemoteToStaticHost(tree, options, hostProject);
         }
-        const hostMFEConfig = host.read(hostMfeConfigPath, 'utf-8');
-        const webpackAst = tsquery_1.tsquery.ast(hostMFEConfig);
-        const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
-        const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
-        const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
-        const updatedConfig = `${hostMFEConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFEConfig.slice(endOfPropertiesPos)}`;
-        host.write(hostMfeConfigPath, updatedConfig);
-        const declarationFilePath = (0, devkit_1.joinPathFragments)(hostProject.sourceRoot, 'decl.d.ts');
-        const declarationFileContent = (host.exists(declarationFilePath)
-            ? host.read(declarationFilePath, 'utf-8')
+        else if (hostFederationType === 'dynamic') {
+            addRemoteToDynamicHost(tree, options, pathToMfeManifest);
+        }
+        const declarationFilePath = (0, devkit_2.joinPathFragments)(hostProject.sourceRoot, 'decl.d.ts');
+        const declarationFileContent = (tree.exists(declarationFilePath)
+            ? tree.read(declarationFilePath, 'utf-8')
             : '') + `\ndeclare module '${options.appName}/Module';`;
-        host.write(declarationFilePath, declarationFileContent);
-        addLazyLoadedRouteToHostAppModule(host, options);
+        tree.write(declarationFilePath, declarationFileContent);
+        addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
     }
 }
 exports.addRemoteToHost = addRemoteToHost;
+function determineHostFederationType(tree, pathToMfeManifest) {
+    return tree.exists(pathToMfeManifest) ? 'dynamic' : 'static';
+}
+function addRemoteToStaticHost(tree, options, hostProject) {
+    const hostMfeConfigPath = (0, devkit_2.joinPathFragments)(hostProject.root, 'mfe.config.js');
+    if (!hostMfeConfigPath || !tree.exists(hostMfeConfigPath)) {
+        throw new Error(`The selected host application, ${options.host}, does not contain a mfe.config.js or mfe.manifest.json file. Are you sure it has been set up as a host application?`);
+    }
+    const hostMFEConfig = tree.read(hostMfeConfigPath, 'utf-8');
+    const webpackAst = tsquery_1.tsquery.ast(hostMFEConfig);
+    const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
+    const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
+    const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
+    const updatedConfig = `${hostMFEConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFEConfig.slice(endOfPropertiesPos)}`;
+    tree.write(hostMfeConfigPath, updatedConfig);
+}
+function addRemoteToDynamicHost(tree, options, pathToMfeManifest) {
+    (0, devkit_1.updateJson)(tree, pathToMfeManifest, (manifest) => {
+        return Object.assign(Object.assign({}, manifest), { [options.appName]: `http://localhost:${options.port}` });
+    });
+}
 // TODO(colum): future work: allow dev to pass to path to routing module
-function addLazyLoadedRouteToHostAppModule(host, options) {
-    const hostAppConfig = (0, devkit_1.readProjectConfiguration)(host, options.host);
+function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
+    const hostAppConfig = (0, devkit_2.readProjectConfiguration)(tree, options.host);
     const pathToHostAppModule = `${hostAppConfig.sourceRoot}/app/app.module.ts`;
-    if (!host.exists(pathToHostAppModule)) {
+    if (!tree.exists(pathToHostAppModule)) {
         return;
     }
-    const hostAppModule = host.read(pathToHostAppModule, 'utf-8');
+    const hostAppModule = tree.read(pathToHostAppModule, 'utf-8');
     if (!hostAppModule.includes('RouterModule.forRoot(')) {
         return;
     }
     let sourceFile = ts.createSourceFile(pathToHostAppModule, hostAppModule, ts.ScriptTarget.Latest, true);
-    sourceFile = (0, ast_utils_1.addRoute)(host, pathToHostAppModule, sourceFile, `{
+    if (hostFederationType === 'dynamic') {
+        sourceFile = (0, ast_utils_2.insertImport)(tree, sourceFile, pathToHostAppModule, 'loadRemoteModule', '@nrwl/angular/mfe');
+    }
+    const routeToAdd = hostFederationType === 'dynamic'
+        ? `loadRemoteModule('${options.appName}', './Module')`
+        : `import('${options.appName}/Module')`;
+    sourceFile = (0, ast_utils_1.addRoute)(tree, pathToHostAppModule, sourceFile, `{
          path: '${options.appName}', 
-         loadChildren: () => import('${options.appName}/Module').then(m => m.RemoteEntryModule)
+         loadChildren: () => ${routeToAdd}.then(m => m.RemoteEntryModule)
      }`);
 }
 //# sourceMappingURL=add-remote-to-host.js.map

package/src/generators/setup-mfe/lib/add-remote-to-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}

package/src/generators/setup-mfe/lib/fix-bootstrap.d.ts

@@ -1,2 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
-export declare function fixBootstrap(host: Tree, appRoot: string): void;
+import type { Schema } from '../schema';
+export declare function fixBootstrap(tree: Tree, appRoot: string, options: Schema): void;

package/src/generators/setup-mfe/lib/fix-bootstrap.js

@@ -2,11 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixBootstrap = void 0;
 const devkit_1 = require("@nrwl/devkit");
-function fixBootstrap(host, appRoot) {
+function fixBootstrap(tree, appRoot, options) {
     const mainFilePath = (0, devkit_1.joinPathFragments)(appRoot, 'src/main.ts');
-    const bootstrapCode = host.read(mainFilePath, 'utf-8');
-    host.write((0, devkit_1.joinPathFragments)(appRoot, 'src/bootstrap.ts'), bootstrapCode);
-    host.write(mainFilePath, `import('./bootstrap').catch(err => console.error(err));`);
+    const bootstrapCode = tree.read(mainFilePath, 'utf-8');
+    tree.write((0, devkit_1.joinPathFragments)(appRoot, 'src/bootstrap.ts'), bootstrapCode);
+    const bootstrapImportCode = `import('./bootstrap').catch(err => console.error(err))`;
+    const fetchMfeManifestCode = `import { setRemoteDefinitions } from '@nrwl/angular/mfe';
+
+  fetch('/assets/mfe.manifest.json')
+  .then((res) => res.json())
+  .then(definitions => setRemoteDefinitions(definitions))
+  .then(() => ${bootstrapImportCode})`;
+    tree.write(mainFilePath, options.mfeType === 'host' && options.federationType === 'dynamic'
+        ? fetchMfeManifestCode
+        : bootstrapImportCode);
 }
 exports.fixBootstrap = fixBootstrap;
 //# sourceMappingURL=fix-bootstrap.js.map

package/src/generators/setup-mfe/lib/fix-bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-bootstrap.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/fix-bootstrap.ts"],"names":[],"mappings":";;;AAEA,yCAAiD;AAEjD,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAe;IACtD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,aAAa,CAAC,CAAC;IAE1E,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,yDAAyD,CAC1D,CAAC;AACJ,CAAC;AATD,oCASC"}
+{"version":3,"file":"fix-bootstrap.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/fix-bootstrap.ts"],"names":[],"mappings":";;;AAGA,yCAAiD;AAEjD,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;IACvE,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,aAAa,CAAC,CAAC;IAE1E,MAAM,mBAAmB,GAAG,wDAAwD,CAAC;IAErF,MAAM,oBAAoB,GAAG;;;;;gBAKf,mBAAmB,GAAG,CAAC;IAErC,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS;QAChE,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,mBAAmB,CACxB,CAAC;AACJ,CAAC;AApBD,oCAoBC"}

package/src/generators/setup-mfe/lib/index.d.ts

@@ -7,4 +7,5 @@ export * from './fix-bootstrap';
 export * from './generate-config';
 export * from './get-remotes-with-ports';
 export * from './set-tsconfig-target';
+export * from './setup-host-if-dynamic';
 export * from './setup-serve-target';

package/src/generators/setup-mfe/lib/index.js

@@ -10,5 +10,6 @@ tslib_1.__exportStar(require("./fix-bootstrap"), exports);
 tslib_1.__exportStar(require("./generate-config"), exports);
 tslib_1.__exportStar(require("./get-remotes-with-ports"), exports);
 tslib_1.__exportStar(require("./set-tsconfig-target"), exports);
+tslib_1.__exportStar(require("./setup-host-if-dynamic"), exports);
 tslib_1.__exportStar(require("./setup-serve-target"), exports);
 //# sourceMappingURL=index.js.map

package/src/generators/setup-mfe/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/index.ts"],"names":[],"mappings":";;;AAAA,mEAAyC;AACzC,6DAAmC;AACnC,8DAAoC;AACpC,+DAAqC;AACrC,gEAAsC;AACtC,0DAAgC;AAChC,4DAAkC;AAClC,mEAAyC;AACzC,gEAAsC;AACtC,+DAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/index.ts"],"names":[],"mappings":";;;AAAA,mEAAyC;AACzC,6DAAmC;AACnC,8DAAoC;AACpC,+DAAqC;AACrC,gEAAsC;AACtC,0DAAgC;AAChC,4DAAkC;AAClC,mEAAyC;AACzC,gEAAsC;AACtC,kEAAwC;AACxC,+DAAqC"}

package/src/generators/setup-mfe/lib/setup-host-if-dynamic.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function setupHostIfDynamic(tree: Tree, options: Schema): void;