nx 18.3.0-canary.20240413-134cbbc → 18.3.0

package/src/core/graph/runtime.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={666:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={1:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{22232:()=>{}},s=>{var e;e=22232,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[2],{22232:(s,e,k)=>{k.r(e)}},s=>{var e;e=22232,s(s.s=e)}]);

package/src/devkit-internals.d.ts

@@ -17,4 +17,7 @@ export { splitByColons } from './utils/split-target';
 export { hashObject } from './hasher/file-hasher';
 export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
+export { retrieveProjectConfigurations } from './project-graph/utils/retrieve-workspace-files';
+export { LoadedNxPlugin } from './project-graph/plugins/internal-api';
+export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';

package/src/devkit-internals.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsProject = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -35,5 +36,10 @@ Object.defineProperty(exports, "hashWithWorkspaceContext", { enumerable: true, g
 var find_project_for_path_1 = require("./project-graph/utils/find-project-for-path");
 Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations; } });
 Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return find_project_for_path_1.findProjectForPath; } });
+var retrieve_workspace_files_2 = require("./project-graph/utils/retrieve-workspace-files");
+Object.defineProperty(exports, "retrieveProjectConfigurations", { enumerable: true, get: function () { return retrieve_workspace_files_2.retrieveProjectConfigurations; } });
+var internal_api_1 = require("./project-graph/plugins/internal-api");
+Object.defineProperty(exports, "LoadedNxPlugin", { enumerable: true, get: function () { return internal_api_1.LoadedNxPlugin; } });
+tslib_1.__exportStar(require("./project-graph/error-types"), exports);
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });

package/src/project-graph/error-types.d.ts

@@ -1,9 +1,20 @@
 import { CreateNodesResultWithContext } from './plugins/internal-api';
 import { ConfigurationResult } from './utils/project-configuration-utils';
+import { ProjectConfiguration } from '../config/workspace-json-project-json';
+export declare class ProjectsWithConflictingNamesError extends Error {
+    projects: Record<string, ProjectConfiguration>;
+    constructor(conflicts: Map<string, string[]>, projects: Record<string, ProjectConfiguration>);
+}
+export declare function isProjectsWithConflictingNamesError(e: unknown): e is ProjectsWithConflictingNamesError;
+export declare class ProjectsWithNoNameError extends Error {
+    projects: Record<string, ProjectConfiguration>;
+    constructor(projectRoots: string[], projects: Record<string, ProjectConfiguration>);
+}
+export declare function isProjectsWithNoNameError(e: unknown): e is ProjectsWithNoNameError;
 export declare class ProjectConfigurationsError extends Error {
-    readonly errors: Array<MergeNodesError | CreateNodesError>;
+    readonly errors: Array<MergeNodesError | CreateNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError>;
     readonly partialProjectConfigurationsResult: ConfigurationResult;
-    constructor(errors: Array<MergeNodesError | CreateNodesError>, partialProjectConfigurationsResult: ConfigurationResult);
+    constructor(errors: Array<MergeNodesError | CreateNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError>, partialProjectConfigurationsResult: ConfigurationResult);
 }
 export declare class CreateNodesError extends Error {
     file: string;

package/src/project-graph/error-types.js

@@ -1,6 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateNodesError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.CreateNodesError = exports.ProjectConfigurationsError = void 0;
+exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateNodesError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.CreateNodesError = exports.ProjectConfigurationsError = exports.isProjectsWithNoNameError = exports.ProjectsWithNoNameError = exports.isProjectsWithConflictingNamesError = exports.ProjectsWithConflictingNamesError = void 0;
+class ProjectsWithConflictingNamesError extends Error {
+    constructor(conflicts, projects) {
+        super([
+            `The following projects are defined in multiple locations:`,
+            ...Array.from(conflicts.entries()).map(([project, roots]) => [`- ${project}: `, ...roots.map((r) => `  - ${r}`)].join('\n')),
+            '',
+            "To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.",
+        ].join('\n'));
+        this.projects = projects;
+        this.name = this.constructor.name;
+    }
+}
+exports.ProjectsWithConflictingNamesError = ProjectsWithConflictingNamesError;
+function isProjectsWithConflictingNamesError(e) {
+    return (e instanceof ProjectsWithConflictingNamesError ||
+        (typeof e === 'object' &&
+            'name' in e &&
+            e?.name === ProjectsWithConflictingNamesError.prototype.name));
+}
+exports.isProjectsWithConflictingNamesError = isProjectsWithConflictingNamesError;
+class ProjectsWithNoNameError extends Error {
+    constructor(projectRoots, projects) {
+        super(`The projects in the following directories have no name provided:\n  - ${projectRoots.join('\n  - ')}`);
+        this.projects = projects;
+        this.name = this.constructor.name;
+    }
+}
+exports.ProjectsWithNoNameError = ProjectsWithNoNameError;
+function isProjectsWithNoNameError(e) {
+    return (e instanceof ProjectsWithNoNameError ||
+        (typeof e === 'object' &&
+            'name' in e &&
+            e?.name === ProjectsWithNoNameError.prototype.name));
+}
+exports.isProjectsWithNoNameError = isProjectsWithNoNameError;
 class ProjectConfigurationsError extends Error {
     constructor(errors, partialProjectConfigurationsResult) {
         super('Failed to create project configurations');
@@ -44,22 +79,18 @@ class MergeNodesError extends Error {
 exports.MergeNodesError = MergeNodesError;
 function isCreateNodesError(e) {
     return (e instanceof CreateNodesError ||
-        (typeof e === 'object' &&
-            'name' in e &&
-            e?.name === CreateNodesError.prototype.name));
+        (typeof e === 'object' && 'name' in e && e?.name === CreateNodesError.name));
 }
 exports.isCreateNodesError = isCreateNodesError;
 function isAggregateCreateNodesError(e) {
     return (e instanceof AggregateCreateNodesError ||
         (typeof e === 'object' &&
             'name' in e &&
-            e?.name === AggregateCreateNodesError.prototype.name));
+            e?.name === AggregateCreateNodesError.name));
 }
 exports.isAggregateCreateNodesError = isAggregateCreateNodesError;
 function isMergeNodesError(e) {
     return (e instanceof MergeNodesError ||
-        (typeof e === 'object' &&
-            'name' in e &&
-            e?.name === MergeNodesError.prototype.name));
+        (typeof e === 'object' && 'name' in e && e?.name === MergeNodesError.name));
 }
 exports.isMergeNodesError = isMergeNodesError;

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

@@ -41,6 +41,8 @@ function normalizeNxPlugin(plugin) {
 exports.normalizeNxPlugin = normalizeNxPlugin;
 async function runCreateNodesInParallel(configFiles, plugin, options, context) {
     performance.mark(`${plugin.name}:createNodes - start`);
+    const errors = [];
+    const results = [];
     const promises = configFiles.map((file) => {
         performance.mark(`${plugin.name}:createNodes:${file} - start`);
         // Result is either static or a promise, using Promise.resolve lets us
@@ -49,40 +51,30 @@ async function runCreateNodesInParallel(configFiles, plugin, options, context) {
         return value
             .catch((e) => {
             performance.mark(`${plugin.name}:createNodes:${file} - end`);
-            return new error_types_1.CreateNodesError({
+            errors.push(new error_types_1.CreateNodesError({
                 error: e,
                 pluginName: plugin.name,
                 file,
-            });
+            }));
+            return null;
         })
             .then((r) => {
             performance.mark(`${plugin.name}:createNodes:${file} - end`);
             performance.measure(`${plugin.name}:createNodes:${file}`, `${plugin.name}:createNodes:${file} - start`, `${plugin.name}:createNodes:${file} - end`);
-            return { ...r, pluginName: plugin.name, file };
+            // Existing behavior is to ignore null results of
+            // createNodes function.
+            if (r) {
+                results.push(r);
+            }
         });
     });
-    const results = await Promise.all(promises).then((results) => {
+    await Promise.all(promises).then(() => {
         performance.mark(`${plugin.name}:createNodes - end`);
         performance.measure(`${plugin.name}:createNodes`, `${plugin.name}:createNodes - start`, `${plugin.name}:createNodes - end`);
-        return results;
     });
-    const [errors, successful] = partition(results, (r) => r instanceof error_types_1.CreateNodesError);
     if (errors.length > 0) {
-        throw new error_types_1.AggregateCreateNodesError(plugin.name, errors, successful);
+        throw new error_types_1.AggregateCreateNodesError(plugin.name, errors, results);
     }
     return results;
 }
 exports.runCreateNodesInParallel = runCreateNodesInParallel;
-function partition(arr, test) {
-    const pass = [];
-    const fail = [];
-    for (const item of arr) {
-        if (test(item)) {
-            pass.push(item);
-        }
-        else {
-            fail.push(item);
-        }
-    }
-    return [pass, fail];
-}

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

@@ -2,7 +2,7 @@ import { ProcessDependenciesError, ProcessProjectGraphError } from './build-proj
 import { ProjectGraph } from '../config/project-graph';
 import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
 import { ConfigurationSourceMaps } from './utils/project-configuration-utils';
-import { CreateNodesError, MergeNodesError } from './error-types';
+import { CreateNodesError, MergeNodesError, ProjectsWithNoNameError, ProjectsWithConflictingNamesError } from './error-types';
 import { DaemonProjectGraphError } from '../daemon/daemon-project-graph-error';
 /**
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
@@ -20,7 +20,7 @@ export declare function buildProjectGraphAndSourceMapsWithoutDaemon(): Promise<{
 }>;
 export declare class ProjectGraphError extends Error {
     #private;
-    constructor(errors: Array<CreateNodesError | MergeNodesError | ProcessDependenciesError | ProcessProjectGraphError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
+    constructor(errors: Array<CreateNodesError | MergeNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError | ProcessDependenciesError | ProcessProjectGraphError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
     /**
      * The daemon cannot throw errors which contain methods as they are not serializable.
      *
@@ -34,7 +34,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (CreateNodesError | ProcessDependenciesError | ProcessProjectGraphError)[];
+    getErrors(): (ProjectsWithConflictingNamesError | ProjectsWithNoNameError | MergeNodesError | CreateNodesError | ProcessDependenciesError | ProcessProjectGraphError)[];
 }
 /**
  * Computes and returns a ProjectGraph.

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

@@ -291,7 +291,20 @@ plugins) {
             }
             Object.assign(externalNodes, pluginExternalNodes);
         }
-        const projects = readProjectConfigurationsFromRootMap(projectRootMap);
+        let projects;
+        try {
+            projects = readProjectConfigurationsFromRootMap(projectRootMap);
+        }
+        catch (e) {
+            if ((0, error_types_1.isProjectsWithNoNameError)(e) ||
+                (0, error_types_1.isProjectsWithConflictingNamesError)(e)) {
+                projects = e.projects;
+                errors.push(e);
+            }
+            else {
+                throw e;
+            }
+        }
         const rootMap = createRootMap(projectRootMap);
         perf_hooks_1.performance.mark('createNodes:merge - end');
         perf_hooks_1.performance.measure('createNodes:merge', 'createNodes:merge - start', 'createNodes:merge - end');
@@ -321,7 +334,8 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     // If there are projects that have the same name, that is an error.
     // This object tracks name -> (all roots of projects with that name)
     // to provide better error messaging.
-    const errors = new Map();
+    const conflicts = new Map();
+    const projectRootsWithNoName = [];
     for (const [root, configuration] of projectRootMap.entries()) {
         // We're setting `// targets` as a comment `targets` is empty due to Project Crystal.
         // Strip it before returning configuration for usage.
@@ -333,27 +347,26 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
                 configuration.name = name;
             }
             catch {
-                throw new Error(`Project at ${root} has no name provided.`);
+                projectRootsWithNoName.push(root);
             }
         }
         if (configuration.name in projects) {
-            let rootErrors = errors.get(configuration.name) ?? [
+            let rootErrors = conflicts.get(configuration.name) ?? [
                 projects[configuration.name].root,
             ];
             rootErrors.push(root);
-            errors.set(configuration.name, rootErrors);
+            conflicts.set(configuration.name, rootErrors);
+            projects[configuration.name] = configuration;
         }
         else {
             projects[configuration.name] = configuration;
         }
     }
-    if (errors.size > 0) {
-        throw new Error([
-            `The following projects are defined in multiple locations:`,
-            ...Array.from(errors.entries()).map(([project, roots]) => [`- ${project}: `, ...roots.map((r) => `  - ${r}`)].join('\n')),
-            '',
-            "To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.",
-        ].join('\n'));
+    if (conflicts.size > 0) {
+        throw new error_types_1.ProjectsWithConflictingNamesError(conflicts, projects);
+    }
+    if (projectRootsWithNoName.length > 0) {
+        throw new error_types_1.ProjectsWithNoNameError(projectRootsWithNoName, projects);
     }
     return projects;
 }

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("nx/src/devkit-exports").FileData[];
+    allWorkspaceFiles: import("../file-utils").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("nx/src/native").FileData[];
+        nonProjectFiles: import("../../native").FileData[];
     };
-    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
+    rustReferences: import("../../native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.

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

@@ -36,9 +36,10 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.
  */
-async function retrieveProjectConfigurations(plugins, workspaceRoot, nxJson) {
-    const projects = await _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
-    return projects;
+function retrieveProjectConfigurations(plugins, workspaceRoot, nxJson) {
+    const globPatterns = configurationGlobs(plugins);
+    const workspaceFiles = (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, globPatterns);
+    return (0, project_configuration_utils_1.createProjectConfigurations)(workspaceRoot, nxJson, workspaceFiles, plugins);
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
 async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, nxJson) {
@@ -49,16 +50,11 @@ 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(workspaceRoot, nxJson, plugins);
+    const res = retrieveProjectConfigurations(plugins, workspaceRoot, nxJson);
     cleanup();
     return res;
 }
 exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfigurationsWithAngularProjects;
-function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins) {
-    const globPatterns = configurationGlobs(plugins);
-    const workspaceFiles = (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, globPatterns);
-    return (0, project_configuration_utils_1.createProjectConfigurations)(workspaceRoot, nxJson, workspaceFiles, plugins);
-}
 function retrieveProjectConfigurationPaths(root, plugins) {
     const projectGlobPatterns = configurationGlobs(plugins);
     return (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns);