nx 16.7.0 → 16.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.7.0",
+  "version": "16.8.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.7.0",
+    "@nrwl/tao": "16.8.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.7.0",
-    "@nx/nx-darwin-x64": "16.7.0",
-    "@nx/nx-freebsd-x64": "16.7.0",
-    "@nx/nx-linux-arm-gnueabihf": "16.7.0",
-    "@nx/nx-linux-arm64-gnu": "16.7.0",
-    "@nx/nx-linux-arm64-musl": "16.7.0",
-    "@nx/nx-linux-x64-gnu": "16.7.0",
-    "@nx/nx-linux-x64-musl": "16.7.0",
-    "@nx/nx-win32-arm64-msvc": "16.7.0",
-    "@nx/nx-win32-x64-msvc": "16.7.0"
+    "@nx/nx-darwin-arm64": "16.8.0-beta.0",
+    "@nx/nx-darwin-x64": "16.8.0-beta.0",
+    "@nx/nx-freebsd-x64": "16.8.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "16.8.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "16.8.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "16.8.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "16.8.0-beta.0",
+    "@nx/nx-linux-x64-musl": "16.8.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "16.8.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "16.8.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -177,5 +177,5 @@
   },
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "gitHead": "37fd20b7063be8fe23a45892f5a21c2703bc53a6"
+  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
 }

package/plugins/package-json-workspaces.d.ts

@@ -1,10 +1,16 @@
 import { NxJsonConfiguration } from '../src/config/nx-json';
 import { ProjectConfiguration } from '../src/config/workspace-json-project-json';
 import { NxPluginV2 } from '../src/utils/nx-plugin';
+import { PackageJson } from '../src/utils/package-json';
 export declare function getNxPackageJsonWorkspacesPlugin(root: string): NxPluginV2;
-export declare function buildProjectConfigurationFromPackageJson(packageJson: {
-    name: string;
-}, path: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
+export declare function createNodeFromPackageJson(pkgJsonPath: string, root: string): {
+    projects: {
+        [x: string]: ProjectConfiguration & {
+            name: string;
+        };
+    };
+};
+export declare function buildProjectConfigurationFromPackageJson(packageJson: PackageJson, path: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
     name: string;
 };
 /**

package/plugins/package-json-workspaces.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobPatternsFromPackageManagerWorkspaces = exports.buildProjectConfigurationFromPackageJson = exports.getNxPackageJsonWorkspacesPlugin = void 0;
+exports.getGlobPatternsFromPackageManagerWorkspaces = exports.buildProjectConfigurationFromPackageJson = exports.createNodeFromPackageJson = exports.getNxPackageJsonWorkspacesPlugin = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const nx_json_1 = require("../src/config/nx-json");
@@ -9,6 +9,7 @@ const fileutils_1 = require("../src/utils/fileutils");
 const globs_1 = require("../src/utils/globs");
 const logger_1 = require("../src/utils/logger");
 const output_1 = require("../src/utils/output");
+const package_json_1 = require("../src/utils/package-json");
 const path_1 = require("../src/utils/path");
 function getNxPackageJsonWorkspacesPlugin(root) {
     const readJson = (f) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, f));
@@ -16,18 +17,20 @@ function getNxPackageJsonWorkspacesPlugin(root) {
         name: 'nx-core-build-package-json-nodes',
         createNodes: [
             (0, globs_1.combineGlobPatterns)(getGlobPatternsFromPackageManagerWorkspaces(root, readJson)),
-            (pkgJsonPath) => {
-                const json = readJson(pkgJsonPath);
-                return {
-                    projects: {
-                        [json.name]: buildProjectConfigurationFromPackageJson(json, pkgJsonPath, (0, nx_json_1.readNxJson)(root)),
-                    },
-                };
-            },
+            (p) => createNodeFromPackageJson(p, root),
         ],
     };
 }
 exports.getNxPackageJsonWorkspacesPlugin = getNxPackageJsonWorkspacesPlugin;
+function createNodeFromPackageJson(pkgJsonPath, root) {
+    const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, pkgJsonPath));
+    return {
+        projects: {
+            [json.name]: buildProjectConfigurationFromPackageJson(json, pkgJsonPath, (0, nx_json_1.readNxJson)(root)),
+        },
+    };
+}
+exports.createNodeFromPackageJson = createNodeFromPackageJson;
 function buildProjectConfigurationFromPackageJson(packageJson, path, nxJson) {
     var _a, _b, _c, _d;
     const normalizedPath = path.split('\\').join('/');
@@ -47,12 +50,8 @@ function buildProjectConfigurationFromPackageJson(packageJson, path, nxJson) {
         directory.startsWith(nxJson.workspaceLayout.appsDir)
         ? 'application'
         : 'library';
-    return {
-        root: directory,
-        sourceRoot: directory,
-        name,
-        projectType,
-    };
+    return Object.assign(Object.assign({ root: directory, sourceRoot: directory, name,
+        projectType }, packageJson.nx), { targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson) });
 }
 exports.buildProjectConfigurationFromPackageJson = buildProjectConfigurationFromPackageJson;
 /**

package/plugins/package-json.d.ts

@@ -1 +1 @@
-export declare const projectFilePatterns: string[];
+export {};

package/plugins/package-json.js

@@ -1,4 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectFilePatterns = void 0;
-exports.projectFilePatterns = ['package.json'];
+const workspace_root_1 = require("../src/utils/workspace-root");
+const package_json_workspaces_1 = require("./package-json-workspaces");
+const plugin = {
+    name: 'nx-all-package-jsons-plugin',
+    createNodes: [
+        '*/**/package.json',
+        (f) => (0, package_json_workspaces_1.createNodeFromPackageJson)(f, workspace_root_1.workspaceRoot),
+    ],
+};
+module.exports = plugin;

package/plugins/project-json.d.ts

@@ -1,4 +1,7 @@
-import { ProjectConfiguration } from '../src/config/workspace-json-project-json';
+import { ProjectConfiguration, TargetConfiguration } from '../src/config/workspace-json-project-json';
 import { NxPluginV2 } from '../src/utils/nx-plugin';
+import { PackageJson } from '../src/utils/package-json';
 export declare function getNxProjectJsonPlugin(root: string): NxPluginV2;
 export declare function buildProjectFromProjectJson(json: Partial<ProjectConfiguration>, path: string): ProjectConfiguration;
+export declare function mergePackageJsonConfigurationWithProjectJson(p: ProjectConfiguration, root: string): void;
+export declare function mergeNpmScriptsWithTargets(packageJson: PackageJson, targets: Record<string, TargetConfiguration>): Record<string, TargetConfiguration>;

package/plugins/project-json.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProjectFromProjectJson = exports.getNxProjectJsonPlugin = void 0;
+exports.mergeNpmScriptsWithTargets = exports.mergePackageJsonConfigurationWithProjectJson = exports.buildProjectFromProjectJson = exports.getNxProjectJsonPlugin = void 0;
 const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
 const workspaces_1 = require("../src/config/workspaces");
 const fileutils_1 = require("../src/utils/fileutils");
+const package_json_1 = require("../src/utils/package-json");
 function getNxProjectJsonPlugin(root) {
     return {
         name: 'nx-core-build-project-json-nodes',
@@ -12,6 +14,7 @@ function getNxProjectJsonPlugin(root) {
             (file) => {
                 const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, file));
                 const project = buildProjectFromProjectJson(json, file);
+                mergePackageJsonConfigurationWithProjectJson(project, root);
                 return {
                     projects: {
                         [project.name]: project,
@@ -26,3 +29,37 @@ function buildProjectFromProjectJson(json, path) {
     return Object.assign({ name: (0, workspaces_1.toProjectName)(path), root: (0, node_path_1.dirname)(path) }, json);
 }
 exports.buildProjectFromProjectJson = buildProjectFromProjectJson;
+function mergePackageJsonConfigurationWithProjectJson(p, root) {
+    if ((0, node_fs_1.existsSync)((0, node_path_1.join)(root, p.root, 'package.json'))) {
+        try {
+            const packageJson = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, p.root, 'package.json'));
+            p.targets = mergeNpmScriptsWithTargets(packageJson, p.targets);
+            const { nx } = packageJson;
+            if (nx === null || nx === void 0 ? void 0 : nx.tags) {
+                p.tags = [...(p.tags || []), ...nx.tags];
+            }
+            if (nx === null || nx === void 0 ? void 0 : nx.implicitDependencies) {
+                p.implicitDependencies = [
+                    ...(p.implicitDependencies || []),
+                    ...nx.implicitDependencies,
+                ];
+            }
+            if (nx === null || nx === void 0 ? void 0 : nx.namedInputs) {
+                p.namedInputs = Object.assign(Object.assign({}, (p.namedInputs || {})), nx.namedInputs);
+            }
+        }
+        catch (e) {
+            // ignore json parser errors
+        }
+    }
+}
+exports.mergePackageJsonConfigurationWithProjectJson = mergePackageJsonConfigurationWithProjectJson;
+function mergeNpmScriptsWithTargets(packageJson, targets) {
+    try {
+        return Object.assign(Object.assign({}, (0, package_json_1.readTargetsFromPackageJson)(packageJson)), (targets || {}));
+    }
+    catch (e) {
+        return targets;
+    }
+}
+exports.mergeNpmScriptsWithTargets = mergeNpmScriptsWithTargets;

package/schemas/nx-schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://nx.dev/core-concepts/configuration#nxjson",
+  "$id": "https://nx.dev/reference/nx-json",
   "title": "JSON schema for Nx configuration",
   "type": "object",
   "properties": {

package/schemas/project-schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://nx.dev/project-schema",
+  "$id": "https://nx.dev/reference/project-configuration",
   "title": "JSON schema for Nx projects",
   "type": "object",
   "properties": {

package/src/adapter/angular-json.d.ts

@@ -1,11 +1,9 @@
-import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
+import { ProjectsConfigurations } from '../config/workspace-json-project-json';
+import { NxPluginV2 } from '../devkit-exports';
+export declare const NX_ANGULAR_JSON_PLUGIN_NAME = "nx-angular-json-plugin";
+export declare const NxAngularJsonPlugin: NxPluginV2;
 export declare function shouldMergeAngularProjects(root: string, includeProjectsFromAngularJson: boolean): boolean;
 export declare function isAngularPluginInstalled(): boolean;
-export declare function mergeAngularJsonAndProjects(projects: {
-    [name: string]: ProjectConfiguration;
-}, angularCliWorkspaceRoot: string): {
-    [name: string]: ProjectConfiguration;
-};
 export declare function toNewFormat(w: any): ProjectsConfigurations;
 export declare function toOldFormat(w: any): any;
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/adapter/angular-json.js

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renamePropertyWithStableKeys = exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndProjects = exports.isAngularPluginInstalled = exports.shouldMergeAngularProjects = void 0;
+exports.renamePropertyWithStableKeys = exports.toOldFormat = exports.toNewFormat = exports.isAngularPluginInstalled = exports.shouldMergeAngularProjects = exports.NxAngularJsonPlugin = exports.NX_ANGULAR_JSON_PLUGIN_NAME = void 0;
 const fs_1 = require("fs");
 const path = require("path");
 const fileutils_1 = require("../utils/fileutils");
+exports.NX_ANGULAR_JSON_PLUGIN_NAME = 'nx-angular-json-plugin';
+exports.NxAngularJsonPlugin = {
+    name: exports.NX_ANGULAR_JSON_PLUGIN_NAME,
+    createNodes: [
+        'angular.json',
+        (f, ctx) => ({
+            projects: readAngularJson(ctx.workspaceRoot),
+        }),
+    ],
+};
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
         // Include projects from angular.json if explicitly required.
@@ -38,20 +48,6 @@ exports.isAngularPluginInstalled = isAngularPluginInstalled;
 function readAngularJson(angularCliWorkspaceRoot) {
     return toNewFormat((0, fileutils_1.readJsonFile)(path.join(angularCliWorkspaceRoot, 'angular.json'))).projects;
 }
-function mergeAngularJsonAndProjects(projects, angularCliWorkspaceRoot) {
-    const res = readAngularJson(angularCliWorkspaceRoot);
-    const folders = new Set();
-    for (let k of Object.keys(res)) {
-        folders.add(res[k].root);
-    }
-    for (let k of Object.keys(projects)) {
-        if (!folders.has(projects[k].root)) {
-            res[k] = projects[k];
-        }
-    }
-    return res;
-}
-exports.mergeAngularJsonAndProjects = mergeAngularJsonAndProjects;
 function toNewFormat(w) {
     Object.values(w.projects || {}).forEach((projectConfig) => {
         if (projectConfig.architect) {

package/src/command-line/examples.js

@@ -54,7 +54,7 @@ exports.examples = {
             description: 'Run tests for all the projects affected by the last commit on main',
         },
         {
-            command: "affected -t build --exclude '*,!tag:dotnet'",
+            command: "affected -t=build --exclude='*,!tag:dotnet'",
             description: 'Run build for only projects with the tag `dotnet`',
         },
         {
@@ -317,7 +317,7 @@ exports.examples = {
             description: 'Show affected projects in the workspace',
         },
         {
-            command: 'show projects --affected --exclude *-e2e',
+            command: 'show projects --affected --exclude=*-e2e',
             description: 'Show affected projects in the workspace, excluding end-to-end projects',
         },
         {

package/src/command-line/format/format.js

@@ -9,13 +9,15 @@ const fileutils_1 = require("../../utils/fileutils");
 const file_utils_1 = require("../../project-graph/file-utils");
 const prettier = require("prettier");
 const object_sort_1 = require("../../utils/object-sort");
+const package_json_1 = require("../../utils/package-json");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const project_graph_1 = require("../../project-graph/project-graph");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
 const configuration_1 = require("../../config/configuration");
 const chunkify_1 = require("../../utils/chunkify");
 const all_file_data_1 = require("../../utils/all-file-data");
-const PRETTIER_PATH = require.resolve('prettier/bin-prettier');
+const semver_1 = require("semver");
+const PRETTIER_PATH = getPrettierPath();
 function format(command, args) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
@@ -143,3 +145,10 @@ function sortTsConfig() {
         // catch noop
     }
 }
+function getPrettierPath() {
+    const prettierVersion = (0, package_json_1.readModulePackageJson)('prettier').packageJson.version;
+    if ((0, semver_1.gte)(prettierVersion, '3.0.0')) {
+        return require.resolve('prettier/bin/prettier.cjs');
+    }
+    return require.resolve('prettier/bin-prettier');
+}

package/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -48,7 +48,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
                     karmaProjectConfigFile ? '!{projectRoot}/karma.conf.js' : undefined,
                 ].filter(Boolean)
                 : []),
-            eslintProjectConfigFile ? '!{projectRoot}/.eslintrc.json' : undefined,
+            ...(eslintProjectConfigFile
+                ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                : []),
         ].filter(Boolean),
     };
     nxJson.targetDefaults = {};
@@ -73,6 +75,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
         if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, '.eslintrc.json'))) {
             inputs.push('{workspaceRoot}/.eslintrc.json');
         }
+        if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, 'eslint.config.js'))) {
+            inputs.push('{workspaceRoot}/eslint.config.js');
+        }
         nxJson.targetDefaults.lint = { inputs };
     }
     if (workspaceTargets.includes('e2e')) {

package/src/command-line/show/command-object.js

@@ -50,7 +50,7 @@ const showProjectsCommand = {
         .example('$0 show projects --projects "apps/*"', 'Show all projects in the apps directory')
         .example('$0 show projects --projects "shared-*"', 'Show all projects that start with "shared-"')
         .example('$0 show projects --affected', 'Show affected projects in the workspace')
-        .example('$0 show projects --affected --exclude *-e2e', 'Show affected projects in the workspace, excluding end-to-end projects'),
+        .example('$0 show projects --affected --exclude=*-e2e', 'Show affected projects in the workspace, excluding end-to-end projects'),
     handler: (args) => Promise.resolve().then(() => require('./show')).then((m) => m.showProjectsHandler(args)),
 };
 const showProjectCommand = {

package/src/config/calculate-default-project-name.d.ts

@@ -1,6 +1,4 @@
 import type { NxJsonConfiguration } from './nx-json';
 import { ProjectConfiguration, ProjectsConfigurations } from './workspace-json-project-json';
 export declare function calculateDefaultProjectName(cwd: string, root: string, { projects }: ProjectsConfigurations, nxJson: NxJsonConfiguration): string;
-export declare function findMatchingProjectInCwd(projects: {
-    [projectName: string]: ProjectConfiguration;
-}, relativeCwd: string): string | undefined;
+export declare function findMatchingProjectInCwd(projects: Record<string, ProjectConfiguration>, relativeCwd: string): string | undefined;

package/src/config/configuration.d.ts

@@ -1,9 +1,3 @@
-import { NxJsonConfiguration } from './nx-json';
-import { ProjectsConfigurations } from './workspace-json-project-json';
-/**
- * @deprecated Use readProjectsConfigurationFromProjectGraph(await createProjectGraphAsync())
- */
-export declare function readAllWorkspaceConfiguration(): ProjectsConfigurations & NxJsonConfiguration;
 /**
  * Returns information about where apps and libs will be created.
  */

package/src/config/configuration.js

@@ -1,17 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readNxJson = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = void 0;
-const workspaces_1 = require("./workspaces");
-const workspace_root_1 = require("../utils/workspace-root");
+exports.readNxJson = exports.workspaceLayout = void 0;
 const nx_json_1 = require("./nx-json");
-// TODO(vsavkin): Remove after Nx 16 is out
-/**
- * @deprecated Use readProjectsConfigurationFromProjectGraph(await createProjectGraphAsync())
- */
-function readAllWorkspaceConfiguration() {
-    return new workspaces_1.Workspaces(workspace_root_1.workspaceRoot).readProjectsConfigurations();
-}
-exports.readAllWorkspaceConfiguration = readAllWorkspaceConfiguration;
 /**
  * Returns information about where apps and libs will be created.
  */

package/src/config/workspaces.d.ts

@@ -1,23 +1,15 @@
 import type { NxJsonConfiguration } from './nx-json';
 import { ProjectsConfigurations } from './workspace-json-project-json';
+/**
+ * @deprecated This will be removed in v18. Use {@link readProjectsConfigurationFromProjectGraph} instead.
+ */
 export declare class Workspaces {
     private root;
-    private cachedProjectsConfig;
     constructor(root: string);
     /**
-     * @deprecated
-     */
-    readProjectsConfigurations(opts?: {
-        _includeProjectsFromAngularJson?: boolean;
-    }): ProjectsConfigurations;
-    /**
-     * Deprecated. Use readProjectsConfigurations
+     * @deprecated Use {@link readProjectsConfigurationFromProjectGraph} instead.
      */
-    readWorkspaceConfiguration(opts?: {
-        _ignorePluginInference?: boolean;
-        _includeProjectsFromAngularJson?: boolean;
-    }): ProjectsConfigurations & NxJsonConfiguration;
-    private mergeTargetDefaultsIntoProjectDescriptions;
+    readWorkspaceConfiguration(): ProjectsConfigurations & NxJsonConfiguration;
 }
 /**
  * Pulled from toFileName in names from @nx/devkit.

package/src/config/workspaces.js

@@ -2,57 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toProjectName = exports.Workspaces = void 0;
 const path_1 = require("path");
-const installation_directory_1 = require("../utils/installation-directory");
-const nx_plugin_1 = require("../utils/nx-plugin");
 const nx_json_1 = require("./nx-json");
-const angular_json_1 = require("../adapter/angular-json");
 const retrieve_workspace_files_1 = require("../project-graph/utils/retrieve-workspace-files");
-const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
+// TODO(v18): remove this class
+/**
+ * @deprecated This will be removed in v18. Use {@link readProjectsConfigurationFromProjectGraph} instead.
+ */
 class Workspaces {
     constructor(root) {
         this.root = root;
     }
     /**
-     * @deprecated
+     * @deprecated Use {@link readProjectsConfigurationFromProjectGraph} instead.
      */
-    readProjectsConfigurations(opts) {
-        if (this.cachedProjectsConfig &&
-            process.env.NX_CACHE_PROJECTS_CONFIG !== 'false') {
-            return this.cachedProjectsConfig;
-        }
+    readWorkspaceConfiguration() {
         const nxJson = (0, nx_json_1.readNxJson)(this.root);
-        const projectPaths = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(this.root, nxJson);
-        let projectsConfigurations = (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, projectPaths, (0, nx_plugin_1.loadNxPluginsSync)(nxJson.plugins, (0, installation_directory_1.getNxRequirePaths)(this.root), this.root), this.root).projects;
-        if ((0, angular_json_1.shouldMergeAngularProjects)(this.root, opts === null || opts === void 0 ? void 0 : opts._includeProjectsFromAngularJson)) {
-            projectsConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations, this.root);
-        }
-        this.cachedProjectsConfig = {
-            version: 2,
-            projects: projectsConfigurations,
-        };
-        return this.cachedProjectsConfig;
-    }
-    /**
-     * Deprecated. Use readProjectsConfigurations
-     */
-    readWorkspaceConfiguration(opts) {
-        const nxJson = (0, nx_json_1.readNxJson)(this.root);
-        return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
-    }
-    mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
-        var _a;
-        for (const proj of Object.values(projects)) {
-            if (proj.targets) {
-                for (const targetName of Object.keys((_a = proj.targets) !== null && _a !== void 0 ? _a : {})) {
-                    const projectTargetDefinition = proj.targets[targetName];
-                    const defaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(targetName, nxJson.targetDefaults, projectTargetDefinition.executor);
-                    if (defaults) {
-                        proj.targets[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(proj, targetName, defaults);
-                    }
-                }
-            }
-        }
-        return projects;
+        return Object.assign({ version: 2, projects: (0, retrieve_workspace_files_1.retrieveProjectConfigurationsSync)(this.root, nxJson)
+                .projectNodes }, nxJson);
     }
 }
 exports.Workspaces = Workspaces;

package/src/daemon/server/project-graph-incremental-recomputation.js

@@ -9,7 +9,6 @@ const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
 const fileutils_1 = require("../../utils/fileutils");
 const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const logger_1 = require("./logger");
-const workspaces_1 = require("../../config/workspaces");
 const workspace_root_1 = require("../../utils/workspace-root");
 const child_process_1 = require("child_process");
 const file_hasher_1 = require("../../hasher/file-hasher");
@@ -128,7 +127,7 @@ function processCollectedUpdatedAndDeletedFiles() {
             perf_hooks_1.performance.mark('hash-watched-changes-end');
             perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
             file_hasher_1.fileHasher.incrementalUpdate(updatedFiles, deletedFiles);
-            let nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
+            const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
             const { projectNodes } = yield (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
             const workspaceConfigHash = computeWorkspaceConfigHash(projectNodes);
             logger_1.serverLogger.requestLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
@@ -195,10 +194,10 @@ function createAndSerializeProjectGraph() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             perf_hooks_1.performance.mark('create-project-graph-start');
-            const projectsConfigurations = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot).readProjectsConfigurations();
+            const projectConfigurations = yield (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot));
             const projectFileMap = copyFileMap(exports.projectFileMapWithFiles.projectFileMap);
             const allWorkspaceFiles = copyFileData(exports.projectFileMapWithFiles.allWorkspaceFiles);
-            const { projectGraph, projectFileMapCache } = yield (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projectsConfigurations, knownExternalNodes, projectFileMap, allWorkspaceFiles, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readProjectFileMapCache)(), true);
+            const { projectGraph, projectFileMapCache } = yield (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projectConfigurations.projectNodes, knownExternalNodes, projectFileMap, allWorkspaceFiles, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readProjectFileMapCache)(), true);
             exports.currentProjectFileMapCache = projectFileMapCache;
             exports.currentProjectGraph = projectGraph;
             perf_hooks_1.performance.mark('create-project-graph-end');

package/src/devkit-exports.d.ts

@@ -18,7 +18,7 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  * @category Workspace
  */
 export { Workspaces } from './config/workspaces';
-export { readAllWorkspaceConfiguration, workspaceLayout, } from './config/configuration';
+export { workspaceLayout } from './config/configuration';
 export type { NxPlugin, NxPluginV1, NxPluginV2, ProjectTargetConfigurator, CreateNodes, CreateNodesFunction, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './utils/nx-plugin';
 /**
  * @category Workspace
@@ -108,7 +108,7 @@ export { reverse } from './project-graph/operators';
 /**
  * @category Utils
  */
-export { createProjectGraphAsync, readCachedProjectGraph, } from './project-graph/project-graph';
+export { createProjectGraphAsync, readCachedProjectGraph, readProjectsConfigurationFromProjectGraph, } from './project-graph/project-graph';
 /**
  * @category Utils
  */

package/src/devkit-exports.js

@@ -4,14 +4,14 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.Workspaces = void 0;
+exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
+// TODO(v18): Remove this export
 /**
  * @category Workspace
  */
 var workspaces_1 = require("./config/workspaces");
 Object.defineProperty(exports, "Workspaces", { enumerable: true, get: function () { return workspaces_1.Workspaces; } });
 var configuration_1 = require("./config/configuration");
-Object.defineProperty(exports, "readAllWorkspaceConfiguration", { enumerable: true, get: function () { return configuration_1.readAllWorkspaceConfiguration; } });
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
 /**
  * @category Logger
@@ -115,6 +115,7 @@ Object.defineProperty(exports, "reverse", { enumerable: true, get: function () {
 var project_graph_2 = require("./project-graph/project-graph");
 Object.defineProperty(exports, "createProjectGraphAsync", { enumerable: true, get: function () { return project_graph_2.createProjectGraphAsync; } });
 Object.defineProperty(exports, "readCachedProjectGraph", { enumerable: true, get: function () { return project_graph_2.readCachedProjectGraph; } });
+Object.defineProperty(exports, "readProjectsConfigurationFromProjectGraph", { enumerable: true, get: function () { return project_graph_2.readProjectsConfigurationFromProjectGraph; } });
 /**
  * @category Utils
  */

package/src/devkit-internals.d.ts

@@ -7,3 +7,9 @@ export { createTempNpmDirectory } from './utils/package-manager';
 export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
+export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';
+export { splitTarget } from './utils/split-target';
+export { combineOptionsForExecutor } from './utils/params';
+export { sortObjectByKeys } from './utils/object-sort';
+export { stripIndent } from './utils/logger';
+export { readModulePackageJson } from './utils/package-json';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -14,3 +14,15 @@ var nx_json_1 = require("./config/nx-json");
 Object.defineProperty(exports, "readNxJsonFromDisk", { enumerable: true, get: function () { return nx_json_1.readNxJson; } });
 var calculate_default_project_name_1 = require("./config/calculate-default-project-name");
 Object.defineProperty(exports, "calculateDefaultProjectName", { enumerable: true, get: function () { return calculate_default_project_name_1.calculateDefaultProjectName; } });
+var retrieve_workspace_files_1 = require("./project-graph/utils/retrieve-workspace-files");
+Object.defineProperty(exports, "retrieveProjectConfigurationsWithAngularProjects", { enumerable: true, get: function () { return retrieve_workspace_files_1.retrieveProjectConfigurationsWithAngularProjects; } });
+var split_target_1 = require("./utils/split-target");
+Object.defineProperty(exports, "splitTarget", { enumerable: true, get: function () { return split_target_1.splitTarget; } });
+var params_1 = require("./utils/params");
+Object.defineProperty(exports, "combineOptionsForExecutor", { enumerable: true, get: function () { return params_1.combineOptionsForExecutor; } });
+var object_sort_1 = require("./utils/object-sort");
+Object.defineProperty(exports, "sortObjectByKeys", { enumerable: true, get: function () { return object_sort_1.sortObjectByKeys; } });
+var logger_1 = require("./utils/logger");
+Object.defineProperty(exports, "stripIndent", { enumerable: true, get: function () { return logger_1.stripIndent; } });
+var package_json_1 = require("./utils/package-json");
+Object.defineProperty(exports, "readModulePackageJson", { enumerable: true, get: function () { return package_json_1.readModulePackageJson; } });