@nrwl/angular 15.2.1 → 15.3.0-beta.0

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

@@ -1,4 +1,4 @@
-import type { Tree } from '@nrwl/devkit';
+import type { GeneratorCallback, Tree } from '@nrwl/devkit';
 import type { KarmaProjectOptions } from './schema';
-export declare function karmaProjectGenerator(tree: Tree, options: KarmaProjectOptions): Promise<void>;
+export declare function karmaProjectGenerator(tree: Tree, options: KarmaProjectOptions): Promise<GeneratorCallback>;
 export default karmaProjectGenerator;

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

@@ -10,7 +10,7 @@ const update_workspace_config_1 = require("./lib/update-workspace-config");
 const karma_1 = require("../karma/karma");
 function karmaProjectGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, karma_1.karmaGenerator)(tree, options);
+        const installTask = (0, karma_1.karmaGenerator)(tree, options);
         (0, check_test_target_1.checkProjectTestTarget)(tree, options.project);
         (0, generate_karma_project_files_1.generateKarmaProjectFiles)(tree, options.project);
         (0, update_tsconfig_1.updateTsConfigs)(tree, options.project);
@@ -18,6 +18,7 @@ function karmaProjectGenerator(tree, options) {
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
+        return installTask;
     });
 }
 exports.karmaProjectGenerator = karmaProjectGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAEtE,0CAAgD;AAEhD,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,IAAA,sBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAZD,sDAYC;AAED,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAEtE,0CAAgD;AAEhD,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAfD,sDAeC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/generators/karma-project/lib/generate-karma-project-files.js

@@ -4,12 +4,33 @@ exports.generateKarmaProjectFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function generateKarmaProjectFiles(tree, project) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), projectConfig.root, {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), projectConfig.root, {
         tmpl: '',
         projectRoot: projectConfig.root,
-        isLibrary: projectConfig.projectType === 'library',
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
     });
+    if (projectConfig.root === '' || projectConfig.root === '.') {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'root-project'), projectConfig.root, {
+            tmpl: '',
+            projectName: project,
+        });
+    }
+    else if (isWorkspaceWithProjectAtRoot(tree)) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'workspace-with-root-project'), projectConfig.root, {
+            tmpl: '',
+            projectRoot: projectConfig.root,
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        });
+    }
 }
 exports.generateKarmaProjectFiles = generateKarmaProjectFiles;
+function isWorkspaceWithProjectAtRoot(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [, project] of projects) {
+        if (project.root === '.' || project.root === '') {
+            return true;
+        }
+    }
+    return false;
+}
 //# sourceMappingURL=generate-karma-project-files.js.map

package/src/generators/karma-project/lib/generate-karma-project-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,SAAS,EAAE,aAAa,CAAC,WAAW,KAAK,SAAS;QAClD,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;AACJ,CAAC;AAbD,8DAaC"}
+{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAEtB,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,EAAE;QAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAC3D,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,OAAO;SACrB,CACF,CAAC;KACH;SAAM,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,6BAA6B,CAC9B,EACD,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa,CAAC,IAAI;YAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;SACnD,CACF,CAAC;KACH;AACH,CAAC;AAxCD,8DAwCC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE;YAC/C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/src/generators/karma-project/lib/update-tsconfig.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfigs = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function updateTsConfigs(tree, project) {
+    var _a, _b;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
         return Object.assign(Object.assign({}, json), { references: [
@@ -12,9 +13,22 @@ function updateTsConfigs(tree, project) {
                 },
             ] });
     });
-    const extraFiles = projectConfig.projectType === 'library' ? [] : ['src/polyfills.ts'];
-    return (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'), (json) => {
-        return Object.assign(Object.assign({}, json), { files: [...json.files, ...extraFiles] });
+    let extraFiles = [];
+    if (projectConfig.projectType == 'application' &&
+        ((_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.polyfills) &&
+        typeof projectConfig.targets.build.options.polyfills === 'string') {
+        let polyfillsPath = projectConfig.targets.build.options.polyfills;
+        polyfillsPath = polyfillsPath.startsWith(projectConfig.root)
+            ? polyfillsPath.replace(`${projectConfig.root}/`, '')
+            : polyfillsPath;
+        extraFiles = [polyfillsPath];
+    }
+    if (!extraFiles.length) {
+        return;
+    }
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'), (json) => {
+        var _a;
+        return Object.assign(Object.assign({}, json), { files: [...((_a = json.files) !== null && _a !== void 0 ? _a : []), ...extraFiles] });
     });
 }
 exports.updateTsConfigs = updateTsConfigs;

package/src/generators/karma-project/lib/update-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE9D,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;QACP,uCACK,IAAI,KACP,UAAU,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC1B;oBACE,IAAI,EAAE,sBAAsB;iBAC7B;aACF,IACD;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,UAAU,GACd,aAAa,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;IACtE,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;QACP,uCACK,IAAI,KACP,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,UAAU,CAAC,IACrC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE9D,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;QACP,uCACK,IAAI,KACP,UAAU,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC1B;oBACE,IAAI,EAAE,sBAAsB;iBAC7B;aACF,IACD;IACJ,CAAC,CACF,CAAC;IAEF,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IACE,aAAa,CAAC,WAAW,IAAI,aAAa;SAC1C,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,SAAS,CAAA;QAC/C,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EACjE;QACA,IAAI,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAClE,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC;YAC1D,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;YACrD,CAAC,CAAC,aAAa,CAAC;QAClB,UAAU,GAAG,CAAC,aAAa,CAAC,CAAC;KAC9B;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,OAAO;KACR;IAED,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;;QACP,uCACK,IAAI,KACP,KAAK,EAAE,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,KAAK,mCAAI,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,IAC7C;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AA9CD,0CA8CC"}

package/src/generators/karma-project/lib/update-workspace-config.js

@@ -3,17 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWorkspaceConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function updateWorkspaceConfig(tree, project) {
+    var _a, _b;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
     projectConfig.targets.test = {
         executor: '@angular-devkit/build-angular:karma',
         options: {
-            main: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'test.ts'),
             tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'),
             karmaConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'karma.conf.js'),
+            polyfills: ['zone.js', 'zone.js/testing'],
         },
     };
     if (projectConfig.projectType === 'application') {
-        projectConfig.targets.test.options = Object.assign(Object.assign({}, projectConfig.targets.test.options), { polyfills: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'polyfills.ts'), styles: [], scripts: [], assets: [] });
+        const polyfills = (_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.polyfills;
+        let polyfillsPath = polyfills && typeof polyfills === 'string' ? polyfills : undefined;
+        projectConfig.targets.test.options = Object.assign(Object.assign({}, projectConfig.targets.test.options), { polyfills: polyfillsPath !== null && polyfillsPath !== void 0 ? polyfillsPath : projectConfig.targets.test.options.polyfills, styles: [], scripts: [], assets: [] });
     }
     if (projectConfig.targets.lint &&
         projectConfig.targets.lint.executor ===

package/src/generators/karma-project/lib/update-workspace-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-workspace-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAe;IAC/D,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;QAC3B,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE;YACP,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;YACrE,WAAW,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC;SACpE;KACF,CAAC;IAEF,IAAI,aAAa,CAAC,WAAW,KAAK,aAAa,EAAE;QAC/C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,mCAC7B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,KACrC,SAAS,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,cAAc,CAAC,EACtE,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EACX,MAAM,EAAE,EAAE,GACX,CAAC;KACH;IAED,IACE,aAAa,CAAC,OAAO,CAAC,IAAI;QAC1B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;YACjC,sCAAsC,EACxC;QACA,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG;YAC5C,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC9C,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;SAC5D,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AAjCD,sDAiCC"}
+{"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-workspace-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAe;;IAC/D,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;QAC3B,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE;YACP,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;YACrE,WAAW,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC;YACnE,SAAS,EAAE,CAAC,SAAS,EAAE,iBAAiB,CAAC;SAC1C;KACF,CAAC;IAEF,IAAI,aAAa,CAAC,WAAW,KAAK,aAAa,EAAE;QAC/C,MAAM,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,SAAS,CAAC;QAClE,IAAI,aAAa,GACf,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QAErE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,mCAC7B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,KACrC,SAAS,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EACxE,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EACX,MAAM,EAAE,EAAE,GACX,CAAC;KACH;IAED,IACE,aAAa,CAAC,OAAO,CAAC,IAAI;QAC1B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;YACjC,sCAAsC,EACxC;QACA,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG;YAC5C,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC9C,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;SAC5D,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AArCD,sDAqCC"}

package/src/generators/library/lib/update-ng-package.js

@@ -6,7 +6,7 @@ function updateNgPackage(host, options) {
     if (!(options.publishable || options.buildable)) {
         return;
     }
-    const dest = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', (0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory);
+    const dest = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', options.projectRoot);
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/ng-package.json`, (json) => {
         let $schema = json.$schema;
         if (json.$schema && json.$schema.indexOf('node_modules') >= 0) {

package/src/generators/library/lib/update-ng-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/C,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,0BAAiB,EAC5B,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAClE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7D,OAAO,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CACvE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,EAAE,CAAC;SACL;QACD,uCACK,IAAI,KACP,IAAI;YACJ,OAAO,IACP;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA7BD,0CA6BC"}
+{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/C,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,0BAAiB,EAC5B,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,OAAO,CAAC,WAAW,CACpB,CAAC;IAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAClE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7D,OAAO,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CACvE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,EAAE,CAAC;SACL;QACD,uCACK,IAAI,KACP,IAAI;YACJ,OAAO,IACP;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,0CA4BC"}

package/src/generators/library/lib/update-tsconfig.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import type { Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from './normalized-schema';
 export declare function updateTsConfig(host: Tree, options: NormalizedSchema['libraryOptions']): void;

package/src/generators/library/lib/update-tsconfig.js

@@ -12,7 +12,7 @@ function updateRootConfig(host, options) {
             throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
         }
         c.paths[options.importPath] = [
-            (0, devkit_1.joinPathFragments)((0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory, '/src/index.ts'),
+            (0, devkit_1.joinPathFragments)(options.projectRoot, '/src/index.ts'),
         ];
         return json;
     });

package/src/generators/library/lib/update-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCAC9D,IAAI,KACP,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA6D;AAC7D,yEAAqF;AAGrF,SAAS,gBAAgB,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC;SACxD,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCAC9D,IAAI,KACP,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}

package/src/generators/remote/files/src/main.server.ts__tmpl__

@@ -0,0 +1,66 @@
+import 'zone.js/dist/zone-node';
+
+import { APP_BASE_HREF } from '@angular/common';
+import { ngExpressEngine } from '@nguniversal/express-engine';
+import * as express from 'express';
+import * as cors from 'cors';
+import { existsSync } from 'fs';
+import { join } from 'path';
+
+import { AppServerModule } from './bootstrap.server';
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app(): express.Express {
+  const server = express();
+  const browserBundles = join(process.cwd(), 'dist/apps/<%= appName %>/browser');
+  const serverBundles = join(process.cwd(), 'dist/apps/<%= appName %>/server');
+
+  server.use(cors());
+  const indexHtml = existsSync(join(browserBundles, 'index.original.html'))
+    ? 'index.original.html'
+    : 'index';
+
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
+  server.engine(
+    'html',
+    ngExpressEngine({
+      bootstrap: AppServerModule,
+    })
+  );
+
+  server.set('view engine', 'html');
+  server.set('views', browserBundles);
+
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  // serve static files
+  server.use('/', express.static(browserBundles, { maxAge: '1y' }));
+  server.use('/server', express.static(serverBundles, { maxAge: '1y' }));
+
+  // All regular routes use the Universal engine
+  server.get('*', (req, res) => {
+
+    res.render(indexHtml, {
+      req,
+      providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }],
+    });
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env['PORT'] || 4000;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+run();
+
+export * from './bootstrap.server';

package/src/generators/remote/files/webpack.server.config.js__tmpl__

@@ -0,0 +1,3 @@
+const { withModuleFederationForSSR } = require('@nrwl/angular/module-federation');
+const config = require('./module-federation.config');
+module.exports = withModuleFederationForSSR(config)

package/src/generators/remote/lib/add-ssr.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function addSsr(tree: Tree, options: Schema, appName: string): Promise<import("@nrwl/devkit").GeneratorCallback>;

package/src/generators/remote/lib/add-ssr.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addSsr = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
+const versions_1 = require("../../../utils/versions");
+function addSsr(tree, options, appName) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+        yield (0, setup_ssr_1.default)(tree, {
+            project: appName,
+        });
+        tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
+        tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files'), project.root, {
+            appName,
+            tmpl: '',
+        });
+        console.log('after generate files');
+        // update project.json
+        project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+        project.targets.server.executor = '@nrwl/angular:webpack-server';
+        project.targets.server.options.customWebpackConfig = {
+            path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
+        };
+        (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+            cors: versions_1.corsVersion,
+            express: versions_1.expressVersion,
+            '@module-federation/node': versions_1.moduleFederationNodeVersion,
+        }, {});
+        return installTask;
+    });
+}
+exports.addSsr = addSsr;
+//# sourceMappingURL=add-ssr.js.map

package/src/generators/remote/lib/add-ssr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAGtB,yDAAiD;AACjD,sDAIiC;AAEjC,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;;QACvE,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAEpC,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,8BAA8B,CAAC;QACjE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AA3CD,wBA2CC"}

package/src/generators/remote/lib/find-next-available-port.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function findNextAvailablePort(tree: Tree): number;

package/src/generators/remote/lib/find-next-available-port.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findNextAvailablePort = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const get_mf_projects_1 = require("../../../utils/get-mf-projects");
+function findNextAvailablePort(tree) {
+    var _a, _b, _c;
+    const mfProjects = (0, get_mf_projects_1.getMFProjects)(tree);
+    const ports = new Set([4200]);
+    for (const mfProject of mfProjects) {
+        const { targets } = (0, devkit_1.readProjectConfiguration)(tree, mfProject);
+        const port = (_c = (_b = (_a = targets === null || targets === void 0 ? void 0 : targets.serve) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200;
+        ports.add(port);
+    }
+    const nextAvailablePort = Math.max(...ports) + 1;
+    return nextAvailablePort;
+}
+exports.findNextAvailablePort = findNextAvailablePort;
+//# sourceMappingURL=find-next-available-port.js.map

package/src/generators/remote/lib/find-next-available-port.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-next-available-port.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/find-next-available-port.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,oEAA+D;AAE/D,SAAgB,qBAAqB,CAAC,IAAU;;IAC9C,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAEjD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAbD,sDAaC"}

package/src/generators/remote/lib/index.d.ts

@@ -0,0 +1,2 @@
+export * from './find-next-available-port';
+export * from './add-ssr';

package/src/generators/remote/lib/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./find-next-available-port"), exports);
+tslib_1.__exportStar(require("./add-ssr"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/remote/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/index.ts"],"names":[],"mappings":";;;AAAA,qEAA2C;AAC3C,oDAA0B"}

package/src/generators/remote/remote.d.ts

@@ -1,4 +1,4 @@
 import { Tree } from '@nrwl/devkit';
 import type { Schema } from './schema';
-export declare function remote(tree: Tree, options: Schema): Promise<() => void>;
+export declare function remote(tree: Tree, options: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
 export default remote;

package/src/generators/remote/remote.js

@@ -4,22 +4,11 @@ exports.remote = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const application_1 = require("../application/application");
-const get_mf_projects_1 = require("../../utils/get-mf-projects");
 const project_1 = require("../utils/project");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const test_runners_1 = require("../../utils/test-runners");
-function findNextAvailablePort(tree) {
-    var _a, _b, _c;
-    const mfProjects = (0, get_mf_projects_1.getMFProjects)(tree);
-    const ports = new Set([4200]);
-    for (const mfProject of mfProjects) {
-        const { targets } = (0, devkit_1.readProjectConfiguration)(tree, mfProject);
-        const port = (_c = (_b = (_a = targets === null || targets === void 0 ? void 0 : targets.serve) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200;
-        ports.add(port);
-    }
-    const nextAvailablePort = Math.max(...ports) + 1;
-    return nextAvailablePort;
-}
+const lib_1 = require("./lib");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 function remote(tree, options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -28,8 +17,8 @@ function remote(tree, options) {
             throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
         }
         const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
-        const port = (_a = options.port) !== null && _a !== void 0 ? _a : findNextAvailablePort(tree);
-        const installTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { routing: true, skipDefaultProject: true, port }));
+        const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
+        const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { routing: true, skipDefaultProject: true, port }));
         const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
         yield (0, setup_mf_1.setupMf)(tree, {
             appName,
@@ -43,66 +32,17 @@ function remote(tree, options) {
             e2eProjectName: skipE2E ? undefined : `${appName}-e2e`,
             standalone: options.standalone,
         });
-        removeDeadCode(tree, options);
+        let installTasks = [appInstallTask];
+        if (options.ssr) {
+            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, options, appName);
+            installTasks.push(ssrInstallTask);
+        }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return installTask;
+        return (0, run_tasks_in_serial_1.runTasksInSerial)(...installTasks);
     });
 }
 exports.remote = remote;
-function removeDeadCode(tree, options) {
-    var _a;
-    const projectName = (0, project_1.normalizeProjectName)(options.name, options.directory);
-    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    ['css', 'less', 'scss', 'sass'].forEach((style) => {
-        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/app.component.${style}`);
-        if (tree.exists(pathToComponentStyle)) {
-            tree.delete(pathToComponentStyle);
-        }
-    });
-    tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/nx-welcome.component.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/remote-entry/nx-welcome.component.ts'));
-    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.spec.ts'));
-    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.html'));
-    const pathToAppComponent = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.ts');
-    if (!options.standalone) {
-        const component = tree
-            .read(pathToAppComponent, 'utf-8')
-            .split(options.inlineTemplate ? 'template' : 'templateUrl')[0] +
-            `template: '<router-outlet></router-outlet>'
-
-})
-export class AppComponent {}`;
-        tree.write(pathToAppComponent, component);
-        tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts'), `import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
-import { AppComponent } from './app.component';
-
-@NgModule({
- declarations: [AppComponent],
- imports: [
-   BrowserModule,
-   RouterModule.forRoot([{
-     path: '',
-     loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule)
-   }], { initialNavigation: 'enabledBlocking' }),
- ],
- providers: [],
- bootstrap: [AppComponent],
-})
-export class AppModule {}`);
-    }
-    else {
-        tree.delete(pathToAppComponent);
-        const prefix = (_a = options.prefix) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).npmScope;
-        const remoteEntrySelector = `${prefix}-${projectName}-entry`;
-        const pathToIndexHtml = project.targets.build.options.index;
-        const indexContents = tree.read(pathToIndexHtml, 'utf-8');
-        const rootSelectorRegex = new RegExp(`${prefix}-root`, 'ig');
-        const newIndexContents = indexContents.replace(rootSelectorRegex, remoteEntrySelector);
-        tree.write(pathToIndexHtml, newIndexContents);
-    }
-}
 exports.default = remote;
 //# sourceMappingURL=remote.js.map

package/src/generators/remote/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAA8D;AAE9D,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AACtD,2FAAqF;AAErF,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,OAAO,EAAE,IAAI,EACb,kBAAkB,EAAE,IAAI,EACxB,IAAI,IACJ,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AA7CD,wBA6CC;AAED,kBAAe,MAAM,CAAC"}

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

@@ -25,4 +25,5 @@ export interface Schema {
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';
   skipFormat?: boolean;
   standalone?: boolean;
+  ssr?: boolean;
 }

package/src/generators/remote/schema.json

@@ -149,6 +149,11 @@
       "description": "Whether to generate a remote application with standalone components.",
       "type": "boolean",
       "default": false
+    },
+    "ssr": {
+      "description": "Whether to configure SSR for the remote application to be consumed by a host application using SSR.",
+      "type": "boolean",
+      "default": false
     }
   },
   "additionalProperties": false,

package/src/generators/setup-mf/lib/add-remote-entry.js

@@ -4,31 +4,29 @@ exports.addRemoteEntry = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function addRemoteEntry(tree, { appName, routing, mfType, prefix, standalone }, appRoot) {
-    if (mfType === 'remote') {
-        prefix = prefix !== null && prefix !== void 0 ? prefix : (0, devkit_1.readWorkspaceConfiguration)(tree).npmScope;
-        (0, devkit_1.generateFiles)(tree, standalone
-            ? (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-entry-component-files')
-            : (0, devkit_1.joinPathFragments)(__dirname, '../files/entry-module-files'), `${appRoot}/src/app/remote-entry`, {
-            tmpl: '',
-            appName,
-            routing,
-            prefix,
-        });
-        if (standalone && routing) {
-            (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.routes').then(m => m.remoteRoutes)}`);
+    prefix = prefix !== null && prefix !== void 0 ? prefix : (0, devkit_1.readWorkspaceConfiguration)(tree).npmScope;
+    (0, devkit_1.generateFiles)(tree, standalone
+        ? (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-entry-component-files')
+        : (0, devkit_1.joinPathFragments)(__dirname, '../files/entry-module-files'), `${appRoot}/src/app/remote-entry`, {
+        tmpl: '',
+        appName,
+        routing,
+        prefix,
+    });
+    if (standalone && routing) {
+        (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.routes').then(m => m.remoteRoutes)}`);
+    }
+    else {
+        if (routing) {
+            (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule)}`);
         }
-        else {
-            if (routing) {
-                (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule)}`);
-            }
-            tree.write(`${appRoot}/src/app/app.module.ts`, `/* 
+        tree.write(`${appRoot}/src/app/app.module.ts`, `/* 
       * This RemoteEntryModule is imported here to allow TS to find the Module during 
       * compilation, allowing it to be included in the built bundle. This is required 
       * for the Module Federation Plugin to expose the Module correctly.
       * */
       import { RemoteEntryModule } from './remote-entry/entry.module';
 ${tree.read(`${appRoot}/src/app/app.module.ts`, 'utf-8')}`);
-        }
     }
 }
 exports.addRemoteEntry = addRemoteEntry;

package/src/generators/setup-mf/lib/add-remote-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,sEAAgE;AAEhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAU,EACxD,OAAe;IAEf,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC7D,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;YACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;YACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,OAAO;YACP,MAAM;SACP,CACF,CAAC;QAEF,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;SACH;aAAM;YACL,IAAI,OAAO,EAAE;gBACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;aACH;YAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMN,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACnD,CAAC;SACH;KACF;AACH,CAAC;AAnDD,wCAmDC"}
+{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,sEAAgE;AAEhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAU,EACxD,OAAe;IAEf,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC7D,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;QACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;QACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;QACE,IAAI,EAAE,EAAE;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP,CACF,CAAC;IAEF,IAAI,UAAU,IAAI,OAAO,EAAE;QACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;KACH;SAAM;QACL,IAAI,OAAO,EAAE;YACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AAjDD,wCAiDC"}

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

@@ -16,7 +16,7 @@ function checkIsCommaNeeded(mfRemoteText) {
 }
 exports.checkIsCommaNeeded = checkIsCommaNeeded;
 function addRemoteToHost(tree, options) {
-    if (options.mfType === 'remote' && options.host) {
+    if (options.host) {
         const hostProject = (0, devkit_1.readProjectConfiguration)(tree, options.host);
         const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostProject.sourceRoot, 'assets/module-federation.manifest.json');
         const hostFederationType = determineHostFederationType(tree, pathToMFManifest);