@nx/angular 19.5.0-canary.20240710-2b7b523 → 19.5.0-canary.20240712-0b0db78

package/src/generators/scam/lib/normalize-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
+exports.normalizeOptions = normalizeOptions;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
@@ -30,4 +30,3 @@ async function normalizeOptions(tree, options) {
         projectName,
     };
 }
-exports.normalizeOptions = normalizeOptions;

package/src/generators/scam/scam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scamGenerator = void 0;
+exports.scamGenerator = scamGenerator;
 const devkit_1 = require("@nx/devkit");
 const component_1 = require("../component/component");
 const export_scam_1 = require("../utils/export-scam");
@@ -22,5 +22,4 @@ async function scamGenerator(tree, rawOptions) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.scamGenerator = scamGenerator;
 exports.default = scamGenerator;

package/src/generators/scam-directive/lib/convert-directive-to-scam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertDirectiveToScam = void 0;
+exports.convertDirectiveToScam = convertDirectiveToScam;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -25,7 +25,6 @@ function convertDirectiveToScam(tree, options) {
     const scamFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${options.name}.module.ts`);
     tree.write(scamFilePath, getModuleFileContent(options.symbolName, options.fileName));
 }
-exports.convertDirectiveToScam = convertDirectiveToScam;
 function getModuleFileContent(directiveClassName, directiveFileName) {
     return `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';

package/src/generators/scam-directive/lib/normalize-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
+exports.normalizeOptions = normalizeOptions;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
@@ -29,4 +29,3 @@ async function normalizeOptions(tree, options) {
         projectName,
     };
 }
-exports.normalizeOptions = normalizeOptions;

package/src/generators/scam-directive/scam-directive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scamDirectiveGenerator = void 0;
+exports.scamDirectiveGenerator = scamDirectiveGenerator;
 const devkit_1 = require("@nx/devkit");
 const directive_1 = require("../directive/directive");
 const export_scam_1 = require("../utils/export-scam");
@@ -22,5 +22,4 @@ async function scamDirectiveGenerator(tree, rawOptions) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.scamDirectiveGenerator = scamDirectiveGenerator;
 exports.default = scamDirectiveGenerator;

package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertPipeToScam = void 0;
+exports.convertPipeToScam = convertPipeToScam;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -25,7 +25,6 @@ function convertPipeToScam(tree, options) {
     const scamFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${options.name}.module.ts`);
     tree.write(scamFilePath, getModuleFileContent(options.symbolName, options.fileName));
 }
-exports.convertPipeToScam = convertPipeToScam;
 function getModuleFileContent(pipeClassName, pipeFileName) {
     return `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';

package/src/generators/scam-pipe/lib/normalize-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
+exports.normalizeOptions = normalizeOptions;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
@@ -29,4 +29,3 @@ async function normalizeOptions(tree, options) {
         projectName,
     };
 }
-exports.normalizeOptions = normalizeOptions;

package/src/generators/scam-pipe/scam-pipe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scamPipeGenerator = void 0;
+exports.scamPipeGenerator = scamPipeGenerator;
 const devkit_1 = require("@nx/devkit");
 const pipe_1 = require("../pipe/pipe");
 const export_scam_1 = require("../utils/export-scam");
@@ -22,5 +22,4 @@ async function scamPipeGenerator(tree, rawOptions) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.scamPipeGenerator = scamPipeGenerator;
 exports.default = scamPipeGenerator;

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertScamToStandalone = void 0;
+exports.convertScamToStandalone = convertScamToStandalone;
 const path_1 = require("path");
 const path_2 = require("nx/src/utils/path");
 function convertScamToStandalone(componentAST, componentFileContents, importsArray, providersArray, moduleNodes, tree, normalizedComponentPath, componentName) {
@@ -30,4 +30,3 @@ function convertScamToStandalone(componentAST, componentFileContents, importsArr
         }
     }
 }
-exports.convertScamToStandalone = convertScamToStandalone;

package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getComponentDataFromAST = void 0;
+exports.getComponentDataFromAST = getComponentDataFromAST;
 function getComponentDataFromAST(tree, normalizedComponentPath) {
     const COMPONENT_CONTENT_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]))';
     const COMPONENT_NAME_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component])) > Identifier';
@@ -15,4 +15,3 @@ function getComponentDataFromAST(tree, normalizedComponentPath) {
     const componentName = componentNameNode.getText();
     return { componentFileContents, componentAST, componentName };
 }
-exports.getComponentDataFromAST = getComponentDataFromAST;

package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getModuleMetadataFromAST = void 0;
+exports.getModuleMetadataFromAST = getModuleMetadataFromAST;
 function getModuleMetadataFromAST(componentAST, componentFileContents) {
     const NGMODULE_CONTENT_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=NgModule]))';
     const { tsquery } = require('@phenomnomnominal/tsquery');
@@ -61,4 +61,3 @@ function getModuleMetadataFromAST(componentAST, componentFileContents) {
         moduleName,
     };
 }
-exports.getModuleMetadataFromAST = getModuleMetadataFromAST;

package/src/generators/scam-to-standalone/lib/get-target-project.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetProject = void 0;
+exports.getTargetProject = getTargetProject;
 function getTargetProject(projectName, projects) {
     let project;
     if (projectName && !projects.has(projectName)) {
@@ -11,4 +11,3 @@ function getTargetProject(projectName, projects) {
     }
     return project;
 }
-exports.getTargetProject = getTargetProject;

package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceModuleUsagesWithComponent = void 0;
+exports.replaceModuleUsagesWithComponent = replaceModuleUsagesWithComponent;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function replaceModuleUsagesWithComponent(tree, moduleName, componentName) {
@@ -16,4 +16,3 @@ function replaceModuleUsagesWithComponent(tree, moduleName, componentName) {
         }
     });
 }
-exports.replaceModuleUsagesWithComponent = replaceModuleUsagesWithComponent;

package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectorExistsInAST = void 0;
+exports.selectorExistsInAST = selectorExistsInAST;
 function selectorExistsInAST(selector, ast) {
     const { tsquery } = require('@phenomnomnominal/tsquery');
     return tsquery(ast, selector, { visitAllChildren: true }).length > 0;
 }
-exports.selectorExistsInAST = selectorExistsInAST;

package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyIsInlineScam = void 0;
+exports.verifyIsInlineScam = verifyIsInlineScam;
 const selector_exists_in_ast_1 = require("./selector-exists-in-ast");
 function verifyIsInlineScam(componentAST) {
     const NGMODULE_DECORATOR_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule])';
@@ -8,4 +8,3 @@ function verifyIsInlineScam(componentAST) {
     return ((0, selector_exists_in_ast_1.selectorExistsInAST)(COMPONENT_DECORATOR_SELECTOR, componentAST) &&
         (0, selector_exists_in_ast_1.selectorExistsInAST)(NGMODULE_DECORATOR_SELECTOR, componentAST));
 }
-exports.verifyIsInlineScam = verifyIsInlineScam;

package/src/generators/scam-to-standalone/lib/verify-module-is-scam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyModuleIsScam = void 0;
+exports.verifyModuleIsScam = verifyModuleIsScam;
 function verifyModuleIsScam(exportsArray, componentName, declarationsArray) {
     // Check exports has 1 export and check export exists in declaration and is the same as the component name
     if (exportsArray.length !== 1 &&
@@ -9,4 +9,3 @@ function verifyModuleIsScam(exportsArray, componentName, declarationsArray) {
         throw new Error(`The NgModule is not a SCAM. Please ensure the NgModule only contains one export and that the component is both declared and exported from the NgModule.`);
     }
 }
-exports.verifyModuleIsScam = verifyModuleIsScam;

package/src/generators/scam-to-standalone/scam-to-standalone.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scamToStandalone = void 0;
+exports.scamToStandalone = scamToStandalone;
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 async function scamToStandalone(tree, { component, project: projectName, skipFormat }) {
@@ -23,5 +23,4 @@ async function scamToStandalone(tree, { component, project: projectName, skipFor
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.scamToStandalone = scamToStandalone;
 exports.default = scamToStandalone;

package/src/generators/setup-mf/files/host-files/app.component.spec.ts__tmpl__

@@ -1,16 +1,19 @@
 import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { AppComponent } from './app.component';
-import { NxWelcomeComponent } from './nx-welcome.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Router } from '@angular/router';
+import { NxWelcomeComponent } from './nx-welcome.component';<% if(useRouterTestingModule) { %>
+import { RouterTestingModule } from '@angular/router/testing';<% } %>
+import { Router<% if(!useRouterTestingModule) { %>, RouterModule<% } %> } from '@angular/router';
 
 describe('AppComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
+      imports: [<% if(useRouterTestingModule) { %>
         RouterTestingModule.withRoutes([
           { path: '', component: NxWelcomeComponent },
-        ]),<% if (standalone) { %>
+        ]),<% } %><% if(!useRouterTestingModule) { %>
+        RouterModule.forRoot([
+          { path: '', component: NxWelcomeComponent },
+        ]),<% } %><% if (standalone) { %>
         AppComponent,
         NxWelcomeComponent,<% } %>
       ],<% if (!standalone) { %>

package/src/generators/setup-mf/lib/add-cypress-workaround.js

@@ -3,7 +3,7 @@
 // as Angular attempt to figure out how to fix HMR when styles.js
 // is attached to the index.html with type=module
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addCypressOnErrorWorkaround = void 0;
+exports.addCypressOnErrorWorkaround = addCypressOnErrorWorkaround;
 const devkit_1 = require("@nx/devkit");
 function addCypressOnErrorWorkaround(tree, schema) {
     if (!schema.e2eProjectName) {
@@ -49,4 +49,3 @@ function addCypressOnErrorWorkaround(tree, schema) {
         : '';
     tree.write(pathToCommandsFile, `${commandsContent}\n${commandToAdd}`);
 }
-exports.addCypressOnErrorWorkaround = addCypressOnErrorWorkaround;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addRemoteEntry = void 0;
+exports.addRemoteEntry = addRemoteEntry;
 const devkit_1 = require("@nx/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function addRemoteEntry(tree, { appName, routing, prefix, standalone }, appRoot) {
@@ -19,4 +19,3 @@ function addRemoteEntry(tree, { appName, routing, prefix, standalone }, appRoot)
         (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) }`);
     }
 }
-exports.addRemoteEntry = addRemoteEntry;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addRemoteToHost = exports.checkIsCommaNeeded = void 0;
+exports.checkIsCommaNeeded = checkIsCommaNeeded;
+exports.addRemoteToHost = addRemoteToHost;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
@@ -14,7 +15,6 @@ function checkIsCommaNeeded(mfRemoteText) {
             : true
         : false;
 }
-exports.checkIsCommaNeeded = checkIsCommaNeeded;
 function addRemoteToHost(tree, options) {
     if (options.host) {
         const hostProject = (0, devkit_1.readProjectConfiguration)(tree, options.host);
@@ -30,7 +30,6 @@ function addRemoteToHost(tree, options) {
         addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
     }
 }
-exports.addRemoteToHost = addRemoteToHost;
 function getDynamicManifestFile(tree, project) {
     // {sourceRoot}/assets/module-federation.manifest.json was the generated
     // path for the manifest file in the past. We now generate the manifest
@@ -53,7 +52,7 @@ function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript
     const hostMFConfig = tree.read(hostMFConfigPath, 'utf-8');
     const { tsquery } = require('@phenomnomnominal/tsquery');
     const webpackAst = tsquery.ast(hostMFConfig);
-    const mfRemotesNode = tsquery(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
+    const mfRemotesNode = tsquery(webpackAst, 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=remotes]) > ArrayLiteralExpression', { visitAllChildren: true })[0];
     const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
     const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
     const updatedConfig = `${hostMFConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFConfig.slice(endOfPropertiesPos)}`;

package/src/generators/setup-mf/lib/change-build-target.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeBuildTarget = void 0;
+exports.changeBuildTarget = changeBuildTarget;
 const devkit_1 = require("@nx/devkit");
 function changeBuildTarget(host, options) {
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
@@ -20,4 +20,3 @@ function changeBuildTarget(host, options) {
     };
     (0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
 }
-exports.changeBuildTarget = changeBuildTarget;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixBootstrap = void 0;
+exports.fixBootstrap = fixBootstrap;
 const devkit_1 = require("@nx/devkit");
 function fixBootstrap(tree, appRoot, options) {
     const mainFilePath = (0, devkit_1.joinPathFragments)(appRoot, 'src/main.ts');
@@ -29,7 +29,6 @@ fetch('${manifestPath}')
         tree.write(mainFilePath, fetchMFManifestCode);
     }
 }
-exports.fixBootstrap = fixBootstrap;
 const standaloneBootstrapCode = () => `import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { RemoteEntryComponent } from './app/remote-entry/entry.component';

package/src/generators/setup-mf/lib/generate-config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateWebpackConfig = void 0;
+exports.generateWebpackConfig = generateWebpackConfig;
 const devkit_1 = require("@nx/devkit");
 function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
     if (tree.exists(`${appRoot}/module-federation.config.js`) ||
@@ -28,4 +28,3 @@ function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
         tree.delete((0, devkit_1.joinPathFragments)(appRoot, 'tsconfig.lint.json'));
     }
 }
-exports.generateWebpackConfig = generateWebpackConfig;

package/src/generators/setup-mf/lib/get-remotes-with-ports.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemotesWithPorts = void 0;
+exports.getRemotesWithPorts = getRemotesWithPorts;
 const devkit_1 = require("@nx/devkit");
 function getRemotesWithPorts(host, options) {
     // If type is host and remotes supplied, check remotes exist
@@ -18,4 +18,3 @@ function getRemotesWithPorts(host, options) {
     }
     return remotesWithPort;
 }
-exports.getRemotesWithPorts = getRemotesWithPorts;

package/src/generators/setup-mf/lib/normalize-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
+exports.normalizeOptions = normalizeOptions;
 const project_1 = require("../../utils/project");
 function normalizeOptions(tree, options) {
     return {
@@ -11,4 +11,3 @@ function normalizeOptions(tree, options) {
         standalone: options.standalone ?? true,
     };
 }
-exports.normalizeOptions = normalizeOptions;

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeDeadCodeFromRemote = void 0;
+exports.removeDeadCodeFromRemote = removeDeadCodeFromRemote;
 const devkit_1 = require("@nx/devkit");
 function removeDeadCodeFromRemote(tree, options) {
     const projectName = options.appName;
@@ -53,4 +53,3 @@ export class AppModule {}`);
         tree.write(pathToIndexHtml, newIndexContents);
     }
 }
-exports.removeDeadCodeFromRemote = removeDeadCodeFromRemote;

package/src/generators/setup-mf/lib/setup-host-if-dynamic.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupHostIfDynamic = void 0;
+exports.setupHostIfDynamic = setupHostIfDynamic;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../utils/version-utils");
 function setupHostIfDynamic(tree, options) {
@@ -22,4 +22,3 @@ function setupHostIfDynamic(tree, options) {
     delete project.targets.build.configurations.production?.customWebpackConfig;
     (0, devkit_1.updateProjectConfiguration)(tree, options.appName, project);
 }
-exports.setupHostIfDynamic = setupHostIfDynamic;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupServeTarget = void 0;
+exports.setupServeTarget = setupServeTarget;
 const devkit_1 = require("@nx/devkit");
 function setupServeTarget(host, options) {
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
@@ -36,4 +36,3 @@ function setupServeTarget(host, options) {
     }
     (0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
 }
-exports.setupServeTarget = setupServeTarget;

package/src/generators/setup-mf/lib/setup-tspath-for-remote.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupTspathForRemote = void 0;
+exports.setupTspathForRemote = setupTspathForRemote;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 function setupTspathForRemote(tree, options) {
@@ -13,4 +13,3 @@ function setupTspathForRemote(tree, options) {
         (0, devkit_1.joinPathFragments)(project.root, exportPath),
     ]);
 }
-exports.setupTspathForRemote = setupTspathForRemote;

package/src/generators/setup-mf/lib/update-host-app-routes.d.ts

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

package/src/generators/setup-mf/lib/update-host-app-routes.js

@@ -1,16 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateHostAppRoutes = void 0;
-const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
+exports.updateHostAppRoutes = updateHostAppRoutes;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
-let tsModule;
+const version_utils_1 = require("../../utils/version-utils");
 function updateHostAppRoutes(tree, options) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const { sourceRoot } = (0, project_configuration_1.readProjectConfiguration)(tree, options.appName);
+    const { sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     tree.write((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.component.html'), `<ul class="remote-menu">
 <li><a routerLink="/">Home</a></li>
 </ul>
@@ -22,17 +17,17 @@ function updateHostAppRoutes(tree, options) {
         pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-routing.module.ts');
         hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
     }
-    let sourceFile = tsModule.createSourceFile(pathToHostRootRoutingFile, hostRootRoutingFile, tsModule.ScriptTarget.Latest, true);
     (0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
       path: '',
       component: NxWelcomeComponent
     }`);
     tree.write(pathToHostRootRoutingFile, `import { NxWelcomeComponent } from './nx-welcome.component';
 ${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/host-files'), (0, devkit_1.joinPathFragments)(sourceRoot, 'app'), {
         appName: options.appName,
         standalone: options.standalone,
+        useRouterTestingModule: angularMajorVersion < 18,
         tmpl: '',
     });
 }
-exports.updateHostAppRoutes = updateHostAppRoutes;

package/src/generators/setup-mf/lib/update-tsconfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTsConfig = void 0;
+exports.updateTsConfig = updateTsConfig;
 const devkit_1 = require("@nx/devkit");
 function updateTsConfig(tree, schema) {
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.appName);
@@ -16,4 +16,3 @@ function updateTsConfig(tree, schema) {
         return json;
     });
 }
-exports.updateTsConfig = updateTsConfig;

package/src/generators/setup-mf/setup-mf.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupMf = void 0;
+exports.setupMf = setupMf;
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const versions_1 = require("../../utils/versions");
@@ -59,5 +59,4 @@ async function setupMf(tree, rawOptions) {
     }
     return installTask;
 }
-exports.setupMf = setupMf;
 exports.default = setupMf;

package/src/generators/setup-ssr/lib/add-dependencies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDependencies = void 0;
+exports.addDependencies = addDependencies;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
@@ -34,4 +34,3 @@ function addDependencies(tree, isUsingApplicationBuilder) {
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
 }
-exports.addDependencies = addDependencies;

package/src/generators/setup-ssr/lib/add-hydration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addHydration = void 0;
+exports.addHydration = addHydration;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -33,4 +33,3 @@ function addHydration(tree, options) {
         (0, ast_utils_1.addProviderToModule)(tree, sourceFile, pathToClientConfigFile, 'provideClientHydration()');
     }
 }
-exports.addHydration = addHydration;

package/src/generators/setup-ssr/lib/add-server-file.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addServerFile = void 0;
+exports.addServerFile = addServerFile;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
@@ -18,7 +18,6 @@ function addServerFile(tree, schema, isUsingApplicationBuilder) {
             ? ['server-builder', 'v17+']
             : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
 }
-exports.addServerFile = addServerFile;
 function getApplicationBuilderBrowserOutputPath(outputPath) {
     if (outputPath) {
         if (typeof outputPath === 'string') {

package/src/generators/setup-ssr/lib/generate-files.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSSRFiles = void 0;
+exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
 function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
     const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
@@ -17,4 +17,3 @@ function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule'), projectRoot, { ...schema, tpl: '' });
     }
 }
-exports.generateSSRFiles = generateSSRFiles;

package/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTsConfigServerJsonForBrowserBuilder = exports.setServerTsConfigOptionsForApplicationBuilder = void 0;
+exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
+exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
@@ -18,7 +19,6 @@ function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
         return json;
     });
 }
-exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
 function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '..', 'files', 'root'), root, {
@@ -26,4 +26,3 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
         tpl: '',
     });
 }
-exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
+exports.normalizeOptions = normalizeOptions;
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const version_utils_1 = require("../../utils/version-utils");
 function normalizeOptions(tree, options) {
@@ -23,4 +23,3 @@ function normalizeOptions(tree, options) {
         hydration,
     };
 }
-exports.normalizeOptions = normalizeOptions;