nx 18.2.2 → 18.3.0-beta.0

package/bin/init-local.js

@@ -126,7 +126,7 @@ function handleAngularCLIFallbacks(workspace) {
         if (!process.argv[3]) {
             console.log(`"ng completion" is not natively supported by Nx.
   Instead, you could try an Nx Editor Plugin for a visual tool to run Nx commands. If you're using VSCode, you can use the Nx Console plugin, or if you're using WebStorm, you could use one of the available community plugins.
-  For more information, see https://nx.dev/features/integrate-with-editors`);
+  For more information, see https://nx.dev/getting-started/editor-setup`);
         }
     }
     else if (process.argv[2] === 'cache') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.2.2",
+  "version": "18.3.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.2.2"
+    "@nrwl/tao": "18.3.0-beta.0"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.2.2",
-    "@nx/nx-darwin-arm64": "18.2.2",
-    "@nx/nx-linux-x64-gnu": "18.2.2",
-    "@nx/nx-linux-x64-musl": "18.2.2",
-    "@nx/nx-win32-x64-msvc": "18.2.2",
-    "@nx/nx-linux-arm64-gnu": "18.2.2",
-    "@nx/nx-linux-arm64-musl": "18.2.2",
-    "@nx/nx-linux-arm-gnueabihf": "18.2.2",
-    "@nx/nx-win32-arm64-msvc": "18.2.2",
-    "@nx/nx-freebsd-x64": "18.2.2"
+    "@nx/nx-darwin-x64": "18.3.0-beta.0",
+    "@nx/nx-darwin-arm64": "18.3.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "18.3.0-beta.0",
+    "@nx/nx-linux-x64-musl": "18.3.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "18.3.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "18.3.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "18.3.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "18.3.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "18.3.0-beta.0",
+    "@nx/nx-freebsd-x64": "18.3.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/report/report.d.ts

@@ -1,5 +1,6 @@
 import { PackageManager } from '../../utils/package-manager';
 import { PackageJson } from '../../utils/package-json';
+import { NxJsonConfiguration } from '../../config/nx-json';
 export declare const packagesWeCareAbout: string[];
 export declare const patternsWeIgnoreInCommunityReport: Array<string | RegExp>;
 /**
@@ -16,6 +17,7 @@ export interface ReportData {
     pmVersion: string;
     localPlugins: string[];
     communityPlugins: PackageJson[];
+    registeredPlugins: string[];
     packageVersionsWeCareAbout: {
         package: string;
         version: string;
@@ -41,6 +43,7 @@ interface OutOfSyncPackageGroup {
 }
 export declare function findMisalignedPackagesForPackage(base: PackageJson): undefined | OutOfSyncPackageGroup;
 export declare function findInstalledCommunityPlugins(): PackageJson[];
+export declare function findRegisteredPluginsBeingUsed(nxJson: NxJsonConfiguration): string[];
 export declare function findInstalledPackagesWeCareAbout(): {
     package: string;
     version: string;

package/src/command-line/report/report.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findInstalledPackagesWeCareAbout = exports.findInstalledCommunityPlugins = exports.findMisalignedPackagesForPackage = exports.getReportData = exports.reportHandler = exports.patternsWeIgnoreInCommunityReport = exports.packagesWeCareAbout = void 0;
+exports.findInstalledPackagesWeCareAbout = exports.findRegisteredPluginsBeingUsed = exports.findInstalledCommunityPlugins = exports.findMisalignedPackagesForPackage = exports.getReportData = exports.reportHandler = exports.patternsWeIgnoreInCommunityReport = exports.packagesWeCareAbout = void 0;
 const chalk = require("chalk");
 const output_1 = require("../../utils/output");
 const path_1 = require("path");
@@ -36,7 +36,7 @@ const LINE_SEPARATOR = '---------------------------------------';
  *
  */
 async function reportHandler() {
-    const { pm, pmVersion, localPlugins, communityPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, } = await getReportData();
+    const { pm, pmVersion, localPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, } = await getReportData();
     const bodyLines = [
         `Node   : ${process.versions.node}`,
         `OS     : ${process.platform}-${process.arch}`,
@@ -47,6 +47,13 @@ async function reportHandler() {
     packageVersionsWeCareAbout.forEach((p) => {
         bodyLines.push(`${chalk.green(p.package.padEnd(padding))} : ${chalk.bold(p.version)}`);
     });
+    if (registeredPlugins.length) {
+        bodyLines.push(LINE_SEPARATOR);
+        bodyLines.push('Registered Plugins:');
+        for (const plugin of registeredPlugins) {
+            bodyLines.push(`${chalk.green(plugin)}`);
+        }
+    }
     if (communityPlugins.length) {
         bodyLines.push(LINE_SEPARATOR);
         padding = Math.max(...communityPlugins.map((x) => x.name.length)) + 1;
@@ -86,8 +93,10 @@ exports.reportHandler = reportHandler;
 async function getReportData() {
     const pm = (0, package_manager_1.detectPackageManager)();
     const pmVersion = (0, package_manager_1.getPackageManagerVersion)(pm);
-    const localPlugins = await findLocalPlugins((0, nx_json_1.readNxJson)());
+    const nxJson = (0, nx_json_1.readNxJson)();
+    const localPlugins = await findLocalPlugins(nxJson);
     const communityPlugins = findInstalledCommunityPlugins();
+    const registeredPlugins = findRegisteredPluginsBeingUsed(nxJson);
     let projectGraphError = null;
     if (isNativeAvailable()) {
         try {
@@ -114,6 +123,7 @@ async function getReportData() {
         pmVersion,
         localPlugins,
         communityPlugins,
+        registeredPlugins,
         packageVersionsWeCareAbout,
         outOfSyncPackageGroup,
         projectGraphError,
@@ -178,6 +188,13 @@ function findInstalledCommunityPlugins() {
             : pattern.test(dep.name)));
 }
 exports.findInstalledCommunityPlugins = findInstalledCommunityPlugins;
+function findRegisteredPluginsBeingUsed(nxJson) {
+    if (!nxJson.plugins) {
+        return [];
+    }
+    return nxJson.plugins.map((plugin) => typeof plugin === 'object' ? plugin.plugin : plugin);
+}
+exports.findRegisteredPluginsBeingUsed = findRegisteredPluginsBeingUsed;
 function findInstalledPackagesWeCareAbout() {
     const packagesWeMayCareAbout = {};
     // TODO (v19): Remove workaround for hiding @nrwl packages when matching @nx package is found.

package/src/config/workspace-json-project-json.d.ts

@@ -99,10 +99,18 @@ export interface ProjectConfiguration {
     release?: {
         version?: Pick<NxReleaseVersionConfiguration, 'generator' | 'generatorOptions'>;
     };
-    metadata?: {
-        technologies?: string[];
-        targetGroups?: Record<string, string[]>;
-    };
+    /**
+     * Metadata about the project
+     */
+    metadata?: ProjectMetadata;
+}
+export interface ProjectMetadata {
+    technologies?: string[];
+    targetGroups?: Record<string, string[]>;
+}
+export interface TargetMetadata {
+    description?: string;
+    technologies?: string[];
 }
 export interface TargetDependencyConfig {
     /**
@@ -190,4 +198,8 @@ export interface TargetConfiguration<T = any> {
      * Determines if Nx is able to cache a given target.
      */
     cache?: boolean;
+    /**
+     * Metadata about the target
+     */
+    metadata?: TargetMetadata;
 }

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

@@ -104,6 +104,9 @@ skipCommandNormalization) {
             }
         }
     }
+    if (project.metadata) {
+        updatedProjectConfiguration.metadata = mergeMetadata(sourceMap, sourceInformation, 'metadata', project.metadata, matchingProject.metadata);
+    }
     if (project.targets) {
         // We merge the targets with special handling, so clear this back to the
         // targets as defined originally before merging.
@@ -134,68 +137,69 @@ skipCommandNormalization) {
             updatedProjectConfiguration.targets[targetName] = mergedTarget;
         }
     }
-    if (project.metadata) {
-        if (sourceMap) {
-            sourceMap['targets'] ??= sourceInformation;
-        }
-        for (const [metadataKey, value] of Object.entries({
-            ...project.metadata,
-        })) {
-            const existingValue = matchingProject.metadata?.[metadataKey];
-            if (Array.isArray(value) && Array.isArray(existingValue)) {
-                for (const item of [...value]) {
-                    const newLength = updatedProjectConfiguration.metadata[metadataKey].push(item);
-                    if (sourceMap) {
-                        sourceMap[`metadata.${metadataKey}.${newLength - 1}`] =
-                            sourceInformation;
-                    }
+    projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
+}
+exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
+function mergeMetadata(sourceMap, sourceInformation, baseSourceMapPath, metadata, matchingMetadata) {
+    const result = {
+        ...(matchingMetadata ?? {}),
+    };
+    for (const [metadataKey, value] of Object.entries(metadata)) {
+        const existingValue = matchingMetadata?.[metadataKey];
+        if (Array.isArray(value) && Array.isArray(existingValue)) {
+            for (const item of [...value]) {
+                const newLength = result[metadataKey].push(item);
+                if (sourceMap) {
+                    sourceMap[`${baseSourceMapPath}.${metadataKey}.${newLength - 1}`] =
+                        sourceInformation;
                 }
             }
-            else if (Array.isArray(value) && existingValue === undefined) {
-                updatedProjectConfiguration.metadata ??= {};
-                updatedProjectConfiguration.metadata[metadataKey] ??= value;
+        }
+        else if (Array.isArray(value) && existingValue === undefined) {
+            result[metadataKey] ??= value;
+            if (sourceMap) {
+                sourceMap[`${baseSourceMapPath}.${metadataKey}`] = sourceInformation;
+            }
+            for (let i = 0; i < value.length; i++) {
                 if (sourceMap) {
-                    sourceMap[`metadata.${metadataKey}`] = sourceInformation;
-                }
-                for (let i = 0; i < value.length; i++) {
-                    if (sourceMap) {
-                        sourceMap[`metadata.${metadataKey}.${i}`] = sourceInformation;
-                    }
+                    sourceMap[`${baseSourceMapPath}.${metadataKey}.${i}`] =
+                        sourceInformation;
                 }
             }
-            else if (typeof value === 'object' &&
-                typeof existingValue === 'object') {
-                for (const key in value) {
-                    const existingValue = matchingProject.metadata?.[metadataKey]?.[key];
-                    if (Array.isArray(value[key]) && Array.isArray(existingValue)) {
-                        for (const item of value[key]) {
-                            const i = updatedProjectConfiguration.metadata[metadataKey][key].push(item);
-                            if (sourceMap) {
-                                sourceMap[`metadata.${metadataKey}.${key}.${i - 1}`] =
-                                    sourceInformation;
-                            }
-                        }
-                    }
-                    else {
-                        updatedProjectConfiguration.metadata[metadataKey] = value;
+        }
+        else if (typeof value === 'object' && typeof existingValue === 'object') {
+            for (const key in value) {
+                const existingValue = matchingMetadata?.[metadataKey]?.[key];
+                if (Array.isArray(value[key]) && Array.isArray(existingValue)) {
+                    for (const item of value[key]) {
+                        const i = result[metadataKey][key].push(item);
                         if (sourceMap) {
-                            sourceMap[`metadata.${metadataKey}`] = sourceInformation;
+                            sourceMap[`${baseSourceMapPath}.${metadataKey}.${key}.${i - 1}`] =
+                                sourceInformation;
                         }
                     }
                 }
+                else {
+                    result[metadataKey] = value;
+                    if (sourceMap) {
+                        sourceMap[`${baseSourceMapPath}.${metadataKey}`] =
+                            sourceInformation;
+                    }
+                }
             }
-            else {
-                updatedProjectConfiguration.metadata[metadataKey] = value;
-                if (sourceMap) {
-                    sourceMap[`metadata.${metadataKey}`] = sourceInformation;
-                    if (typeof value === 'object') {
-                        for (const k in value) {
-                            sourceMap[`metadata.${metadataKey}.${k}`] = sourceInformation;
-                            if (Array.isArray(value[k])) {
-                                for (let i = 0; i < value[k].length; i++) {
-                                    sourceMap[`metadata.${metadataKey}.${k}.${i}`] =
-                                        sourceInformation;
-                                }
+        }
+        else {
+            result[metadataKey] = value;
+            if (sourceMap) {
+                sourceMap[`${baseSourceMapPath}.${metadataKey}`] = sourceInformation;
+                if (typeof value === 'object') {
+                    for (const k in value) {
+                        sourceMap[`${baseSourceMapPath}.${metadataKey}.${k}`] =
+                            sourceInformation;
+                        if (Array.isArray(value[k])) {
+                            for (let i = 0; i < value[k].length; i++) {
+                                sourceMap[`${baseSourceMapPath}.${metadataKey}.${k}.${i}`] =
+                                    sourceInformation;
                             }
                         }
                     }
@@ -203,9 +207,8 @@ skipCommandNormalization) {
             }
         }
     }
-    projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
+    return result;
 }
-exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
 /**
  * Transforms a list of project paths into a map of project configurations.
  *
@@ -481,6 +484,9 @@ function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, s
     if (target.configurations || defaultConfigurations) {
         result.configurations = mergeConfigurations(target.configurations, isCompatible ? defaultConfigurations : undefined, projectConfigSourceMap, sourceInformation, targetIdentifier);
     }
+    if (target.metadata) {
+        result.metadata = mergeMetadata(projectConfigSourceMap, sourceInformation, `${targetIdentifier}.metadata`, target.metadata, baseTarget?.metadata);
+    }
     return result;
 }
 exports.mergeTargetConfigurations = mergeTargetConfigurations;

package/src/tasks-runner/forked-process-task-runner.js

@@ -132,7 +132,7 @@ class ForkedProcessTaskRunner {
             });
         }
     }
-    async forkProcessWithPseudoTerminal(task, { streamOutput, taskGraph, env, }) {
+    async forkProcessWithPseudoTerminal(task, { temporaryOutputPath, streamOutput, taskGraph, env, }) {
         const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
         if (streamOutput) {
             output_1.output.logCommand(args.join(' '));
@@ -160,6 +160,7 @@ class ForkedProcessTaskRunner {
                 if (code >= 128) {
                     process.exit(code);
                 }
+                this.writeTerminalOutput(temporaryOutputPath, terminalOutput);
                 res({
                     code,
                     terminalOutput,

package/src/tasks-runner/task-orchestrator.js

@@ -4,6 +4,7 @@ exports.TaskOrchestrator = void 0;
 const events_1 = require("events");
 const perf_hooks_1 = require("perf_hooks");
 const path_1 = require("path");
+const fs_1 = require("fs");
 const run_commands_impl_1 = require("../executors/run-commands/run-commands.impl");
 const forked_process_task_runner_1 = require("./forked-process-task-runner");
 const cache_1 = require("./cache");
@@ -238,6 +239,7 @@ class TaskOrchestrator {
                 if (!streamOutput) {
                     this.options.lifeCycle.printTaskTerminalOutput(task, status, terminalOutput);
                 }
+                (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
                 results.push({
                     task,
                     status,

package/src/utils/package-json.d.ts

@@ -52,6 +52,7 @@ export interface PackageJson {
     workspaces?: string[] | {
         packages: string[];
     };
+    publishConfig?: Record<string, string>;
     nx?: NxProjectPackageJsonConfiguration;
     generators?: string;
     schematics?: string;

package/src/utils/package-json.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.readTargetsFromPackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 const fileutils_1 = require("./fileutils");
 const installation_directory_1 = require("./installation-directory");
-const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 function normalizePackageGroup(packageGroup) {
     return Array.isArray(packageGroup)
         ? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)