nx 18.1.0-canary.20240308-46592d7 → 18.1.0-canary.20240312-9520aa2

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

@@ -12,6 +12,7 @@ const workspace_root_1 = require("../utils/workspace-root");
 const perf_hooks_1 = require("perf_hooks");
 const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 const nx_json_1 = require("../config/nx-json");
+const nx_plugin_1 = require("../utils/nx-plugin");
 /**
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
  * @throws {Error} if there is no cached ProjectGraph to read from
@@ -65,6 +66,7 @@ function readProjectsConfigurationFromProjectGraph(projectGraph) {
 }
 exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFromProjectGraph;
 async function buildProjectGraphAndSourceMapsWithoutDaemon() {
+    // Set this globally to allow plugins to know if they are being called from the project graph creation
     global.NX_GRAPH_CREATION = true;
     const nxJson = (0, nx_json_1.readNxJson)();
     perf_hooks_1.performance.mark('retrieve-project-configurations:start');
@@ -77,6 +79,7 @@ async function buildProjectGraphAndSourceMapsWithoutDaemon() {
     perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
     const projectGraph = (await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, cacheEnabled)).projectGraph;
     perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:end');
+    (0, nx_plugin_1.unregisterPluginTSTranspiler)();
     delete global.NX_GRAPH_CREATION;
     return { projectGraph, sourceMaps };
 }

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

@@ -1,7 +1,7 @@
 import { ProjectGraphProjectNode } from '../../config/project-graph';
 import { ProjectGraphBuilder } from '../project-graph-builder';
 import { ProjectConfiguration, TargetConfiguration } from '../../config/workspace-json-project-json';
-import { CreateDependenciesContext } from '../plugins';
+import { CreateDependenciesContext } from '../../utils/nx-plugin';
 export declare function normalizeProjectNodes(ctx: CreateDependenciesContext, builder: ProjectGraphBuilder): Promise<void>;
 /**
  * Apply target defaults and normalization

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

@@ -1,8 +1,8 @@
 import { NxJsonConfiguration, TargetDefaults } from '../../config/nx-json';
 import { ProjectGraphExternalNode } from '../../config/project-graph';
 import { ProjectConfiguration, TargetConfiguration } from '../../config/workspace-json-project-json';
+import { LoadedNxPlugin } from '../../utils/nx-plugin';
 import { ONLY_MODIFIES_EXISTING_TARGET } from '../../plugins/target-defaults/target-defaults-plugin';
-import { RemotePlugin } from '../plugins/internal-api';
 export type SourceInformation = [file: string, plugin: string];
 export type ConfigurationSourceMaps = Record<string, Record<string, SourceInformation>>;
 export declare function mergeProjectConfigurationIntoRootMap(projectRootMap: Map<string, ProjectConfiguration>, project: ProjectConfiguration & {
@@ -25,7 +25,7 @@ export type ConfigurationResult = {
  * @param root The workspace root
  */
 export declare function buildProjectsConfigurationsFromProjectPathsAndPlugins(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
-plugins: RemotePlugin[], root?: string): Promise<ConfigurationResult>;
+plugins: LoadedNxPlugin[], root?: string): Promise<ConfigurationResult>;
 export declare function readProjectConfigurationsFromRootMap(projectRootMap: Map<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
 /**
  * Merges two targets.

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

@@ -7,8 +7,6 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const target_defaults_plugin_1 = require("../../plugins/target-defaults/target-defaults-plugin");
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
-const utils_1 = require("../plugins/utils");
-const plugin_pool_1 = require("../plugins/plugin-pool");
 function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation, 
 // This function is used when reading project configuration
 // in generators, where we don't want to do this.
@@ -134,25 +132,54 @@ function buildProjectsConfigurationsFromProjectPathsAndPlugins(nxJson, projectFi
 plugins, root = workspace_root_1.workspaceRoot) {
     const results = [];
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const plugin of plugins) {
+    for (const { plugin, options } of plugins) {
         const [pattern, createNodes] = plugin.createNodes ?? [];
+        const pluginResults = [];
+        performance.mark(`${plugin.name}:createNodes - start`);
         if (!pattern) {
             continue;
         }
-        const matchedFiles = [];
-        performance.mark(`${plugin.name}:createNodes - start`);
         for (const file of projectFiles) {
+            performance.mark(`${plugin.name}:createNodes:${file} - start`);
             if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
-                matchedFiles.push(file);
+                try {
+                    let r = createNodes(file, options, {
+                        nxJsonConfiguration: nxJson,
+                        workspaceRoot: root,
+                    });
+                    if (r instanceof Promise) {
+                        pluginResults.push(r
+                            .catch((e) => {
+                            performance.mark(`${plugin.name}:createNodes:${file} - end`);
+                            throw new CreateNodesError(`Unable to create nodes for ${file} using plugin ${plugin.name}.`, e);
+                        })
+                            .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, file, pluginName: plugin.name };
+                        }));
+                    }
+                    else {
+                        performance.mark(`${plugin.name}:createNodes:${file} - end`);
+                        performance.measure(`${plugin.name}:createNodes:${file}`, `${plugin.name}:createNodes:${file} - start`, `${plugin.name}:createNodes:${file} - end`);
+                        pluginResults.push({
+                            ...r,
+                            file,
+                            pluginName: plugin.name,
+                        });
+                    }
+                }
+                catch (e) {
+                    throw new CreateNodesError(`Unable to create nodes for ${file} using plugin ${plugin.name}.`, e);
+                }
             }
         }
-        let r = createNodes(matchedFiles, {
-            nxJsonConfiguration: nxJson,
-            workspaceRoot: root,
-        }).catch((e) => (0, plugin_pool_1.shutdownPluginWorkers)().then(() => {
-            throw e;
+        // If there are no promises (counter undefined) or all promises have resolved (counter === 0)
+        results.push(Promise.all(pluginResults).then((results) => {
+            performance.mark(`${plugin.name}:createNodes - end`);
+            performance.measure(`${plugin.name}:createNodes`, `${plugin.name}:createNodes - start`, `${plugin.name}:createNodes - end`);
+            return results;
         }));
-        results.push(r);
     }
     return Promise.all(results).then((results) => {
         performance.mark('createNodes:merge - start');
@@ -174,7 +201,7 @@ plugins, root = workspace_root_1.workspaceRoot) {
                     mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInfo);
                 }
                 catch (e) {
-                    throw new utils_1.CreateNodesError(`Unable to merge project information for "${project.root}" from ${result.file} using plugin ${result.pluginName}.`, e);
+                    throw new CreateNodesError(`Unable to merge project information for "${project.root}" from ${result.file} using plugin ${result.pluginName}.`, e);
                 }
             }
             Object.assign(externalNodes, pluginExternalNodes);
@@ -234,6 +261,20 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     return projects;
 }
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
+class CreateNodesError extends Error {
+    constructor(msg, cause) {
+        const message = `${msg} ${!cause
+            ? ''
+            : cause instanceof Error
+                ? `\n\n\t Inner Error: ${cause.stack}`
+                : cause}`;
+        // These errors are thrown during a JS callback which is invoked via rust.
+        // The errors messaging gets lost in the rust -> js -> rust transition, but
+        // logging the error here will ensure that it is visible in the console.
+        console.error(message);
+        super(message, { cause });
+    }
+}
 /**
  * Merges two targets.
  *

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

@@ -2,7 +2,7 @@ import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { ProjectGraphExternalNode } from '../../config/project-graph';
 import { ConfigurationSourceMaps } from './project-configuration-utils';
-import { RemotePlugin } from '../plugins/internal-api';
+import { LoadedNxPlugin } from '../../utils/nx-plugin';
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -31,11 +31,7 @@ export type RetrievedGraphNodes = {
     sourceMaps: ConfigurationSourceMaps;
     projectRootMap: Record<string, string>;
 };
-export declare function retrieveProjectConfigurationPaths(root: string, plugins: PluginGlobsOnly): string[];
+export declare function retrieveProjectConfigurationPaths(root: string, plugins: LoadedNxPlugin[]): string[];
 export declare function retrieveProjectConfigurationsWithoutPluginInference(root: string): Promise<Record<string, ProjectConfiguration>>;
-export declare function createProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration, configFiles: string[], plugins: RemotePlugin[]): Promise<RetrievedGraphNodes>;
-type PluginGlobsOnly = Array<{
-    createNodes?: readonly [string, ...unknown[]];
-}>;
-export declare function configurationGlobs(plugins: PluginGlobsOnly): string[];
-export {};
+export declare function createProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration, configFiles: string[], plugins: LoadedNxPlugin[]): Promise<RetrievedGraphNodes>;
+export declare function configurationGlobs(plugins: LoadedNxPlugin[]): string[];

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

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGlobs = exports.createProjectConfigurations = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurationsWithAngularProjects = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
 const perf_hooks_1 = require("perf_hooks");
+const installation_directory_1 = require("../../utils/installation-directory");
 const angular_json_1 = require("../../adapter/angular-json");
 const nx_json_1 = require("../../config/nx-json");
+const package_json_workspaces_1 = require("../../plugins/package-json-workspaces");
 const project_configuration_utils_1 = require("./project-configuration-utils");
-const internal_api_1 = require("../plugins/internal-api");
+const nx_plugin_1 = require("../../utils/nx-plugin");
+const project_json_1 = require("../../plugins/project-json/build-nodes/project-json");
 const workspace_context_1 = require("../../utils/workspace-context");
 const build_all_workspace_files_1 = require("./build-all-workspace-files");
-const path_1 = require("path");
-const plugin_pool_1 = require("../plugins/plugin-pool");
 /**
  * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
  * @throws
@@ -41,22 +42,16 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
  * @param nxJson
  */
 async function retrieveProjectConfigurations(workspaceRoot, nxJson) {
-    const plugins = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
-    const projects = await _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
-    if (!global.NX_GRAPH_CREATION) {
-        await (0, plugin_pool_1.shutdownPluginWorkers)();
-    }
-    return projects;
+    const plugins = await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
+    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
 async function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, nxJson) {
-    const pluginsToLoad = nxJson?.plugins ?? [];
+    const plugins = await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins ?? [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
     if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, true) &&
-        !pluginsToLoad.some((p) => p === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME ||
-            (typeof p === 'object' && p.plugin === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME))) {
-        pluginsToLoad.push((0, path_1.join)(__dirname, '../../adapter/angular-json'));
+        !plugins.some((p) => p.plugin.name === angular_json_1.NX_ANGULAR_JSON_PLUGIN_NAME)) {
+        plugins.push({ plugin: angular_json_1.NxAngularJsonPlugin });
     }
-    const plugins = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], workspaceRoot);
     return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins);
 }
 exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfigurationsWithAngularProjects;
@@ -74,14 +69,17 @@ const projectsWithoutPluginCache = new Map();
 // TODO: This function is called way too often, it should be optimized without this cache
 async function retrieveProjectConfigurationsWithoutPluginInference(root) {
     const nxJson = (0, nx_json_1.readNxJson)(root);
-    const plugins = await (0, internal_api_1.loadNxPlugins)([]); // only load default plugins
+    const plugins = await (0, nx_plugin_1.getDefaultPlugins)(root);
     const projectGlobPatterns = 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 { projects } = await createProjectConfigurations(root, nxJson, projectFiles, plugins);
+    const { projects } = await createProjectConfigurations(root, nxJson, projectFiles, [
+        { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root) },
+        { plugin: project_json_1.ProjectJsonProjectsPlugin },
+    ]);
     projectsWithoutPluginCache.set(cacheKey, projects);
     return projects;
 }
@@ -101,7 +99,7 @@ async function createProjectConfigurations(workspaceRoot, nxJson, configFiles, p
 exports.createProjectConfigurations = createProjectConfigurations;
 function configurationGlobs(plugins) {
     const globPatterns = [];
-    for (const plugin of plugins) {
+    for (const { plugin } of plugins) {
         if (plugin.createNodes) {
             globPatterns.push(plugin.createNodes[0]);
         }

package/src/utils/logger.d.ts

@@ -7,6 +7,5 @@ export declare const logger: {
     log: (...s: any[]) => void;
     debug: (...s: any[]) => void;
     fatal: (...s: any[]) => void;
-    verbose: (...s: any[]) => void;
 };
 export declare function stripIndent(str: string): string;

package/src/utils/logger.js

@@ -34,11 +34,6 @@ exports.logger = {
     fatal: (...s) => {
         console.error(...s);
     },
-    verbose: (...s) => {
-        if (process.env.NX_VERBOSE_LOGGING) {
-            console.log(...s);
-        }
-    },
 };
 function stripIndent(str) {
     const match = str.match(/^[ \t]*(?=\S)/gm);

package/src/{project-graph/plugins/public-api.d.ts → utils/nx-plugin.d.ts}

@@ -1,8 +1,9 @@
-import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
-import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../../config/project-graph';
-import { ProjectConfiguration } from '../../config/workspace-json-project-json';
-import { NxJsonConfiguration } from '../../config/nx-json';
-import { RawProjectGraphDependency } from '../project-graph-builder';
+import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../config/project-graph';
+import { PackageJson } from './package-json';
+import { ProjectConfiguration } from '../config/workspace-json-project-json';
+import { NxJsonConfiguration, PluginConfiguration } from '../config/nx-json';
+import { NxPluginV1 } from './nx-plugin.deprecated';
+import { RawProjectGraphDependency } from '../project-graph/project-graph-builder';
 /**
  * Context for {@link CreateNodesFunction}
  */
@@ -15,7 +16,6 @@ export interface CreateNodesContext {
  * Used for creating nodes for the {@link ProjectGraph}
  */
 export type CreateNodesFunction<T = unknown> = (projectConfigurationFile: string, options: T | undefined, context: CreateNodesContext) => CreateNodesResult | Promise<CreateNodesResult>;
-export type Optional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 export interface CreateNodesResult {
     /**
      * A map of project root -> project configuration
@@ -73,13 +73,47 @@ export type NxPluginV2<TOptions = unknown> = {
      * Provides a file pattern and function that retrieves configuration info from
      * those files. e.g. { '**\/*.csproj': buildProjectsFromCsProjFile }
      */
-    createNodes?: CreateNodes<TOptions>;
+    createNodes?: CreateNodes;
     /**
      * Provides a function to analyze files to create dependencies for the {@link ProjectGraph}
      */
     createDependencies?: CreateDependencies<TOptions>;
 };
+export * from './nx-plugin.deprecated';
 /**
  * A plugin for Nx
  */
 export type NxPlugin = NxPluginV1 | NxPluginV2;
+export type LoadedNxPlugin = {
+    plugin: NxPluginV2 & Pick<NxPluginV1, 'processProjectGraph'>;
+    options?: unknown;
+};
+export declare const nxPluginCache: Map<string, LoadedNxPlugin['plugin']>;
+export declare function getPluginPathAndName(moduleName: string, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): {
+    pluginPath: string;
+    name: any;
+};
+export declare function loadNxPluginAsync(pluginConfiguration: PluginConfiguration, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): Promise<LoadedNxPlugin>;
+export declare function loadNxPlugins(plugins: PluginConfiguration[], paths?: string[], root?: string, projects?: Record<string, ProjectConfiguration>): Promise<LoadedNxPlugin[]>;
+export declare function ensurePluginIsV2(plugin: NxPlugin): NxPluginV2;
+export declare function isNxPluginV2(plugin: NxPlugin): plugin is NxPluginV2;
+export declare function isNxPluginV1(plugin: NxPlugin): plugin is NxPluginV1;
+export declare function readPluginPackageJson(pluginName: string, projects: Record<string, ProjectConfiguration>, paths?: string[]): {
+    path: string;
+    json: PackageJson;
+};
+export declare function resolveLocalNxPlugin(importPath: string, nxJsonConfiguration: NxJsonConfiguration, projects: Record<string, ProjectConfiguration>, root?: string): {
+    path: string;
+    projectConfig: ProjectConfiguration;
+} | null;
+/**
+ * Register swc-node or ts-node if they are not currently registered
+ * with some default settings which work well for Nx plugins.
+ */
+export declare function registerPluginTSTranspiler(): void;
+/**
+ * Unregister the ts-node transpiler if it is registered
+ */
+export declare function unregisterPluginTSTranspiler(): void;
+export declare function getDefaultPlugins(root: string): Promise<LoadedNxPlugin[]>;
+type Optional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

package/src/utils/nx-plugin.deprecated.d.ts

@@ -1,6 +1,6 @@
 import { ProjectGraphProcessor } from '../config/project-graph';
 import { TargetConfiguration } from '../config/workspace-json-project-json';
-import { NxPluginV2 } from '../project-graph/plugins';
+import { LoadedNxPlugin } from './nx-plugin';
 /**
  * @deprecated Add targets to the projects in a {@link CreateNodes} function instead. This will be removed in Nx 19
  */
@@ -28,6 +28,4 @@ export type NxPluginV1 = {
 /**
  * @todo(@agentender) v19: Remove this fn when we remove readWorkspaceConfig
  */
-export declare function getDefaultPluginsSync(root: string): {
-    plugin: NxPluginV2;
-}[];
+export declare function getDefaultPluginsSync(root: string): LoadedNxPlugin[];

package/src/utils/nx-plugin.deprecated.js

@@ -4,7 +4,7 @@ exports.getDefaultPluginsSync = void 0;
 const angular_json_1 = require("../adapter/angular-json");
 const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
 const target_defaults_plugin_1 = require("../plugins/target-defaults/target-defaults-plugin");
-const PackageJsonWorkspacesPlugin = require("../plugins/package-json-workspaces");
+const package_json_workspaces_1 = require("../plugins/package-json-workspaces");
 /**
  * @todo(@agentender) v19: Remove this fn when we remove readWorkspaceConfig
  */
@@ -14,9 +14,9 @@ function getDefaultPluginsSync(root) {
         ...((0, angular_json_1.shouldMergeAngularProjects)(root, false)
             ? [require('../adapter/angular-json').NxAngularJsonPlugin]
             : []),
-        target_defaults_plugin_1.default,
-        PackageJsonWorkspacesPlugin,
-        project_json_1.default,
+        target_defaults_plugin_1.TargetDefaultsPlugin,
+        (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root),
+        project_json_1.ProjectJsonProjectsPlugin,
     ];
     return plugins.map((p) => ({
         plugin: p,