@nx/angular 21.3.0-canary.20250710-13551c9 → 21.3.0-canary.20250712-18e5d95

package/migrations.json

@@ -343,6 +343,15 @@
       },
       "description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this here: https://www.typescriptlang.org/tsconfig/#moduleResolution.",
       "factory": "./src/migrations/update-21-2-0/update-module-resolution"
+    },
+    "update-angular-cli-version-20-1-0": {
+      "cli": "nx",
+      "version": "21.3.0-beta.4",
+      "requires": {
+        "@angular/core": ">=20.1.0"
+      },
+      "description": "Update the @angular/cli package version to ~20.1.0.",
+      "factory": "./src/migrations/update-21-3-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1809,6 +1818,71 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "21.3.0": {
+      "version": "21.3.0-beta.4",
+      "x-prompt": "Do you want to update the Angular version to v20.1?",
+      "requires": {
+        "@angular/core": ">=20.0.0 <20.1.0"
+      },
+      "packages": {
+        "@angular-devkit/build-angular": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/build": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/pwa": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/ssr": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/architect": {
+          "version": "~0.2001.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.2001.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/google-maps": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~20.1.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.3.0-canary.20250710-13551c9",
+  "version": "21.3.0-canary.20250712-18e5d95",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -58,14 +58,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.3.0-canary.20250710-13551c9",
-    "@nx/eslint": "21.3.0-canary.20250710-13551c9",
-    "@nx/js": "21.3.0-canary.20250710-13551c9",
-    "@nx/module-federation": "21.3.0-canary.20250710-13551c9",
-    "@nx/rspack": "21.3.0-canary.20250710-13551c9",
-    "@nx/web": "21.3.0-canary.20250710-13551c9",
-    "@nx/webpack": "21.3.0-canary.20250710-13551c9",
-    "@nx/workspace": "21.3.0-canary.20250710-13551c9",
+    "@nx/devkit": "21.3.0-canary.20250712-18e5d95",
+    "@nx/eslint": "21.3.0-canary.20250712-18e5d95",
+    "@nx/js": "21.3.0-canary.20250712-18e5d95",
+    "@nx/module-federation": "21.3.0-canary.20250712-18e5d95",
+    "@nx/rspack": "21.3.0-canary.20250712-18e5d95",
+    "@nx/web": "21.3.0-canary.20250712-18e5d95",
+    "@nx/webpack": "21.3.0-canary.20250712-18e5d95",
+    "@nx/workspace": "21.3.0-canary.20250712-18e5d95",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/plugins/component-testing.js

@@ -4,6 +4,7 @@ exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
 const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -115,7 +116,8 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         configuration: buildContext.configurationName,
     }, buildContext);
     const project = buildContext.projectsConfigurations.projects[buildContext.projectName];
-    const buildOptions = withSchemaDefaults(options, project, buildContext.root);
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project);
+    const buildOptions = withSchemaDefaults(options, sourceRoot, buildContext.root);
     // cypress creates a tsconfig if one isn't preset
     // that contains all the support required for angular and component tests
     delete buildOptions.tsConfig;
@@ -189,18 +191,9 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         buildOptions.scripts = [];
         buildOptions.stylePreprocessorOptions = { includePaths: [] };
     }
-    const config = buildContext.projectGraph.nodes[buildContext.projectName]?.data;
-    if (!config.sourceRoot) {
-        devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to find the 'sourceRoot' in the project configuration.
-Will set 'sourceRoot' to '${config.root}/src'
-Note: this may fail, setting the correct 'sourceRoot' for ${buildContext.projectName} in the project.json file will ensure the correct value is used.`);
-        config.sourceRoot = (0, devkit_1.joinPathFragments)(config.root, 'src');
-    }
     return {
-        root: offset ? (0, devkit_1.joinPathFragments)(offset, config.root) : config.root,
-        sourceRoot: offset
-            ? (0, devkit_1.joinPathFragments)(offset, config.sourceRoot)
-            : config.sourceRoot,
+        root: offset ? (0, devkit_1.joinPathFragments)(offset, project.root) : project.root,
+        sourceRoot: offset ? (0, devkit_1.joinPathFragments)(offset, sourceRoot) : sourceRoot,
         buildOptions: {
             ...buildOptions,
             // this property is only valid for cy v12.9.0+
@@ -208,9 +201,8 @@ Note: this may fail, setting the correct 'sourceRoot' for ${buildContext.project
         },
     };
 }
-function withSchemaDefaults(options, project, workspaceRoot) {
+function withSchemaDefaults(options, sourceRoot, workspaceRoot) {
     if (!options.main && !options.browser) {
-        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
         options.browser = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
         if (!(0, fs_1.existsSync)((0, path_1.join)(workspaceRoot, options.browser))) {
             throw new Error('Missing executor options "main" and "browser"');

package/src/builders/utilities/module-federation.js

@@ -4,10 +4,11 @@ exports.getDynamicRemotes = getDynamicRemotes;
 exports.getStaticRemotes = getStaticRemotes;
 exports.validateDevRemotes = validateDevRemotes;
 exports.getDynamicMfManifestFile = getDynamicMfManifestFile;
-const path_1 = require("path");
-const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/src/internal");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const fs_1 = require("fs");
+const path_1 = require("path");
 function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip, pathToManifestFile) {
     pathToManifestFile ??= getDynamicMfManifestFile(project, context.workspaceRoot);
     // check for dynamic remotes
@@ -105,6 +106,6 @@ function getDynamicMfManifestFile(project, workspaceRoot) {
     // at the old path.
     return [
         (0, path_1.join)(workspaceRoot, project.root, 'public/module-federation.manifest.json'),
-        (0, path_1.join)(workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json'),
+        (0, path_1.join)(workspaceRoot, (0, ts_solution_setup_1.getProjectSourceRoot)(project), 'assets/module-federation.manifest.json'),
     ].find((path) => (0, fs_1.existsSync)(path));
 }

package/src/executors/application/schema.json

@@ -278,10 +278,12 @@
       ]
     },
     "loader": {
-      "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `empty` considers the content to be empty and not include it in bundles.",
+      "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `dataurl` inlines the content as a data URL with best guess of MIME type; `base64` inlines the content as a Base64-encoded string; `empty` considers the content to be empty and not include it in bundles. _Note: `dataurl` and `base64` are only supported in Angular versions >= 20.1.0_.",
       "type": "object",
       "patternProperties": {
-        "^\\.\\S+$": { "enum": ["text", "binary", "file", "empty"] }
+        "^\\.\\S+$": {
+          "enum": ["text", "binary", "file", "dataurl", "base64", "empty"]
+        }
       }
     },
     "define": {

package/src/executors/application/utils/validate-options.js

@@ -32,4 +32,14 @@ function validateOptions(options) {
             throw new Error(`The "conditions" option requires Angular version 20.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
     }
+    if ((0, semver_1.lt)(angularVersion, '20.1.0')) {
+        if (options.loader) {
+            const invalidLoaders = Array.from(new Set(Object.values(options.loader).filter((l) => l === 'dataurl' || l === 'base64')));
+            if (invalidLoaders.length) {
+                throw new Error(`Using the ${invalidLoaders
+                    .map((l) => `"${l}"`)
+                    .join(' and ')} loader${invalidLoaders.length > 1 ? 's' : ''} requires Angular version 20.1.0 or greater. You are currently using version ${angularVersion}.`);
+            }
+        }
+    }
 }

package/src/generators/application/application.js

@@ -80,10 +80,11 @@ async function applicationGenerator(tree, schema) {
     }
     if (!options.skipPackageJson) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+        const devDependencies = {};
+        const packageVersions = (0, version_utils_1.versions)(tree);
         if (angularMajorVersion >= 20) {
             const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
-                (0, version_utils_1.versions)(tree).angularDevkitVersion;
-            const devDependencies = {};
+                packageVersions.angularDevkitVersion;
             if (options.bundler === 'esbuild') {
                 devDependencies['@angular/build'] = angularDevkitVersion;
             }
@@ -94,6 +95,11 @@ async function applicationGenerator(tree, schema) {
             else {
                 devDependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
             }
+        }
+        if (options.style === 'less') {
+            devDependencies['less'] = packageVersions.lessVersion;
+        }
+        if (Object.keys(devDependencies).length) {
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
         }
     }

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

@@ -2,16 +2,16 @@
 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 version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-    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');
+    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.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,

package/src/generators/library/lib/create-files.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const semver_1 = require("semver");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
@@ -50,7 +51,7 @@ function createFiles(tree, options, project) {
         }
     }
     if (!options.libraryOptions.routing) {
-        tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, `lib/lib.routes.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), `lib/lib.routes.ts`));
     }
     if (!options.libraryOptions.buildable &&
         !options.libraryOptions.publishable) {

package/src/generators/move/lib/update-module-name.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleName = updateModuleName;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 /**
  * Updates the Angular module name (including the spec file and index.ts)
  *
@@ -40,14 +41,15 @@ function updateModuleName(tree, { oldProjectName, newProjectName }) {
             to: `${unscopedNewProjectName}-module`,
         },
     ];
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     const filesToRename = moduleFiles.flatMap((moduleFile) => [
         {
-            from: `${project.sourceRoot}/lib/${moduleFile.from}.ts`,
-            to: `${project.sourceRoot}/lib/${moduleFile.to}.ts`,
+            from: `${sourceRoot}/lib/${moduleFile.from}.ts`,
+            to: `${sourceRoot}/lib/${moduleFile.to}.ts`,
         },
         {
-            from: `${project.sourceRoot}/lib/${moduleFile.from}.spec.ts`,
-            to: `${project.sourceRoot}/lib/${moduleFile.to}.spec.ts`,
+            from: `${sourceRoot}/lib/${moduleFile.from}.spec.ts`,
+            to: `${sourceRoot}/lib/${moduleFile.to}.spec.ts`,
         },
     ].filter((rename) => rename.from !== rename.to));
     if (filesToRename.length === 0) {
@@ -71,7 +73,7 @@ function updateModuleName(tree, { oldProjectName, newProjectName }) {
         }
     });
     // update index file
-    const indexFile = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'index.ts');
+    const indexFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'index.ts');
     if (tree.exists(indexFile)) {
         updateFileContent(tree, replacements, indexFile);
     }

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

@@ -2,7 +2,11 @@ import { NgModule } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
-import { readFirst } from '@nx/angular/testing';
+<%_ if (isRxJs7) { _%>
+import { firstValueFrom } from 'rxjs';
+<%_ } else { _%>
+import { first } from 'rxjs/operators';
+<%_ } _%>
 
 import * as <%= className %>Actions from './<%= fileName %>.actions';
 import { <%= className %>Effects } from './<%= fileName %>.effects';
@@ -57,16 +61,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 readFirst(facade.all<%= className %>$);
-      let isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
 
       facade.init();
 
-      list = await readFirst(facade.all<%= className %>$);
-      isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(true);
@@ -76,8 +80,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 readFirst(facade.all<%= className %>$);
-      let isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
@@ -89,8 +93,8 @@ describe('<%= className %>Facade', () => {
         ]})
       );
 
-      list = await readFirst(facade.all<%= className %>$);
-      isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(2);
       expect(isLoaded).toBe(true);

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

@@ -13,6 +13,7 @@ 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,5 +3,6 @@ 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,6 +4,7 @@ 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;
@@ -13,6 +14,7 @@ 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
@@ -23,5 +25,6 @@ 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,7 +2,11 @@ import { NgModule } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
-import { readFirst } from '@nx/angular/testing';
+<%_ if (isRxJs7) { _%>
+import { firstValueFrom } from 'rxjs';
+<%_ } else { _%>
+import { first } from 'rxjs/operators';
+<%_ } _%>
 
 import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
 import { <%= className %>Effects } from './<%= relativeFileName %>.effects';
@@ -57,16 +61,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 readFirst(facade.all<%= className %>$);
-      let isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
 
       facade.init();
 
-      list = await readFirst(facade.all<%= className %>$);
-      isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(true);
@@ -76,8 +80,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 readFirst(facade.all<%= className %>$);
-      let isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(0);
       expect(isLoaded).toBe(false);
@@ -89,8 +93,8 @@ describe('<%= className %>Facade', () => {
         ]})
       );
 
-      list = await readFirst(facade.all<%= className %>$);
-      isLoaded = await readFirst(facade.loaded$);
+      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()<% } %>;
 
       expect(list.length).toBe(2);
       expect(isLoaded).toBe(true);

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

@@ -14,6 +14,7 @@ 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,5 +4,6 @@ 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,6 +4,7 @@ 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;
@@ -13,6 +14,7 @@ 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,
@@ -22,6 +24,7 @@ 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,6 +5,7 @@ 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 {
@@ -15,10 +16,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 appConfigPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const appConfigPath = (0, devkit_1.joinPathFragments)(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
@@ -28,9 +29,9 @@ function normalizeOptions(tree, options) {
      * --> If so, use that
      * --> If not, use main.ts
      */
-    let ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
+    let ngModulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.module.ts');
     if (!tree.exists(ngModulePath)) {
-        ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-module.ts');
+        ngModulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-module.ts');
     }
     const parent = !isStandalone && tree.exists(ngModulePath)
         ? ngModulePath

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

@@ -2,6 +2,7 @@
 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");
@@ -9,10 +10,9 @@ 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);
-    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');
+    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.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,6 +5,7 @@
 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;
@@ -43,7 +44,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     }
     return true;
   });`;
-    const pathToCommandsFile = (0, devkit_1.joinPathFragments)(e2eProject.sourceRoot, 'support/e2e.ts');
+    const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(e2eProject, tree), '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,8 +4,9 @@ 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");
 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");
 let tsModule;
 function checkIsCommaNeeded(mfRemoteText) {
     const remoteText = mfRemoteText.replace(/\s+/g, '');
@@ -25,7 +26,7 @@ function addRemoteToHost(tree, options) {
             addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescriptConfig);
         }
         else if (hostFederationType === 'dynamic') {
-            addRemoteToDynamicHost(tree, options, pathToMFManifest, hostProject.sourceRoot);
+            addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, ts_solution_setup_1.getProjectSourceRoot)(hostProject, tree));
         }
         addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
     }
@@ -39,7 +40,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)(project.sourceRoot, 'assets/module-federation.manifest.json'),
+        (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
     ].find((path) => tree.exists(path));
 }
 function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript) {
@@ -75,7 +76,8 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
-    const pathToHostRootRouting = `${hostAppConfig.sourceRoot}/app/app.routes.ts`;
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(hostAppConfig, tree);
+    const pathToHostRootRouting = `${sourceRoot}/app/app.routes.ts`;
     if (!tree.exists(pathToHostRootRouting)) {
         return;
     }
@@ -84,7 +86,7 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     // TODO(Colum): Remove for Nx 22
     const usingLegacyDynamicFederation = hostFederationType === 'dynamic' &&
         tree
-            .read(`${hostAppConfig.sourceRoot}/main.ts`, 'utf-8')
+            .read(`${sourceRoot}/main.ts`, 'utf-8')
             .includes('setRemoteDefinitions(');
     if (hostFederationType === 'dynamic') {
         sourceFile = (0, js_1.insertImport)(tree, sourceFile, pathToHostRootRouting, usingLegacyDynamicFederation ? 'loadRemoteModule' : 'loadRemote', usingLegacyDynamicFederation
@@ -105,10 +107,10 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     path: '${options.appName}',
     loadChildren: () => ${routeToAdd}.then(m => m!.${exportedRemote})
     }`);
-    let pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.component.html');
+    let pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.component.html');
     const candidatePaths = [
         pathToAppComponentTemplate,
-        (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.html'),
+        (0, devkit_1.joinPathFragments)(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,19 +2,21 @@
 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)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);
+        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);
         if (tree.exists(pathToComponentStyle)) {
             tree.delete(pathToComponentStyle);
         }
     });
-    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`));
+    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`));
     if (!options.standalone) {
         const componentContents = tree.read(appComponentInfo.path, 'utf-8');
         const isInlineTemplate = !componentContents.includes('templateUrl');
@@ -24,9 +26,9 @@ function removeDeadCodeFromRemote(tree, options) {
 })
 export class ${appComponentInfo.symbolName} {}`;
         tree.write(appComponentInfo.path, component);
-        let modulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
+        let modulePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.module.ts');
         if (!tree.exists(modulePath)) {
-            modulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-module.ts');
+            modulePath = (0, devkit_1.joinPathFragments)(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,6 +12,7 @@ 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;
@@ -24,5 +25,5 @@ function addDependencies(tree, isUsingApplicationBuilder) {
             dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
         }
     }
-    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies, undefined, true);
 }

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

@@ -4,24 +4,26 @@ 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)(projectConfig.sourceRoot, 'app/app.config.ts');
+        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.config.ts');
     }
     else {
-        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
+        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.module.ts');
         if (!tree.exists(pathToClientConfigFile)) {
-            pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app-module.ts');
+            pathToClientConfigFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-module.ts');
         }
     }
     const sourceText = tree.read(pathToClientConfigFile, 'utf-8');

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

@@ -2,6 +2,7 @@
 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");
@@ -30,7 +31,7 @@ function addServerFile(tree, options) {
             ? 'application-builder'
             : 'server-builder');
     }
-    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     (0, devkit_1.generateFiles)(tree, pathToFiles, angularMajorVersion >= 19 ? sourceRoot : project.root, {
         ...options,
         browserDistDirectory,

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

@@ -2,6 +2,7 @@
 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");
@@ -31,7 +32,7 @@ function generateSSRFiles(tree, options) {
     else {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
-    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     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,6 +3,7 @@ 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) {
@@ -29,7 +30,7 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
         }
     }
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
@@ -65,7 +66,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
         }
     }
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const sourceRoot = projectConfig.sourceRoot ?? (0, devkit_1.joinPathFragments)(projectConfig.root, 'src');
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')

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

@@ -2,6 +2,7 @@
 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'))) {
@@ -10,7 +11,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, project.sourceRoot),
+        relativeSourceRoot: (0, path_1.relative)(project.root, (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree)),
         tmpl: '',
     });
 }

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

@@ -2,6 +2,7 @@
 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)) {
@@ -22,12 +23,13 @@ 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)(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'),
+        (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'),
     ];
     let stylesEntryPoint = possibleStylesEntryPoints.find((s) => tree.exists(s));
     if (stylesEntryPoint) {

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

@@ -3,6 +3,7 @@ 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) {
@@ -13,18 +14,19 @@ function getNxWelcomeComponentInfo(tree, componentFileSuffix, project) {
 }
 // TODO(leo): follow this up and improve it by using static analysis
 function getComponentInfo(tree, component, componentFileSuffix, project) {
-    let componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${component}.component.ts`);
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    let componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.component.ts`);
     if (!tree.exists(componentPath)) {
-        componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${component}.ts`);
+        componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.ts`);
     }
     if (!tree.exists(componentPath)) {
         if (componentFileSuffix) {
-            componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${component}${componentFileSuffix}.ts`);
+            componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}${componentFileSuffix}.ts`);
         }
     }
     if (!tree.exists(componentPath)) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        componentPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, angularMajorVersion >= 20
+        componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, angularMajorVersion >= 20
             ? `app/${component}.ts`
             : `app/${component}.component.ts`);
     }

package/src/generators/utils/testing.js

@@ -7,6 +7,7 @@ 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");
@@ -226,7 +227,7 @@ export class StaticMemberDeclarationsModule {
 function generateModule(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (options.path === undefined) {
-        const sourceRoot = project.sourceRoot ?? `${project.root}/src`;
+        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
         const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
         options.path = `${sourceRoot}/${projectDirName}`;
     }

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

@@ -6,6 +6,7 @@ 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',
@@ -50,7 +51,7 @@ async function default_1(tree) {
         }
         // Replace all import specifiers in all files.
         let hasExpressTokens = false;
-        const root = project.sourceRoot ?? `${project.root}/src`;
+        const root = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
         const tokensFilePath = `${root}/express.tokens.ts`;
         (0, devkit_1.visitNotIgnoredFiles)(tree, root, (path) => {
             if (!path.endsWith('.ts') || path.endsWith('.d.ts')) {

package/src/migrations/update-21-3-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~20.1.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-21-3-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~20.1.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}

package/src/utils/backward-compatible-versions.js

@@ -26,6 +26,7 @@ exports.backwardCompatibleVersions = {
         postcssUrlVersion: '~10.1.3',
         autoprefixerVersion: '^10.4.0',
         tsNodeVersion: '10.9.1',
+        lessVersion: '^4.3.0',
         jestPresetAngularVersion: '~14.1.0',
         typesNodeVersion: '18.16.9',
         jasmineMarblesVersion: '^0.9.2',
@@ -56,6 +57,7 @@ exports.backwardCompatibleVersions = {
         postcssUrlVersion: '~10.1.3',
         autoprefixerVersion: '^10.4.0',
         tsNodeVersion: '10.9.1',
+        lessVersion: '^4.3.0',
         jestPresetAngularVersion: '~14.4.0',
         typesNodeVersion: '18.16.9',
         jasmineMarblesVersion: '^0.9.2',

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

@@ -26,6 +26,7 @@ exports.getTsSourceFile = getTsSourceFile;
 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 path_1 = require("path");
 const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
 const version_utils_1 = require("../../generators/utils/version-utils");
@@ -451,7 +452,7 @@ function isNgStandaloneApp(tree, projectName) {
         hasMainFile = true;
     }
     else {
-        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
         mainFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
         hasMainFile = tree.exists(mainFile);
     }
@@ -560,7 +561,7 @@ function readBootstrapInfo(host, app) {
             config.targets.build.options?.main ??
                 config.targets.build.options?.browser;
         if (!mainPath) {
-            const sourceRoot = config.sourceRoot ?? (0, devkit_1.joinPathFragments)(config.root, 'src');
+            const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(config, host);
             mainPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
         }
     }

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~20.0.0";
-export declare const angularDevkitVersion = "~20.0.0";
-export declare const ngPackagrVersion = "~20.0.0";
+export declare const angularVersion = "~20.1.0";
+export declare const angularDevkitVersion = "~20.1.0";
+export declare const ngPackagrVersion = "~20.1.0";
 export declare const angularRspackVersion = "^21.1.0";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
@@ -23,6 +23,7 @@ export declare const postcssVersion = "^8.4.5";
 export declare const postcssUrlVersion = "~10.1.3";
 export declare const autoprefixerVersion = "^10.4.0";
 export declare const tsNodeVersion = "10.9.1";
+export declare const lessVersion = "^4.3.0";
 export declare const jestPresetAngularVersion = "~14.6.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const jasmineMarblesVersion = "^0.9.2";

package/src/utils/versions.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.webpackMergeVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.lessVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.webpackMergeVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~20.0.0';
-exports.angularDevkitVersion = '~20.0.0';
-exports.ngPackagrVersion = '~20.0.0';
+exports.angularVersion = '~20.1.0';
+exports.angularDevkitVersion = '~20.1.0';
+exports.ngPackagrVersion = '~20.1.0';
 exports.angularRspackVersion = '^21.1.0';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
@@ -26,6 +26,7 @@ exports.postcssVersion = '^8.4.5';
 exports.postcssUrlVersion = '~10.1.3';
 exports.autoprefixerVersion = '^10.4.0';
 exports.tsNodeVersion = '10.9.1';
+exports.lessVersion = '^4.3.0';
 exports.jestPresetAngularVersion = '~14.6.0';
 exports.typesNodeVersion = '18.16.9';
 exports.jasmineMarblesVersion = '^0.9.2';