nx 18.1.3 → 18.2.0-beta.1

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGlobs = exports.createProjectConfigurations = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurationsWithAngularProjects = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
+exports.configurationGlobs = 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");
@@ -58,7 +58,7 @@ exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfig
 function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins) {
     const globPatterns = configurationGlobs(plugins);
     const workspaceFiles = (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, globPatterns);
-    return createProjectConfigurations(workspaceRoot, nxJson, workspaceFiles, plugins);
+    return (0, project_configuration_utils_1.createProjectConfigurations)(workspaceRoot, nxJson, workspaceFiles, plugins);
 }
 function retrieveProjectConfigurationPaths(root, plugins) {
     const projectGlobPatterns = configurationGlobs(plugins);
@@ -76,7 +76,7 @@ async function retrieveProjectConfigurationsWithoutPluginInference(root) {
         return projectsWithoutPluginCache.get(cacheKey);
     }
     const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns) ?? [];
-    const { projects } = await createProjectConfigurations(root, nxJson, projectFiles, [
+    const { projects } = await (0, project_configuration_utils_1.createProjectConfigurations)(root, nxJson, projectFiles, [
         { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root) },
         { plugin: project_json_1.ProjectJsonProjectsPlugin },
     ]);
@@ -84,19 +84,6 @@ async function retrieveProjectConfigurationsWithoutPluginInference(root) {
     return projects;
 }
 exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectConfigurationsWithoutPluginInference;
-async function createProjectConfigurations(workspaceRoot, nxJson, configFiles, plugins) {
-    perf_hooks_1.performance.mark('build-project-configs:start');
-    const { projects, externalNodes, rootMap, sourceMaps } = await (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, configFiles, plugins, workspaceRoot);
-    perf_hooks_1.performance.mark('build-project-configs:end');
-    perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
-    return {
-        projects,
-        externalNodes,
-        projectRootMap: rootMap,
-        sourceMaps,
-    };
-}
-exports.createProjectConfigurations = createProjectConfigurations;
 function configurationGlobs(plugins) {
     const globPatterns = [];
     for (const { plugin } of plugins) {

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

@@ -91,6 +91,8 @@ export type NxPlugin = NxPluginV1 | NxPluginV2;
 export type LoadedNxPlugin = {
     plugin: NxPluginV2 & Pick<NxPluginV1, 'processProjectGraph'>;
     options?: unknown;
+    include?: string[];
+    exclude?: string[];
 };
 export declare const nxPluginCache: Map<string, LoadedNxPlugin['plugin']>;
 export declare function getPluginPathAndName(moduleName: string, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): {

package/src/utils/nx-plugin.js

@@ -71,8 +71,19 @@ async function loadNxPluginAsync(pluginConfiguration, paths, projects, root) {
         ? pluginConfiguration
         : { plugin: pluginConfiguration, options: undefined };
     let pluginModule = exports.nxPluginCache.get(moduleName);
+    const include = typeof pluginConfiguration === 'object'
+        ? pluginConfiguration.include
+        : undefined;
+    const exclude = typeof pluginConfiguration === 'object'
+        ? pluginConfiguration.exclude
+        : undefined;
     if (pluginModule) {
-        return { plugin: pluginModule, options };
+        return {
+            plugin: pluginModule,
+            options,
+            include,
+            exclude,
+        };
     }
     performance.mark(`Load Nx Plugin: ${moduleName} - start`);
     let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projects, root);
@@ -81,7 +92,12 @@ async function loadNxPluginAsync(pluginConfiguration, paths, projects, root) {
     exports.nxPluginCache.set(moduleName, plugin);
     performance.mark(`Load Nx Plugin: ${moduleName} - end`);
     performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);
-    return { plugin, options };
+    return {
+        plugin,
+        options,
+        include,
+        exclude,
+    };
 }
 exports.loadNxPluginAsync = loadNxPluginAsync;
 async function loadNxPlugins(plugins, paths = (0, installation_directory_1.getNxRequirePaths)(), root = workspace_root_1.workspaceRoot, projects) {

package/src/utils/output.d.ts

@@ -1,5 +1,5 @@
 import * as chalk from 'chalk';
-import { TaskStatus } from '../tasks-runner/tasks-runner';
+import type { TaskStatus } from '../tasks-runner/tasks-runner';
 export interface CLIErrorMessageConfig {
     title: string;
     bodyLines?: string[];

package/src/utils/params.d.ts

@@ -1,5 +1,5 @@
-import { NxJsonConfiguration } from '../config/nx-json';
-import { TargetConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
+import type { NxJsonConfiguration } from '../config/nx-json';
+import type { TargetConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
 type PropertyDescription = {
     type?: string | string[];
     required?: string[];

package/src/utils/params.js

@@ -13,6 +13,20 @@ async function handleErrors(isVerbose, fn) {
         if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
             logger_1.logger.error('The generator workflow failed. See above.');
         }
+        else if (err.name === 'ProjectGraphError') {
+            const projectGraphError = err;
+            let title = projectGraphError.message;
+            if (isVerbose) {
+                title += ' See errors below.';
+            }
+            const bodyLines = isVerbose
+                ? [projectGraphError.stack]
+                : ['Pass --verbose to see the stacktraces.'];
+            output_1.output.error({
+                title,
+                bodyLines: bodyLines,
+            });
+        }
         else {
             const lines = (err.message ? err.message : err.toString()).split('\n');
             const bodyLines = lines.slice(1);