@nx/angular 23.2.0-beta.0 → 23.2.0-beta.10

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -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;
@@ -16,7 +20,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: Exclude<UnitTestRunner, UnitTestRunner.VitestAngular>;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

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

@@ -139,10 +139,9 @@
       "description": "Add tags to the application (used for linting)."
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "backendProject": {
       "type": "string",
@@ -153,11 +152,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/normalize-options.js

@@ -6,12 +6,14 @@ const internal_1 = require("@nx/devkit/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
+    // No `linter` default here: it would mask the resolution below, which is what
+    // detects the workspace's linter and prompts when there is nothing to detect.
     const options = {
         buildable: false,
-        linter: 'eslint',
         publishable: false,
         skipFormat: false,
         // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
@@ -45,7 +47,7 @@ async function normalizeOptions(host, schema) {
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
-        linter: options.linter ?? 'eslint',
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         unitTestRunner,
         prefix: options.prefix ?? 'lib',
         name: projectName,

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

@@ -1,5 +1,5 @@
 import { UnitTestRunner } from '../../../utils/test-runners';
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 export interface NormalizedSchema {
     libraryOptions: {
         directory: string;
@@ -18,13 +18,17 @@ 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;
         skipPostInstall?: boolean;
         skipTsConfig?: boolean;
         standalone?: boolean;
-        linter: Linter | LinterType;
+        linter: LinterType;
         unitTestRunner: UnitTestRunner;
         prefix: string;
         fileName: string;

package/dist/src/generators/library/lib/set-generator-defaults.js

@@ -6,7 +6,11 @@ function setGeneratorDefaults(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.generators = nxJson.generators ?? {};
     nxJson.generators['@nx/angular:library'] = {
-        linter: options.libraryOptions.linter,
+        // Pinning `none` would freeze the answer detection exists to give, so a
+        // workspace that adopts a linter later would keep getting none.
+        linter: options.libraryOptions.linter === 'none'
+            ? undefined
+            : options.libraryOptions.linter,
         unitTestRunner: options.libraryOptions.unitTestRunner,
         strict: !options.libraryOptions.strict ? false : undefined,
         ...(nxJson.generators['@nx/angular:library'] || {}),

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);
@@ -119,11 +120,12 @@ async function addLinting(host, options) {
         return;
     }
     await (0, add_linting_1.default)(host, {
+        linter: options.linter,
         projectName: options.name,
         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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
@@ -19,9 +19,13 @@ export interface Schema {
   parent?: string;
   tags?: string;
   strict?: boolean;
-  linter?: Linter | LinterType;
+  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

@@ -97,21 +97,26 @@
       "default": true
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "compilationMode": {
       "description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",
       "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/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -11,6 +11,6 @@ export interface GeneratorOptions {
   skipInstall?: boolean;
   skipPostInstall?: boolean;
   style?: Styles;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   skipPackageJson?: boolean;
 }

package/dist/src/generators/ng-add/schema.json

@@ -17,7 +17,6 @@
       "default": false,
       "x-priority": "internal"
     },
-
     "unitTestRunner": {
       "type": "string",
       "enum": ["karma", "jest", "none"],
@@ -39,8 +38,7 @@
     "linter": {
       "description": "The tool to use for running lint checks. NOTE: only used if running the generator in an Nx workspace.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "style": {
       "description": "The file extension to be used for style files. NOTE: only used if running the generator in an Nx workspace.",

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -8,13 +8,17 @@ 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;
   style?: Styles;
   skipTests?: boolean;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: Exclude<UnitTestRunner, UnitTestRunner.VitestAngular>;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

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

@@ -129,10 +129,9 @@
       "description": "Add tags to the application (used for linting)."
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "backendProject": {
       "type": "string",
@@ -143,11 +142,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/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/storybook-configuration/schema.d.ts

@@ -1,9 +1,9 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface StorybookConfigurationOptions {
   configureStaticServe?: boolean;
   generateStories: boolean;
-  linter: Linter | LinterType;
+  linter: LinterType;
   project: string;
   tsConfiguration?: boolean;
   skipFormat?: boolean;

package/dist/src/generators/storybook-configuration/schema.json

@@ -43,8 +43,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "tsConfiguration": {
       "type": "boolean",

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/plugins/plugin.js

@@ -8,8 +8,6 @@ const js_1 = require("@nx/js");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix = tslib_1.__importStar(require("node:path/posix"));
-const devkit_internals_1 = require("nx/src/devkit-internals");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const targets_1 = require("../utils/targets");
 const vitest_1 = require("./utils/vitest");
 const knownExecutors = {
@@ -48,8 +46,8 @@ const knownExecutors = {
 exports.createNodes = [
     '**/angular.json',
     async (configFiles, options, context) => {
-        const optionsHash = (0, devkit_internals_1.hashObject)(options);
-        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `angular-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `angular-${optionsHash}.hash`);
         const projectsCache = new internal_1.PluginCache(cachePath);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);