@nx/angular 21.3.0-beta.5 → 21.3.0-canary.20250613-18155f4

package/src/generators/ngrx/files/__directory__/__fileName__.facade.spec.ts__tmpl__

@@ -2,11 +2,7 @@ import { NgModule } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
-<%_ if (isRxJs7) { _%>
-import { firstValueFrom } from 'rxjs';
-<%_ } else { _%>
-import { first } from 'rxjs/operators';
-<%_ } _%>
+import { readFirst } from '@nx/angular/testing';
 
 import * as <%= className %>Actions from './<%= fileName %>.actions';
 import { <%= className %>Effects } from './<%= fileName %>.effects';
@@ -61,16 +57,16 @@ describe('<%= className %>Facade', () => {
      * The initially generated facade::loadAll() returns empty array
      */
     it('loadAll() should return empty list with loaded == true', async () => {
-      let list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      let isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      let list = await readFirst(facade.all<%= className %>$);
+      let isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
 
       facade.init();
 
-      list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      list = await readFirst(facade.all<%= className %>$);
+      isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(true);
@@ -80,8 +76,8 @@ describe('<%= className %>Facade', () => {
      * Use `load<%= className %>Success` to manually update list
      */
     it('all<%= className %>$ should return the loaded list; and loaded flag == true', async () => {
-      let list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      let isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      let list = await readFirst(facade.all<%= className %>$);
+      let isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
@@ -93,8 +89,8 @@ describe('<%= className %>Facade', () => {
         ]})
       );
 
-      list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      list = await readFirst(facade.all<%= className %>$);
+      isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(2);
       expect(isLoaded).toBe(true);

package/src/generators/ngrx/lib/generate-files.js

@@ -13,7 +13,6 @@ function generateNgrxFilesFromTemplates(tree, options) {
         ...options,
         ...projectNames,
         importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'),
-        isRxJs7: options.rxjsMajorVersion >= 7,
         tmpl: '',
     });
     if (!options.facade) {

package/src/generators/ngrx/lib/normalize-options.d.ts

@@ -3,6 +3,5 @@ import type { NgRxGeneratorOptions } from '../schema';
 export type NormalizedNgRxGeneratorOptions = NgRxGeneratorOptions & {
     parentDirectory: string;
     rxjsVersion: string;
-    rxjsMajorVersion: number;
 };
 export declare function normalizeOptions(tree: Tree, options: NgRxGeneratorOptions): NormalizedNgRxGeneratorOptions;

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

@@ -4,7 +4,6 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const path_1 = require("path");
-const semver_2 = require("semver");
 const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
@@ -14,7 +13,6 @@ function normalizeOptions(tree, options) {
     catch {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
-    const rxjsMajorVersion = (0, semver_2.major)(rxjsVersion);
     return {
         ...options,
         parentDirectory: options.module
@@ -25,6 +23,5 @@ function normalizeOptions(tree, options) {
         route: options.route === '' ? `''` : options.route ?? `''`,
         directory: (0, devkit_1.names)(options.directory).fileName,
         rxjsVersion,
-        rxjsMajorVersion,
     };
 }

package/src/generators/ngrx-feature-store/files/__directory__/__fileName__.facade.spec.ts__tmpl__

@@ -2,11 +2,7 @@ import { NgModule } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
-<%_ if (isRxJs7) { _%>
-import { firstValueFrom } from 'rxjs';
-<%_ } else { _%>
-import { first } from 'rxjs/operators';
-<%_ } _%>
+import { readFirst } from '@nx/angular/testing';
 
 import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
 import { <%= className %>Effects } from './<%= relativeFileName %>.effects';
@@ -61,16 +57,16 @@ describe('<%= className %>Facade', () => {
      * The initially generated facade::loadAll() returns empty array
      */
     it('loadAll() should return empty list with loaded == true', async () => {
-      let list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      let isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      let list = await readFirst(facade.all<%= className %>$);
+      let isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
 
       facade.init();
 
-      list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      list = await readFirst(facade.all<%= className %>$);
+      isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(true);
@@ -80,8 +76,8 @@ describe('<%= className %>Facade', () => {
      * Use `load<%= className %>Success` to manually update list
      */
     it('all<%= className %>$ should return the loaded list; and loaded flag == true', async () => {
-      let list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      let isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      let list = await readFirst(facade.all<%= className %>$);
+      let isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
@@ -93,8 +89,8 @@ describe('<%= className %>Facade', () => {
         ]})
       );
 
-      list = await <% if (isRxJs7) { %>firstValueFrom(facade.all<%= className %>$)<% } else { %>facade.all<%= className %>$.pipe(first()).toPromise()<% } %>;
-      isLoaded = await <% if (isRxJs7) { %>firstValueFrom(facade.loaded$)<% } else { %>facade.loaded$.pipe(first()).toPromise()<% } %>;
+      list = await readFirst(facade.all<%= className %>$);
+      isLoaded = await readFirst(facade.loaded$);
 
       expect(list.length).toBe(2);
       expect(isLoaded).toBe(true);

package/src/generators/ngrx-feature-store/lib/generate-files.js

@@ -14,7 +14,6 @@ function generateFilesFromTemplates(tree, options) {
         fileName,
         relativeFileName: projectNames.fileName,
         importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'),
-        isRxJs7: options.rxjsMajorVersion >= 7,
         tmpl: '',
     });
     if (!options.facade) {

package/src/generators/ngrx-feature-store/lib/normalize-options.d.ts

@@ -4,6 +4,5 @@ export type NormalizedNgRxFeatureStoreGeneratorOptions = Schema & {
     parentDirectory: string;
     subdirectory: string;
     rxjsVersion: string;
-    rxjsMajorVersion: number;
 };
 export declare function normalizeOptions(tree: Tree, options: Schema): NormalizedNgRxFeatureStoreGeneratorOptions;

package/src/generators/ngrx-feature-store/lib/normalize-options.js

@@ -4,7 +4,6 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const path_1 = require("path");
-const semver_2 = require("semver");
 const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
@@ -14,7 +13,6 @@ function normalizeOptions(tree, options) {
     catch {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
-    const rxjsMajorVersion = (0, semver_2.major)(rxjsVersion);
     const { subdirectory, name } = determineSubdirectoryAndName(options.name);
     return {
         ...options,
@@ -24,7 +22,6 @@ function normalizeOptions(tree, options) {
         route: options.route === '' ? `''` : options.route ?? `''`,
         directory: (0, devkit_1.names)(options.directory).fileName,
         rxjsVersion,
-        rxjsMajorVersion,
     };
 }
 function determineSubdirectoryAndName(name) {

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const versions_1 = require("../../../utils/versions");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
@@ -16,10 +15,10 @@ function normalizeOptions(tree, options) {
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
-    const appConfigPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.config.ts');
+    const appConfigPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
     let appMainPath = project.targets.build.options.main ?? project.targets.build.options.browser;
     if (!appMainPath) {
+        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
         appMainPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
     }
     /** If NgModule App
@@ -29,9 +28,9 @@ function normalizeOptions(tree, options) {
      * --> If so, use that
      * --> If not, use main.ts
      */
-    let ngModulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.module.ts');
+    let ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
     if (!tree.exists(ngModulePath)) {
-        ngModulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-module.ts');
+        ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-module.ts');
     }
     const parent = !isStandalone && tree.exists(ngModulePath)
         ? ngModulePath

package/src/generators/remote/lib/update-ssr-setup.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSsrSetup = updateSsrSetup;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const artifact_types_1 = require("../../utils/artifact-types");
@@ -10,9 +9,10 @@ const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, skipPackageJson, }) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
-    tree.rename((0, devkit_1.joinPathFragments)(sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(sourceRoot, 'bootstrap.server.ts'));
-    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19 ? sourceRoot : project.root, 'server.ts');
+    tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19
+        ? project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src')
+        : project.root, 'server.ts');
     tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
     const browserBundleOutput = project.targets.build.options.outputPath;
     const serverBundleOutput = project.targets.build.options.outputPath.replace(/\/browser$/, '/server');

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

@@ -5,7 +5,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCypressOnErrorWorkaround = addCypressOnErrorWorkaround;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function addCypressOnErrorWorkaround(tree, schema) {
     if (!schema.e2eProjectName) {
         return;
@@ -44,7 +43,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     }
     return true;
   });`;
-    const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(e2eProject, tree), 'support/e2e.ts');
+    const pathToCommandsFile = (0, devkit_1.joinPathFragments)(e2eProject.sourceRoot, 'support/e2e.ts');
     const commandsContent = tree.exists(pathToCommandsFile)
         ? tree.read(pathToCommandsFile, 'utf-8')
         : '';

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

@@ -4,9 +4,8 @@ exports.checkIsCommaNeeded = checkIsCommaNeeded;
 exports.addRemoteToHost = addRemoteToHost;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
 function checkIsCommaNeeded(mfRemoteText) {
     const remoteText = mfRemoteText.replace(/\s+/g, '');
@@ -26,7 +25,7 @@ function addRemoteToHost(tree, options) {
             addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescriptConfig);
         }
         else if (hostFederationType === 'dynamic') {
-            addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, ts_solution_setup_1.getProjectSourceRoot)(hostProject, tree));
+            addRemoteToDynamicHost(tree, options, pathToMFManifest, hostProject.sourceRoot);
         }
         addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
     }
@@ -40,7 +39,7 @@ function getDynamicManifestFile(tree, project) {
     // at the old path.
     return [
         (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json'),
-        (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets/module-federation.manifest.json'),
     ].find((path) => tree.exists(path));
 }
 function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript) {
@@ -76,8 +75,7 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(hostAppConfig, tree);
-    const pathToHostRootRouting = `${sourceRoot}/app/app.routes.ts`;
+    const pathToHostRootRouting = `${hostAppConfig.sourceRoot}/app/app.routes.ts`;
     if (!tree.exists(pathToHostRootRouting)) {
         return;
     }
@@ -86,7 +84,7 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     // TODO(Colum): Remove for Nx 22
     const usingLegacyDynamicFederation = hostFederationType === 'dynamic' &&
         tree
-            .read(`${sourceRoot}/main.ts`, 'utf-8')
+            .read(`${hostAppConfig.sourceRoot}/main.ts`, 'utf-8')
             .includes('setRemoteDefinitions(');
     if (hostFederationType === 'dynamic') {
         sourceFile = (0, js_1.insertImport)(tree, sourceFile, pathToHostRootRouting, usingLegacyDynamicFederation ? 'loadRemoteModule' : 'loadRemote', usingLegacyDynamicFederation
@@ -107,10 +105,10 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     path: '${options.appName}',
     loadChildren: () => ${routeToAdd}.then(m => m!.${exportedRemote})
     }`);
-    let pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.component.html');
+    let pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.component.html');
     const candidatePaths = [
         pathToAppComponentTemplate,
-        (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.html'),
+        (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.html'),
     ];
     for (const path of candidatePaths) {
         if (tree.exists(path)) {

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

@@ -2,21 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeDeadCodeFromRemote = removeDeadCodeFromRemote;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function removeDeadCodeFromRemote(tree, options) {
     const projectName = options.appName;
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     const { appComponentInfo, nxWelcomeComponentInfo, entryModuleFileName } = options;
     ['css', 'less', 'scss', 'sass'].forEach((style) => {
-        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);
+        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);
         if (tree.exists(pathToComponentStyle)) {
             tree.delete(pathToComponentStyle);
         }
     });
-    tree.rename(nxWelcomeComponentInfo.path, (0, devkit_1.joinPathFragments)(sourceRoot, `app/remote-entry/${nxWelcomeComponentInfo.fileName}`));
-    tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.spec.ts`));
-    tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.html`));
+    tree.rename(nxWelcomeComponentInfo.path, (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/remote-entry/${nxWelcomeComponentInfo.fileName}`));
+    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.spec.ts`));
+    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.html`));
     if (!options.standalone) {
         const componentContents = tree.read(appComponentInfo.path, 'utf-8');
         const isInlineTemplate = !componentContents.includes('templateUrl');
@@ -26,9 +24,9 @@ function removeDeadCodeFromRemote(tree, options) {
 })
 export class ${appComponentInfo.symbolName} {}`;
         tree.write(appComponentInfo.path, component);
-        let modulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.module.ts');
+        let modulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
         if (!tree.exists(modulePath)) {
-            modulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-module.ts');
+            modulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-module.ts');
         }
         tree.write(modulePath, `import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';

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

@@ -12,7 +12,6 @@ function addDependencies(tree, isUsingApplicationBuilder) {
     };
     const devDependencies = {
         '@types/express': pkgVersions.typesExpressVersion,
-        '@types/node': pkgVersions.typesNodeVersion,
     };
     const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ?? pkgVersions.angularDevkitVersion;
     dependencies['@angular/ssr'] = angularDevkitVersion;
@@ -25,5 +24,5 @@ function addDependencies(tree, isUsingApplicationBuilder) {
             dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
         }
     }
-    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies, undefined, true);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
 }

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

@@ -4,26 +4,24 @@ 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");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const version_utils_1 = require("../../utils/version-utils");
 let tsModule;
 let tsquery;
 function addHydration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
         tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
     let pathToClientConfigFile;
     if (options.standalone) {
-        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.config.ts');
+        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.config.ts');
     }
     else {
-        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.module.ts');
+        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
         if (!tree.exists(pathToClientConfigFile)) {
-            pathToClientConfigFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-module.ts');
+            pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app-module.ts');
         }
     }
     const sourceText = tree.read(pathToClientConfigFile, 'utf-8');

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServerFile = addServerFile;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
@@ -31,7 +30,7 @@ function addServerFile(tree, options) {
             ? 'application-builder'
             : 'server-builder');
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
     (0, devkit_1.generateFiles)(tree, pathToFiles, angularMajorVersion >= 19 ? sourceRoot : project.root, {
         ...options,
         browserDistDirectory,

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const app_components_info_1 = require("../../utils/app-components-info");
@@ -32,7 +31,7 @@ function generateSSRFiles(tree, options) {
     else {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
     const ssrVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/ssr');
     const cleanedSsrVersion = ssrVersion
         ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
 exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
@@ -30,7 +29,7 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
         }
     }
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
@@ -66,7 +65,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
         }
     }
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = projectConfig.sourceRoot ?? (0, devkit_1.joinPathFragments)(projectConfig.root, 'src');
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')

package/src/generators/setup-tailwind/lib/add-tailwind-config.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTailwindConfig = addTailwindConfig;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 function addTailwindConfig(tree, options, project, tailwindVersion) {
     if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'))) {
@@ -11,7 +10,7 @@ function addTailwindConfig(tree, options, project, tailwindVersion) {
     }
     const filesDir = tailwindVersion === '3' ? 'files/v3' : 'files/v2';
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', filesDir), project.root, {
-        relativeSourceRoot: (0, path_1.relative)(project.root, (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree)),
+        relativeSourceRoot: (0, path_1.relative)(project.root, project.sourceRoot),
         tmpl: '',
     });
 }

package/src/generators/setup-tailwind/lib/update-application-styles.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateApplicationStyles = updateApplicationStyles;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function updateApplicationStyles(tree, options, project) {
     let stylesEntryPoint = options.stylesEntryPoint;
     if (stylesEntryPoint && !tree.exists(stylesEntryPoint)) {
@@ -23,13 +22,12 @@ function updateApplicationStyles(tree, options, project) {
     ${stylesEntryPointContent}`);
 }
 function findStylesEntryPoint(tree, options, project) {
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     // first check for common names
     const possibleStylesEntryPoints = [
-        (0, devkit_1.joinPathFragments)(sourceRoot, 'styles.css'),
-        (0, devkit_1.joinPathFragments)(sourceRoot, 'styles.scss'),
-        (0, devkit_1.joinPathFragments)(sourceRoot, 'styles.sass'),
-        (0, devkit_1.joinPathFragments)(sourceRoot, 'styles.less'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.css'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.scss'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.sass'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.less'),
     ];
     let stylesEntryPoint = possibleStylesEntryPoints.find((s) => tree.exists(s));
     if (stylesEntryPoint) {

package/src/generators/utils/app-components-info.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppComponentInfo = getAppComponentInfo;
 exports.getNxWelcomeComponentInfo = getNxWelcomeComponentInfo;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const node_path_1 = require("node:path");
 const version_utils_1 = require("./version-utils");
 function getAppComponentInfo(tree, componentFileSuffix, project) {
@@ -14,19 +13,18 @@ function getNxWelcomeComponentInfo(tree, componentFileSuffix, project) {
 }
 // TODO(leo): follow this up and improve it by using static analysis
 function getComponentInfo(tree, component, componentFileSuffix, project) {
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
-    let componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.component.ts`);
+    let componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${component}.component.ts`);
     if (!tree.exists(componentPath)) {
-        componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.ts`);
+        componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${component}.ts`);
     }
     if (!tree.exists(componentPath)) {
         if (componentFileSuffix) {
-            componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}${componentFileSuffix}.ts`);
+            componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${component}${componentFileSuffix}.ts`);
         }
     }
     if (!tree.exists(componentPath)) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, angularMajorVersion >= 20
+        componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, angularMajorVersion >= 20
             ? `app/${component}.ts`
             : `app/${component}.component.ts`);
     }

package/src/generators/utils/testing.js

@@ -7,7 +7,6 @@ exports.generateTestLibrary = generateTestLibrary;
 exports.createStorybookTestWorkspaceForLib = createStorybookTestWorkspaceForLib;
 const devkit_1 = require("@nx/devkit");
 const testing_1 = require("@nx/devkit/testing");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
 const component_1 = require("../component/component");
@@ -227,7 +226,7 @@ export class StaticMemberDeclarationsModule {
 function generateModule(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (options.path === undefined) {
-        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+        const sourceRoot = project.sourceRoot ?? `${project.root}/src`;
         const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
         options.path = `${sourceRoot}/${projectDirName}`;
     }

package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js

@@ -18,7 +18,7 @@ const dataPersistenceOperators = [
 ];
 const newImportPath = '@ngrx/router-store/data-persistence';
 async function default_1(tree) {
-    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(angularPluginTargetNames);
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, angularPluginTargetNames);
     if (!projects.length) {
         return;
     }
@@ -26,7 +26,7 @@ async function default_1(tree) {
     tsquery = require('@phenomnomnominal/tsquery').tsquery;
     const cachedFileMap = (0, nx_deps_cache_1.readFileMapCache)().fileMap.projectFileMap;
     const filesWithNxAngularImports = [];
-    for (const graphNode of projects) {
+    for (const { graphNode } of projects) {
         const files = filterFilesWithNxAngularDep(cachedFileMap[graphNode.name] || []);
         filesWithNxAngularImports.push(...files);
     }

package/src/migrations/update-17-1-0/replace-nguniversal-engines.js

@@ -6,7 +6,6 @@ const path_1 = require("path");
 const version_utils_1 = require("../../generators/utils/version-utils");
 const targets_1 = require("../../utils/targets");
 const projects_1 = require("../utils/projects");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const UNIVERSAL_PACKAGES = [
     '@nguniversal/common',
     '@nguniversal/express-engine',
@@ -27,11 +26,11 @@ async function default_1(tree) {
     if (!UNIVERSAL_PACKAGES.some((pkg) => packageJson.dependencies?.[pkg] || packageJson.devDependencies?.[pkg])) {
         return;
     }
-    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
         'npm:@nguniversal/common',
         'npm:@nguniversal/express-engine',
     ]);
-    for (const { data: project } of projects) {
+    for (const { project } of projects) {
         if (project.projectType !== 'application') {
             continue;
         }
@@ -51,7 +50,7 @@ async function default_1(tree) {
         }
         // Replace all import specifiers in all files.
         let hasExpressTokens = false;
-        const root = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+        const root = project.sourceRoot ?? `${project.root}/src`;
         const tokensFilePath = `${root}/express.tokens.ts`;
         (0, devkit_1.visitNotIgnoredFiles)(tree, root, (path) => {
             if (!path.endsWith('.ts') || path.endsWith('.d.ts')) {