nx 21.3.0-canary.20250710-13551c9 → 21.3.0-canary.20250711-be6d35b

package/src/utils/consume-messages-from-socket.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MESSAGE_END_SEQ = void 0;
 exports.consumeMessagesFromSocket = consumeMessagesFromSocket;
-exports.isJsonMessage = isJsonMessage;
-exports.MESSAGE_END_SEQ = 'NX_MSG_END' + String.fromCharCode(4);
 function consumeMessagesFromSocket(callback) {
     let message = '';
     return (data) => {
         const chunk = data.toString();
-        if (chunk.endsWith(exports.MESSAGE_END_SEQ)) {
-            message += chunk.substring(0, chunk.length - exports.MESSAGE_END_SEQ.length);
+        if (chunk.codePointAt(chunk.length - 1) === 4) {
+            message += chunk.substring(0, chunk.length - 1);
             // Server may send multiple messages in one chunk, so splitting by 0x4
-            const messages = message.split(exports.MESSAGE_END_SEQ);
+            const messages = message.split('');
             for (const splitMessage of messages) {
                 callback(splitMessage);
             }
@@ -22,15 +19,3 @@ function consumeMessagesFromSocket(callback) {
         }
     };
 }
-function isJsonMessage(message) {
-    return (
-    // json objects
-    ['[', '{'].some((prefix) => message.startsWith(prefix)) ||
-        // booleans
-        message === 'true' ||
-        message === 'false' ||
-        // strings
-        (message.startsWith('"') && message.endsWith('"')) ||
-        // numbers
-        /^[0-9]+(\.?[0-9]+)?$/.test(message));
-}

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

@@ -1,7 +1,11 @@
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
+import type { ProjectConfiguration } from '../config/workspace-json-project-json';
 export declare function projectHasTarget(project: ProjectGraphProjectNode, target: string): boolean;
 export declare function projectHasTargetAndConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string): any;
-export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph): [projectDirs: string[], warnings: string[]];
+export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph): [
+    projectDirs: string[],
+    warnings: string[]
+];
 /**
  * Find all internal project dependencies.
  * All the external (npm) dependencies will be filtered out unless includeExternalDependencies is set to true
@@ -11,3 +15,4 @@ export declare function getSourceDirOfDependentProjects(projectName: string, pro
  * @returns {string[]}
  */
 export declare function findAllProjectNodeDependencies(parentNodeName: string, projectGraph?: ProjectGraph, includeExternalDependencies?: boolean): string[];
+export declare function getProjectSourceRoot(project: ProjectConfiguration): string | undefined;

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

@@ -4,6 +4,9 @@ exports.projectHasTarget = projectHasTarget;
 exports.projectHasTargetAndConfiguration = projectHasTargetAndConfiguration;
 exports.getSourceDirOfDependentProjects = getSourceDirOfDependentProjects;
 exports.findAllProjectNodeDependencies = findAllProjectNodeDependencies;
+exports.getProjectSourceRoot = getProjectSourceRoot;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const project_graph_1 = require("../project-graph/project-graph");
 function projectHasTarget(project, target) {
     return !!(project.data &&
@@ -21,12 +24,8 @@ function getSourceDirOfDependentProjects(projectName, projectGraph = (0, project
     }
     const nodeNames = findAllProjectNodeDependencies(projectName, projectGraph);
     return nodeNames.reduce((result, nodeName) => {
-        if (projectGraph.nodes[nodeName].data.sourceRoot) {
-            result[0].push(projectGraph.nodes[nodeName].data.sourceRoot);
-        }
-        else {
-            result[1].push(nodeName);
-        }
+        const sourceRoot = getProjectSourceRoot(projectGraph.nodes[nodeName].data);
+        result[0].push(sourceRoot);
         return result;
     }, [[], []]);
 }
@@ -71,3 +70,9 @@ function collectDependentProjectNodesNames(nxDeps, dependencyNodeNames, parentNo
         collectDependentProjectNodesNames(nxDeps, dependencyNodeNames, dependencyName, includeExternalDependencies);
     }
 }
+function getProjectSourceRoot(project) {
+    return (project.sourceRoot ??
+        ((0, node_fs_1.existsSync)(node_path_1.posix.join(project.root, 'src'))
+            ? node_path_1.posix.join(project.root, 'src')
+            : project.root));
+}