@nx/angular 23.1.0 → 23.1.2

package/dist/src/generators/host/host.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
@@ -81,7 +82,7 @@ async function host(tree, schema) {
         prefix: options.prefix,
         typescriptConfiguration,
         standalone: options.standalone,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
     });
     let installTasks = [appInstallTask];
     if (options.ssr) {

package/dist/src/generators/host/schema.d.ts

@@ -9,6 +9,10 @@ export interface Schema {
   port?: number;
   remotes?: string[];
   dynamic?: boolean;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   skipPostInstall?: boolean;

package/dist/src/generators/host/schema.json

@@ -153,11 +153,17 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

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

@@ -41,6 +41,9 @@ function createFiles(tree, options, project) {
         tpl: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), options.libraryOptions.projectRoot, substitutions);
+    if (options.libraryOptions.buildable && !options.libraryOptions.publishable) {
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.libraryOptions.projectRoot, 'package.json'), (json) => ({ ...json, private: true }));
+    }
     if (options.libraryOptions.standalone) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-components'), options.libraryOptions.projectRoot, substitutions);
     }

package/dist/src/generators/library/lib/normalized-schema.d.ts

@@ -18,6 +18,10 @@ export interface NormalizedSchema {
         tags?: string;
         strict?: boolean;
         compilationMode?: 'full' | 'partial';
+        enableTypedLinting?: boolean;
+        /**
+         * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+         */
         setParserOptionsProject?: boolean;
         skipModule?: boolean;
         skipPackageJson?: boolean;

package/dist/src/generators/library/library.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_2 = require("@nx/js/internal");
+const internal_3 = require("@nx/js/internal");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
@@ -71,7 +72,7 @@ async function libraryGenerator(tree, schema) {
         () => (0, devkit_1.installPackagesTask)(tree),
     ];
     if (libraryOptions.publishable) {
-        tasks.push(await (0, internal_2.releaseTasks)(tree));
+        tasks.push(await (0, internal_3.releaseTasks)(tree));
     }
     tasks.push(() => (0, internal_1.logShowProjectCommand)(libraryOptions.name));
     return (0, devkit_1.runTasksInSerial)(...tasks);
@@ -123,7 +124,7 @@ async function addLinting(host, options) {
         projectRoot: options.projectRoot,
         prefix: options.prefix,
         unitTestRunner: options.unitTestRunner,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
         skipFormat: true,
         skipPackageJson: options.skipPackageJson,
     });

package/dist/src/generators/library/schema.d.ts

@@ -22,6 +22,10 @@ export interface Schema {
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipModule?: boolean;
   skipPackageJson?: boolean;

package/dist/src/generators/library/schema.json

@@ -107,11 +107,17 @@
       "type": "string",
       "enum": ["full", "partial"]
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "skipModule": {
       "type": "boolean",
       "description": "Whether to skip the creation of a default module when generating the library.",

package/dist/src/generators/ng-add/migrators/projects/lib.migrator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LibMigrator = void 0;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const utilities_1 = require("../../utilities");
 const builders_1 = require("../builders");
 const project_migrator_1 = require("./project.migrator");
@@ -46,7 +45,7 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
             !Object.keys(this.projectConfig.targets).length) {
             this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
         }
-        (0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, {
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
             ...this.projectConfig,
         });
     }

package/dist/src/generators/ng-add/utilities/format-files-task.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFilesTask = formatFilesTask;
-const child_process_1 = require("nx/src/utils/child-process");
+const internal_1 = require("@nx/devkit/internal");
 function formatFilesTask(tree) {
     if (!tree
         .listChanges()
@@ -9,7 +9,7 @@ function formatFilesTask(tree) {
         return;
     }
     try {
-        (0, child_process_1.runNxSync)(`format`, { cwd: tree.root, stdio: [0, 1, 2] });
+        (0, internal_1.runNxSync)(`format`, { cwd: tree.root, stdio: [0, 1, 2] });
     }
     catch { }
 }

package/dist/src/generators/ng-add/utilities/projects.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllProjects = getAllProjects;
 exports.convertToNxProject = convertToNxProject;
 const devkit_1 = require("@nx/devkit");
-const angular_json_1 = require("nx/src/adapter/angular-json");
+const internal_1 = require("@nx/devkit/internal");
 function getAllProjects(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
     const result = {
@@ -26,7 +26,7 @@ function getAllProjects(tree) {
 }
 function convertToNxProject(tree, projectName) {
     const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
-    const project = (0, angular_json_1.toNewFormat)(angularJson).projects[projectName];
+    const project = (0, internal_1.toNewFormat)(angularJson).projects[projectName];
     project.name = projectName;
     (0, devkit_1.addProjectConfiguration)(tree, projectName, project);
     delete angularJson.projects[projectName];

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

@@ -17,11 +17,10 @@ const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const internal_1 = require("@nx/eslint/internal");
 const js_1 = require("@nx/js");
-const default_base_1 = require("nx/src/utils/default-base");
 const internal_2 = require("@nx/js/internal");
-const angular_json_1 = require("nx/src/adapter/angular-json");
 const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
+const internal_3 = require("@nx/devkit/internal");
 function validateWorkspace(tree) {
     const errors = [];
     if (!tree.exists('package.json')) {
@@ -40,7 +39,7 @@ function validateWorkspace(tree) {
 function createNxJson(tree, options, defaultProject) {
     const targets = getWorkspaceCommonTargets(tree);
     (0, devkit_1.writeJson)(tree, 'nx.json', {
-        defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
+        defaultBase: options.defaultBase ?? (0, internal_3.deduceDefaultBase)(),
         namedInputs: {
             sharedGlobals: [],
             default: ['{projectRoot}/**/*', 'sharedGlobals'],
@@ -278,7 +277,7 @@ function updateVsCodeRecommendedExtensions(tree) {
     }
 }
 function deleteAngularJson(tree) {
-    const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(tree, 'angular.json')).projects;
+    const projects = (0, internal_3.toNewFormat)((0, devkit_1.readJson)(tree, 'angular.json')).projects;
     if (!Object.keys(projects).length) {
         tree.delete('angular.json');
     }

package/dist/src/generators/remote/remote.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
-const internal_2 = require("@nx/js/internal");
+const internal_3 = require("@nx/js/internal");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
@@ -68,12 +69,12 @@ async function remote(tree, schema) {
         standalone: options.standalone,
         prefix: options.prefix,
         typescriptConfiguration,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
     });
     const installTasks = [appInstallTask];
     if (!options.skipPackageJson) {
         const installSwcHelpersTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@swc/helpers': internal_2.swcHelpersVersion,
+            '@swc/helpers': internal_3.swcHelpersVersion,
         });
         installTasks.push(installSwcHelpersTask);
     }

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

@@ -8,6 +8,10 @@ export interface Schema {
   bundler?: 'webpack' | 'rspack';
   host?: string;
   port?: number;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   prefix?: string;

package/dist/src/generators/remote/schema.json

@@ -143,11 +143,17 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/dist/src/generators/scam-to-standalone/lib/get-component-data-from-ast.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { type Tree } from '@nx/devkit';
 export declare function getComponentDataFromAST(tree: Tree, normalizedComponentPath: string): {
     componentFileContents: string;
     componentAST: any;

package/dist/src/generators/scam-to-standalone/lib/get-target-project.d.ts

@@ -1,2 +1,2 @@
-import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
+import { ProjectConfiguration } from '@nx/devkit';
 export declare function getTargetProject(projectName: string, projects: Map<string, ProjectConfiguration>): ProjectConfiguration;

package/dist/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from 'nx/src/generators/tree';
+import { Tree } from '@nx/devkit';
 export declare function replaceModuleUsagesWithComponent(tree: Tree, moduleName: string, componentName: string): void;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWebpackConfig = generateWebpackConfig;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/eslint/internal");
 function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
     if (tree.exists(`${appRoot}/module-federation.config.js`) ||
         tree.exists(`${appRoot}/webpack.config.js`) ||
@@ -25,7 +26,7 @@ function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
         standalone: options.standalone,
         entryModuleFileName: options.entryModuleFileName,
     });
-    if (!options.setParserOptionsProject) {
+    if (!(0, internal_1.isTypedLintingEnabled)(options)) {
         tree.delete((0, devkit_1.joinPathFragments)(appRoot, 'tsconfig.lint.json'));
     }
 }

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

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTspathForRemote = setupTspathForRemote;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const module_federation_1 = require("@nx/module-federation");
+const versions_1 = require("../../../utils/versions");
 function setupTspathForRemote(tree, options) {
+    const { normalizeProjectName } = (0, devkit_1.ensurePackage)('@nx/module-federation', versions_1.nxVersion);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     const exportPath = options.standalone
         ? `./src/app/remote-entry/entry.routes.ts`
         : `./src/app/remote-entry/${options.entryModuleFileName}.ts`;
     const exportName = options.standalone ? 'Routes' : 'Module';
-    (0, js_1.addTsConfigPath)(tree, `${(0, module_federation_1.normalizeProjectName)(options.appName)}/${exportName}`, [(0, devkit_1.joinPathFragments)(project.root, exportPath)]);
+    (0, js_1.addTsConfigPath)(tree, `${normalizeProjectName(options.appName)}/${exportName}`, [(0, devkit_1.joinPathFragments)(project.root, exportPath)]);
 }

package/dist/src/generators/setup-mf/schema.d.ts

@@ -17,6 +17,10 @@ export interface Schema {
   standalone?: boolean;
   skipE2E?: boolean;
   typescriptConfiguration?: boolean;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
 }
 

package/dist/src/generators/setup-mf/schema.json

@@ -81,10 +81,16 @@
       "description": "Whether the module federation configuration and webpack configuration files should use TS.",
       "default": true
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
+    },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
     }
   },
   "required": ["appName", "mfType"],

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

@@ -27,6 +27,7 @@ async function setupMf(tree, rawOptions) {
             }, {
                 '@nx/web': versions_1.nxVersion,
                 '@nx/webpack': versions_1.nxVersion,
+                'webpack-merge': versions_1.webpackMergeVersion,
                 '@nx/module-federation': versions_1.nxVersion,
             }));
         }
@@ -50,6 +51,7 @@ async function setupMf(tree, rawOptions) {
         if (!options.skipPackageJson) {
             tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 '@nx/webpack': versions_1.nxVersion,
+                'webpack-merge': versions_1.webpackMergeVersion,
                 '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion,
                 '@nx/module-federation': versions_1.nxVersion,
             }));

package/dist/src/generators/setup-ssr/lib/add-dependencies.d.ts

@@ -1,2 +1,2 @@
 import { type Tree } from '@nx/devkit';
-export declare function addDependencies(tree: Tree, isUsingApplicationBuilder: boolean): void;
+export declare function addDependencies(tree: Tree, isUsingApplicationBuilder: boolean, isUsingWebpackBuilder: boolean): void;

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

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = addDependencies;
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
-function addDependencies(tree, isUsingApplicationBuilder) {
+function addDependencies(tree, isUsingApplicationBuilder, isUsingWebpackBuilder) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
     const dependencies = {
         '@angular/platform-server': (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/platform-server') ??
@@ -18,6 +19,10 @@ function addDependencies(tree, isUsingApplicationBuilder) {
     dependencies['@angular/ssr'] = angularDevkitVersion;
     if (!isUsingApplicationBuilder) {
         devDependencies['browser-sync'] = pkgVersions.browserSyncVersion;
+        if (isUsingWebpackBuilder) {
+            devDependencies['@nx/webpack'] = versions_1.nxVersion;
+            devDependencies['webpack-merge'] = pkgVersions.webpackMergeVersion;
+        }
     }
     else {
         dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;

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

@@ -2,12 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 async function normalizeOptions(tree, options) {
     const { targets, root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
-        targets.build.executor === '@angular/build:application' ||
-        targets.build.executor === '@nx/angular:application';
+    // Resolve the executor via targetDefaults: readProjectConfiguration returns
+    // the raw config, so an inherited executor would otherwise read as undefined.
+    const buildTargetExecutor = targets.build.executor ??
+        (0, internal_1.readTargetDefaultsForTarget)('build', (0, devkit_1.readNxJson)(tree)?.targetDefaults)
+            ?.executor;
+    if (!buildTargetExecutor) {
+        throw new Error(`The "build" target of the "${options.project}" project does not specify an executor. Please add an executor to the "build" target.`);
+    }
+    const isUsingApplicationBuilder = buildTargetExecutor === '@angular-devkit/build-angular:application' ||
+        buildTargetExecutor === '@angular/build:application' ||
+        buildTargetExecutor === '@nx/angular:application';
+    const isUsingWebpackBuilder = buildTargetExecutor === '@nx/angular:webpack-browser';
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,
@@ -21,6 +31,8 @@ async function normalizeOptions(tree, options) {
         standalone: options.standalone ?? isStandaloneApp,
         hydration: options.hydration ?? true,
         isUsingApplicationBuilder,
+        isUsingWebpackBuilder,
+        buildTargetExecutor,
         buildTargetTsConfigPath: targets.build.options?.tsConfig ??
             (0, devkit_1.joinPathFragments)(root, 'tsconfig.app.json'),
     };

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

@@ -54,7 +54,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
     const sourceRoot = (0, internal_2.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
-        executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
+        executor: options.buildTargetExecutor.startsWith('@angular-devkit/build-angular:')
             ? '@angular-devkit/build-angular:server'
             : '@nx/angular:webpack-server',
         options: {

package/dist/src/generators/setup-ssr/schema.d.ts

@@ -14,5 +14,7 @@ export interface Schema {
 
 export interface NormalizedGeneratorOptions extends Schema {
   isUsingApplicationBuilder: boolean;
+  isUsingWebpackBuilder: boolean;
+  buildTargetExecutor: string;
   buildTargetTsConfigPath: string;
 }

package/dist/src/generators/setup-ssr/setup-ssr.js

@@ -9,7 +9,7 @@ async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (!schema.skipPackageJson) {
-        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder);
+        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder, options.isUsingWebpackBuilder);
     }
     (0, lib_1.generateSSRFiles)(tree, options);
     if (options.hydration) {

package/dist/src/generators/utils/add-vitest.js

@@ -4,7 +4,6 @@ exports.addVitestAngular = addVitestAngular;
 exports.addVitestAnalog = addVitestAnalog;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const devkit_internals_1 = require("nx/src/devkit-internals");
 const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("./version-utils");
@@ -90,7 +89,7 @@ function validateVitestVersion(tree) {
     let installedVitestVersion = null;
     // Try to get the actual installed version from node_modules
     try {
-        const { packageJson } = (0, devkit_internals_1.readModulePackageJson)('vitest');
+        const { packageJson } = (0, internal_1.readModulePackageJson)('vitest');
         installedVitestVersion = packageJson.version;
     }
     catch { }

package/dist/src/generators/utils/tsconfig-utils.js

@@ -18,12 +18,7 @@ function getDefinedCompilerOption(tree, tsConfigPath, optionName) {
 }
 function readCompilerOptionsFromTsConfig(tree, tsConfigPath) {
     const ts = (0, internal_1.ensureTypescript)();
-    const tsSysFromTree = {
-        ...ts.sys,
-        readDirectory: () => [],
-        readFile: (path) => tree.read(path, 'utf-8'),
-        fileExists: (path) => tree.exists(path),
-    };
-    const parsed = ts.parseJsonConfigFileContent(ts.readConfigFile(tsConfigPath, tsSysFromTree.readFile).config, tsSysFromTree, (0, node_path_1.dirname)(tsConfigPath));
+    const host = (0, internal_1.createTreeParseConfigHost)(tree);
+    const parsed = ts.parseJsonConfigFileContent(ts.readConfigFile(tsConfigPath, host.readFile).config, host, (0, node_path_1.dirname)(tsConfigPath));
     return parsed.options;
 }

package/dist/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateMfImportsToNewPackage;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const MF_IMPORT_TO_UPDATE = 'ModuleFederationConfig';
 const MF_CONFIG_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=@nx/webpack]):has(Identifier[name=ModuleFederationConfig])`;
@@ -23,7 +22,7 @@ async function migrateMfImportsToNewPackage(tree) {
         }
     }
     for (const root of rootsToCheck) {
-        (0, devkit_2.visitNotIgnoredFiles)(tree, root, (filePath) => {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, root, (filePath) => {
             if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
                 return;
             }
@@ -57,5 +56,5 @@ async function migrateMfImportsToNewPackage(tree) {
             tree.write(filePath, contents);
         });
     }
-    await (0, devkit_2.formatFiles)(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }

package/dist/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
-const project_graph_1 = require("nx/src/config/project-graph");
-const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
+const internal_2 = require("@nx/devkit/internal");
 const version_utils_1 = require("../../generators/utils/version-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 const projects_1 = require("../utils/projects");
@@ -27,7 +26,7 @@ async function default_1(tree) {
     const tsqueryModule = require('@phenomnomnominal/tsquery');
     tsqueryAst = tsqueryModule.ast;
     tsqueryQuery = tsqueryModule.query;
-    const cachedFileMap = (0, nx_deps_cache_1.readFileMapCache)().fileMap.projectFileMap;
+    const cachedFileMap = (0, internal_2.readFileMapCache)().fileMap.projectFileMap;
     const filesWithNxAngularImports = [];
     for (const graphNode of projects) {
         const files = filterFilesWithNxAngularDep(cachedFileMap[graphNode.name] || []);
@@ -115,7 +114,7 @@ function addNgrxRouterStoreIfNotInstalled(tree) {
 function filterFilesWithNxAngularDep(files) {
     const filteredFiles = [];
     for (const file of files) {
-        if (file.deps?.some((dep) => angularPluginTargetNames.includes((0, project_graph_1.fileDataDepTarget)(dep)))) {
+        if (file.deps?.some((dep) => angularPluginTargetNames.includes((0, internal_2.fileDataDepTarget)(dep)))) {
             filteredFiles.push(file);
         }
     }

package/dist/src/migrations/update-23-1-0/add-angular-build.md

@@ -1,6 +1,6 @@
 #### Add `@angular/build` When Used by an Executor
 
-The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with "This executor requires the package @angular/build to be installed". This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed, at the version the application generator installs. An existing version is preserved.
+The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with an error like `The "@angular/build" package is required by "@nx/angular:application" but is not installed`. This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed, at the version the application generator installs. An existing version is preserved.
 
 Executor usage is detected on any target using `@nx/angular:application`, `@nx/angular:unit-test`, or an `@angular/build:*` executor. Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
 

package/dist/src/migrations/update-23-1-0/add-optional-webpack-packages.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function addOptionalWebpackPackages(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;