nx 19.2.0-canary.20240531-2cb7ecb → 19.2.0-canary.20240604-0594deb

package/src/daemon/message-types/glob.d.ts

@@ -0,0 +1,7 @@
+export declare const GLOB: "GLOB";
+export type HandleGlobMessage = {
+    type: typeof GLOB;
+    globs: string[];
+    exclude?: string[];
+};
+export declare function isHandleGlobMessage(message: unknown): message is HandleGlobMessage;

package/src/daemon/message-types/glob.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHandleGlobMessage = exports.GLOB = void 0;
+exports.GLOB = 'GLOB';
+function isHandleGlobMessage(message) {
+    return (typeof message === 'object' &&
+        message !== null &&
+        'type' in message &&
+        message['type'] === exports.GLOB);
+}
+exports.isHandleGlobMessage = isHandleGlobMessage;

package/src/daemon/message-types/hash-glob.d.ts

@@ -0,0 +1,7 @@
+export declare const HASH_GLOB: "HASH_GLOB";
+export type HandleHashGlobMessage = {
+    type: typeof HASH_GLOB;
+    globs: string[];
+    exclude?: string[];
+};
+export declare function isHandleHashGlobMessage(message: unknown): message is HandleHashGlobMessage;

package/src/daemon/message-types/hash-glob.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHandleHashGlobMessage = exports.HASH_GLOB = void 0;
+exports.HASH_GLOB = 'HASH_GLOB';
+function isHandleHashGlobMessage(message) {
+    return (typeof message === 'object' &&
+        message !== null &&
+        'type' in message &&
+        message['type'] === exports.HASH_GLOB);
+}
+exports.isHandleHashGlobMessage = isHandleHashGlobMessage;

package/src/daemon/message-types/update-context-files.d.ts

@@ -0,0 +1,7 @@
+export declare const GLOB: "GLOB";
+export type HandleUpdateContextMessage = {
+    type: typeof GLOB;
+    updatedFiles: string[];
+    deletedFiles: string[];
+};
+export declare function isHandleUpdateContextMessage(message: unknown): message is HandleUpdateContextMessage;

package/src/daemon/message-types/update-context-files.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHandleUpdateContextMessage = exports.GLOB = void 0;
+exports.GLOB = 'GLOB';
+function isHandleUpdateContextMessage(message) {
+    return (typeof message === 'object' &&
+        message !== null &&
+        'type' in message &&
+        message['type'] === exports.GLOB);
+}
+exports.isHandleUpdateContextMessage = isHandleUpdateContextMessage;

package/src/daemon/server/handle-context-file-data.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleContextFileData(): Promise<HandlerResult>;

package/src/daemon/server/handle-context-file-data.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleContextFileData = void 0;
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function handleContextFileData() {
+    const files = await (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleContextFileData',
+    };
+}
+exports.handleContextFileData = handleContextFileData;

package/src/daemon/server/handle-get-files-in-directory.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleGetFilesInDirectory(dir: string): Promise<HandlerResult>;

package/src/daemon/server/handle-get-files-in-directory.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleGetFilesInDirectory = void 0;
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function handleGetFilesInDirectory(dir) {
+    const files = await (0, workspace_context_1.getFilesInDirectoryUsingContext)(workspace_root_1.workspaceRoot, dir);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleNxWorkspaceFiles',
+    };
+}
+exports.handleGetFilesInDirectory = handleGetFilesInDirectory;

package/src/daemon/server/handle-glob.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleGlob(globs: string[], exclude?: string[]): Promise<HandlerResult>;

package/src/daemon/server/handle-glob.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleGlob = void 0;
+const workspace_root_1 = require("../../utils/workspace-root");
+const workspace_context_1 = require("../../utils/workspace-context");
+async function handleGlob(globs, exclude) {
+    const files = await (0, workspace_context_1.globWithWorkspaceContext)(workspace_root_1.workspaceRoot, globs, exclude);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleGlob',
+    };
+}
+exports.handleGlob = handleGlob;

package/src/daemon/server/handle-hash-glob.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleHashGlob(globs: string[], exclude?: string[]): Promise<HandlerResult>;

package/src/daemon/server/handle-hash-glob.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleHashGlob = void 0;
+const workspace_root_1 = require("../../utils/workspace-root");
+const workspace_context_1 = require("../../utils/workspace-context");
+async function handleHashGlob(globs, exclude) {
+    const files = await (0, workspace_context_1.hashWithWorkspaceContext)(workspace_root_1.workspaceRoot, globs, exclude);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleHashGlob',
+    };
+}
+exports.handleHashGlob = handleHashGlob;

package/src/daemon/server/handle-nx-workspace-files.d.ts

@@ -0,0 +1,2 @@
+import { HandlerResult } from './server';
+export declare function handleNxWorkspaceFiles(projectRootMap: Record<string, string>): Promise<HandlerResult>;

package/src/daemon/server/handle-nx-workspace-files.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleNxWorkspaceFiles = void 0;
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function handleNxWorkspaceFiles(projectRootMap) {
+    const files = await (0, workspace_context_1.getNxWorkspaceFilesFromContext)(workspace_root_1.workspaceRoot, projectRootMap);
+    return {
+        response: JSON.stringify(files),
+        description: 'handleNxWorkspaceFiles',
+    };
+}
+exports.handleNxWorkspaceFiles = handleNxWorkspaceFiles;

package/src/daemon/server/plugins.js

@@ -13,6 +13,7 @@ async function getPlugins() {
     const pluginsConfiguration = (0, nx_json_1.readNxJson)().plugins ?? [];
     const [result, cleanupFn] = await (0, internal_api_1.loadNxPlugins)(pluginsConfiguration, workspace_root_1.workspaceRoot);
     cleanup = cleanupFn;
+    loadedPlugins = result;
     return result;
 }
 exports.getPlugins = getPlugins;

package/src/daemon/server/server.js

@@ -18,7 +18,6 @@ const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const handle_hash_tasks_1 = require("./handle-hash-tasks");
 const handle_outputs_tracking_1 = require("./handle-outputs-tracking");
 const handle_process_in_background_1 = require("./handle-process-in-background");
-const handle_request_file_data_1 = require("./handle-request-file-data");
 const handle_request_project_graph_1 = require("./handle-request-project-graph");
 const handle_request_shutdown_1 = require("./handle-request-shutdown");
 const logger_1 = require("./logger");
@@ -26,9 +25,20 @@ const outputs_tracking_1 = require("./outputs-tracking");
 const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
 const shutdown_utils_1 = require("./shutdown-utils");
 const watcher_1 = require("./watcher");
+const handle_glob_1 = require("./handle-glob");
+const glob_1 = require("../message-types/glob");
+const get_nx_workspace_files_1 = require("../message-types/get-nx-workspace-files");
+const handle_nx_workspace_files_1 = require("./handle-nx-workspace-files");
+const get_context_file_data_1 = require("../message-types/get-context-file-data");
+const handle_context_file_data_1 = require("./handle-context-file-data");
+const get_files_in_directory_1 = require("../message-types/get-files-in-directory");
+const handle_get_files_in_directory_1 = require("./handle-get-files-in-directory");
+const hash_glob_1 = require("../message-types/hash-glob");
+const handle_hash_glob_1 = require("./handle-hash-glob");
 let performanceObserver;
 let workspaceWatcherError;
 let outputsWatcherError;
+global.NX_DAEMON = true;
 let numberOfOpenConnections = 0;
 const server = (0, net_1.createServer)(async (socket) => {
     numberOfOpenConnections += 1;
@@ -59,8 +69,9 @@ async function handleMessage(socket, data) {
     if (workspaceWatcherError) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, workspaceWatcherError);
     }
-    if (daemonIsOutdated()) {
-        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Lock files changed`, new Error('LOCK-FILES-CHANGED'));
+    const outdated = daemonIsOutdated();
+    if (outdated) {
+        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Daemon outdated`, new Error(outdated));
     }
     (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
     const unparsedPayload = data;
@@ -80,9 +91,6 @@ async function handleMessage(socket, data) {
     else if (payload.type === 'HASH_TASKS') {
         await handleResult(socket, 'HASH_TASKS', () => (0, handle_hash_tasks_1.handleHashTasks)(payload));
     }
-    else if (payload.type === 'REQUEST_FILE_DATA') {
-        await handleResult(socket, 'REQUEST_FILE_DATA', () => (0, handle_request_file_data_1.handleRequestFileData)());
-    }
     else if (payload.type === 'PROCESS_IN_BACKGROUND') {
         await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload));
     }
@@ -98,6 +106,21 @@ async function handleMessage(socket, data) {
     else if (payload.type === 'REGISTER_FILE_WATCHER') {
         file_watcher_sockets_1.registeredFileWatcherSockets.push({ socket, config: payload.config });
     }
+    else if ((0, glob_1.isHandleGlobMessage)(payload)) {
+        await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude));
+    }
+    else if ((0, get_nx_workspace_files_1.isHandleNxWorkspaceFilesMessage)(payload)) {
+        await handleResult(socket, get_nx_workspace_files_1.GET_NX_WORKSPACE_FILES, () => (0, handle_nx_workspace_files_1.handleNxWorkspaceFiles)(payload.projectRootMap));
+    }
+    else if ((0, get_files_in_directory_1.isHandleGetFilesInDirectoryMessage)(payload)) {
+        await handleResult(socket, get_files_in_directory_1.GET_FILES_IN_DIRECTORY, () => (0, handle_get_files_in_directory_1.handleGetFilesInDirectory)(payload.dir));
+    }
+    else if ((0, get_context_file_data_1.isHandleContextFileDataMessage)(payload)) {
+        await handleResult(socket, get_context_file_data_1.GET_CONTEXT_FILE_DATA, () => (0, handle_context_file_data_1.handleContextFileData)());
+    }
+    else if ((0, hash_glob_1.isHandleHashGlobMessage)(payload)) {
+        await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude));
+    }
     else {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
     }
@@ -145,7 +168,13 @@ function registerProcessTerminationListeners() {
 }
 let existingLockHash;
 function daemonIsOutdated() {
-    return nxVersionChanged() || lockFileHashChanged();
+    if (nxVersionChanged()) {
+        return 'NX_VERSION_CHANGED';
+    }
+    else if (lockFileHashChanged()) {
+        return 'LOCK_FILES_CHANGED';
+    }
+    return null;
 }
 function nxVersionChanged() {
     return versions_1.nxVersion !== getInstalledNxVersion();
@@ -192,10 +221,11 @@ const handleWorkspaceChanges = async (err, changeEvents) => {
     }
     try {
         (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
-        if (daemonIsOutdated()) {
+        const outdatedReason = daemonIsOutdated();
+        if (outdatedReason) {
             await (0, shutdown_utils_1.handleServerProcessTermination)({
                 server,
-                reason: 'Lock file changed',
+                reason: outdatedReason,
             });
             return;
         }

package/src/devkit-exports.d.ts

@@ -58,7 +58,7 @@ export { addProjectConfiguration, readProjectConfiguration, removeProjectConfigu
 /**
  * @category Generators
  */
-export { glob } from './generators/utils/glob';
+export { glob, globAsync } from './generators/utils/glob';
 /**
  * @category Generators
  */

package/src/devkit-exports.js

@@ -4,7 +4,7 @@
  * 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.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.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.AggregateCreateNodesError = exports.workspaceLayout = 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.globAsync = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.AggregateCreateNodesError = exports.workspaceLayout = void 0;
 var configuration_1 = require("./config/configuration");
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
 var error_types_1 = require("./project-graph/error-types");
@@ -48,6 +48,7 @@ Object.defineProperty(exports, "getProjects", { enumerable: true, get: function
  */
 var glob_1 = require("./generators/utils/glob");
 Object.defineProperty(exports, "glob", { enumerable: true, get: function () { return glob_1.glob; } });
+Object.defineProperty(exports, "globAsync", { enumerable: true, get: function () { return glob_1.globAsync; } });
 /**
  * @category Generators
  */

package/src/generators/utils/glob.d.ts

@@ -7,5 +7,16 @@ import { Tree } from '../tree';
  * @param tree The file system tree
  * @param patterns A list of glob patterns
  * @returns Normalized paths in the workspace that match the provided glob patterns.
+ * @deprecated Use {@link globAsync} instead.
  */
 export declare function glob(tree: Tree, patterns: string[]): string[];
+/**
+ * Performs a tree-aware glob search on the files in a workspace. Able to find newly
+ * created files and hides deleted files before the updates are committed to disk.
+ * Paths should be unix-style with forward slashes.
+ *
+ * @param tree The file system tree
+ * @param patterns A list of glob patterns
+ * @returns Normalized paths in the workspace that match the provided glob patterns.
+ */
+export declare function globAsync(tree: Tree, patterns: string[]): Promise<string[]>;

package/src/generators/utils/glob.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.glob = void 0;
+exports.globAsync = exports.glob = void 0;
 const minimatch_1 = require("minimatch");
 const globs_1 = require("../../utils/globs");
 const workspace_context_1 = require("../../utils/workspace-context");
@@ -12,9 +12,27 @@ const workspace_context_1 = require("../../utils/workspace-context");
  * @param tree The file system tree
  * @param patterns A list of glob patterns
  * @returns Normalized paths in the workspace that match the provided glob patterns.
+ * @deprecated Use {@link globAsync} instead.
  */
 function glob(tree, patterns) {
-    const matches = new Set((0, workspace_context_1.globWithWorkspaceContext)(tree.root, patterns));
+    return combineGlobResultsWithTree(tree, patterns, (0, workspace_context_1.globWithWorkspaceContextSync)(tree.root, patterns));
+}
+exports.glob = glob;
+/**
+ * Performs a tree-aware glob search on the files in a workspace. Able to find newly
+ * created files and hides deleted files before the updates are committed to disk.
+ * Paths should be unix-style with forward slashes.
+ *
+ * @param tree The file system tree
+ * @param patterns A list of glob patterns
+ * @returns Normalized paths in the workspace that match the provided glob patterns.
+ */
+async function globAsync(tree, patterns) {
+    return combineGlobResultsWithTree(tree, patterns, await (0, workspace_context_1.globWithWorkspaceContext)(tree.root, patterns));
+}
+exports.globAsync = globAsync;
+function combineGlobResultsWithTree(tree, patterns, results) {
+    const matches = new Set(results);
     const combinedGlob = (0, globs_1.combineGlobPatterns)(patterns);
     const matcher = minimatch_1.minimatch.makeRe(combinedGlob);
     if (!matcher) {
@@ -32,4 +50,3 @@ function glob(tree, patterns) {
     }
     return Array.from(matches);
 }
-exports.glob = glob;

package/src/generators/utils/project-configuration.js

@@ -134,7 +134,7 @@ function readAndCombineAllProjectConfigurations(tree) {
         'project.json',
         ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
     ];
-    const globbedFiles = (0, workspace_context_1.globWithWorkspaceContext)(tree.root, patterns);
+    const globbedFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(tree.root, patterns);
     const createdFiles = findCreatedProjectFiles(tree, patterns);
     const deletedFiles = findDeletedProjectFiles(tree, patterns);
     const projectFiles = [...globbedFiles, ...createdFiles].filter((r) => deletedFiles.indexOf(r) === -1);

package/src/project-graph/file-map-utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateFileMap = exports.createFileMap = exports.createFileMapUsingProjectGraph = exports.createProjectFileMapUsingProjectGraph = void 0;
-const client_1 = require("../daemon/client/client");
 const workspace_context_1 = require("../utils/workspace-context");
 const workspace_root_1 = require("../utils/workspace-root");
 const project_graph_1 = require("./project-graph");
@@ -14,13 +13,7 @@ exports.createProjectFileMapUsingProjectGraph = createProjectFileMapUsingProject
 // TODO: refactor this to pull straight from the rust context instead of creating the file map in JS
 async function createFileMapUsingProjectGraph(graph) {
     const configs = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
-    let files;
-    if (client_1.daemonClient.enabled()) {
-        files = await client_1.daemonClient.getAllFileData();
-    }
-    else {
-        files = (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
-    }
+    let files = await (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
     return createFileMap(configs, files);
 }
 exports.createFileMapUsingProjectGraph = createFileMapUsingProjectGraph;

package/src/project-graph/file-utils.js

@@ -11,11 +11,10 @@ const json_diff_1 = require("../utils/json-diff");
 const project_graph_1 = require("./project-graph");
 const angular_json_1 = require("../adapter/angular-json");
 const ignore_1 = require("../utils/ignore");
-const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 const project_configuration_utils_1 = require("./utils/project-configuration-utils");
-const nx_plugin_deprecated_1 = require("../utils/nx-plugin.deprecated");
-const minimatch_1 = require("minimatch");
-const package_json_next_to_project_json_1 = require("../plugins/project-json/build-nodes/package-json-next-to-project-json");
+const package_json_workspaces_1 = require("../plugins/package-json-workspaces");
+const workspace_context_1 = require("../utils/workspace-context");
+const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
 class WholeFileChange {
     constructor() {
         this.type = 'WholeFileChange';
@@ -115,7 +114,7 @@ function readWorkspaceConfig(opts) {
     catch {
         configuration = {
             version: 2,
-            projects: getProjectsSyncNoInference(root, nxJson).projects,
+            projects: getProjectsSync(root, nxJson),
         };
     }
     if (opts.format === 'angularCli') {
@@ -142,38 +141,38 @@ exports.readPackageJson = readPackageJson;
 /**
  * TODO(v20): Remove this function.
  */
-function getProjectsSyncNoInference(root, nxJson) {
-    const allConfigFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(root, (0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root));
-    const plugins = [
-        package_json_next_to_project_json_1.PackageJsonProjectsNextToProjectJsonPlugin,
-        ...(0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root),
+function getProjectsSync(root, nxJson) {
+    /**
+     * We can't update projects that come from plugins anyways, so we are going
+     * to ignore them for now. Plugins should add their own add/create/update methods
+     * if they would like to use devkit to update inferred projects.
+     */
+    const patterns = [
+        '**/project.json',
+        'project.json',
+        ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(root, fileutils_1.readJsonFile),
     ];
-    const projectRootMap = {};
-    // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const plugin of plugins) {
-        const [pattern, createNodes] = plugin.createNodes ?? [];
-        if (!pattern) {
-            continue;
+    const projectFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(root, patterns);
+    const rootMap = {};
+    for (const projectFile of projectFiles) {
+        if ((0, path_1.basename)(projectFile) === 'project.json') {
+            const json = (0, fileutils_1.readJsonFile)(projectFile);
+            const config = (0, project_json_1.buildProjectFromProjectJson)(json, projectFile);
+            (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, config, undefined, undefined, true);
         }
-        const matchingConfigFiles = allConfigFiles.filter((file) => (0, minimatch_1.minimatch)(file, pattern, { dot: true }));
-        for (const file of matchingConfigFiles) {
-            if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
-                let r = createNodes(file, {}, {
-                    nxJsonConfiguration: nxJson,
-                    workspaceRoot: root,
-                    configFiles: matchingConfigFiles,
-                });
-                for (const node in r.projects) {
-                    const project = {
-                        root: node,
-                        ...r.projects[node],
-                    };
-                    (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(projectRootMap, project);
-                }
+        else if ((0, path_1.basename)(projectFile) === 'package.json') {
+            const packageJson = (0, fileutils_1.readJsonFile)(projectFile);
+            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, projectFile, nxJson);
+            if (!rootMap[config.root]) {
+                (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
+                // Inferred targets, tags, etc don't show up when running generators
+                // This is to help avoid running into issues when trying to update the workspace
+                {
+                    name: config.name,
+                    root: config.root,
+                }, undefined, undefined, true);
             }
         }
     }
-    return {
-        projects: (0, project_configuration_utils_1.readProjectConfigurationsFromRootMap)(projectRootMap),
-    };
+    return (0, project_configuration_utils_1.readProjectConfigurationsFromRootMap)(rootMap);
 }

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -15,17 +15,18 @@ function loadRemoteNxPlugin(plugin, root) {
     // but its typescript.
     const isWorkerTypescript = path.extname(__filename) === '.ts';
     const workerPath = path.join(__dirname, 'plugin-worker');
+    const env = {
+        ...process.env,
+        ...(isWorkerTypescript
+            ? {
+                // Ensures that the worker uses the same tsconfig as the main process
+                TS_NODE_PROJECT: path.join(__dirname, '../../../../tsconfig.lib.json'),
+            }
+            : {}),
+    };
     const worker = (0, child_process_1.fork)(workerPath, [], {
         stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
-        env: {
-            ...process.env,
-            ...(isWorkerTypescript
-                ? {
-                    // Ensures that the worker uses the same tsconfig as the main process
-                    TS_NODE_PROJECT: path.join(__dirname, '../../../tsconfig.lib.json'),
-                }
-                : {}),
-        },
+        env,
         execArgv: [
             ...process.execArgv,
             // If the worker is typescript, we need to register ts-node

package/src/project-graph/plugins/utils.d.ts

@@ -5,4 +5,4 @@ export declare function isNxPluginV2(plugin: NxPlugin): plugin is NxPluginV2;
 export declare function isNxPluginV1(plugin: NxPlugin | LoadedNxPlugin): plugin is NxPluginV1;
 export declare function normalizeNxPlugin(plugin: NxPlugin): NormalizedPlugin;
 export type AsyncFn<T extends Function> = T extends (...args: infer A) => infer R ? (...args: A) => Promise<Awaited<R>> : never;
-export declare function createNodesFromFiles<T = unknown>(createNodes: CreateNodesFunction, configFiles: readonly string[], options: T, context: CreateNodesContextV2): Promise<[file: string, value: CreateNodesResult][]>;
+export declare function createNodesFromFiles<T = unknown>(createNodes: CreateNodesFunction<T>, configFiles: readonly string[], options: T, context: CreateNodesContextV2): Promise<[file: string, value: CreateNodesResult][]>;

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("../file-utils").FileData[];
+    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("../../native").FileData[];
+        nonProjectFiles: import("nx/src/native").FileData[];
     };
-    rustReferences: import("../../native").NxWorkspaceFilesExternals;
+    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.
@@ -23,7 +23,7 @@ export declare function retrieveProjectConfigurations(plugins: LoadedNxPlugin[],
 export declare function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<ConfigurationResult>;
 export declare function retrieveProjectConfigurationPaths(root: string, plugins: Array<{
     createNodes?: readonly [string, ...unknown[]];
-} & unknown>): string[];
+} & unknown>): Promise<string[]>;
 export declare function retrieveProjectConfigurationsWithoutPluginInference(root: string): Promise<Record<string, ProjectConfiguration>>;
 export declare function configurationGlobs(plugins: Array<{
     createNodes?: readonly [string, ...unknown[]];

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -20,7 +20,7 @@ async function retrieveWorkspaceFiles(workspaceRoot, projectRootMap) {
     perf_hooks_1.performance.mark('native-file-deps:end');
     perf_hooks_1.performance.measure('native-file-deps', 'native-file-deps:start', 'native-file-deps:end');
     perf_hooks_1.performance.mark('get-workspace-files:start');
-    const { projectFileMap, globalFiles, externalReferences } = (0, workspace_context_1.getNxWorkspaceFilesFromContext)(workspaceRoot, projectRootMap);
+    const { projectFileMap, globalFiles, externalReferences } = await (0, workspace_context_1.getNxWorkspaceFilesFromContext)(workspaceRoot, projectRootMap);
     perf_hooks_1.performance.mark('get-workspace-files:end');
     perf_hooks_1.performance.measure('get-workspace-files', 'get-workspace-files:start', 'get-workspace-files:end');
     return {
@@ -36,9 +36,9 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.
  */
-function retrieveProjectConfigurations(plugins, workspaceRoot, nxJson) {
+async function retrieveProjectConfigurations(plugins, workspaceRoot, nxJson) {
     const globPatterns = configurationGlobs(plugins);
-    const workspaceFiles = (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, globPatterns);
+    const workspaceFiles = await (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, globPatterns);
     return (0, project_configuration_utils_1.createProjectConfigurations)(workspaceRoot, nxJson, workspaceFiles, plugins);
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
@@ -50,7 +50,7 @@ async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, n
         pluginsToLoad.push((0, path_1.join)(__dirname, '../../adapter/angular-json'));
     }
     const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
-    const res = retrieveProjectConfigurations(plugins, workspaceRoot, nxJson);
+    const res = await retrieveProjectConfigurations(plugins, workspaceRoot, nxJson);
     cleanup();
     return res;
 }
@@ -65,12 +65,12 @@ const projectsWithoutPluginCache = new Map();
 async function retrieveProjectConfigurationsWithoutPluginInference(root) {
     const nxJson = (0, nx_json_1.readNxJson)(root);
     const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)([]); // only load default plugins
-    const projectGlobPatterns = retrieveProjectConfigurationPaths(root, plugins);
+    const projectGlobPatterns = await retrieveProjectConfigurationPaths(root, plugins);
     const cacheKey = root + ',' + projectGlobPatterns.join(',');
     if (projectsWithoutPluginCache.has(cacheKey)) {
         return projectsWithoutPluginCache.get(cacheKey);
     }
-    const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns) ?? [];
+    const projectFiles = (await (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns)) ?? [];
     const { projects } = await (0, project_configuration_utils_1.createProjectConfigurations)(root, nxJson, projectFiles, plugins);
     projectsWithoutPluginCache.set(cacheKey, projects);
     cleanup();

package/src/utils/all-file-data.js

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.allFileData = void 0;
-const client_1 = require("../daemon/client/client");
 const workspace_context_1 = require("./workspace-context");
 const workspace_root_1 = require("./workspace-root");
 function allFileData() {
-    if (client_1.daemonClient.enabled()) {
-        return client_1.daemonClient.getAllFileData();
-    }
-    else {
-        return Promise.resolve((0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot));
-    }
+    return (0, workspace_context_1.getAllFileDataInContext)(workspace_root_1.workspaceRoot);
 }
 exports.allFileData = allFileData;