nx 20.3.2 → 20.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.3.2",
+  "version": "20.4.0-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.3.2",
-    "@nx/nx-darwin-x64": "20.3.2",
-    "@nx/nx-freebsd-x64": "20.3.2",
-    "@nx/nx-linux-arm-gnueabihf": "20.3.2",
-    "@nx/nx-linux-arm64-gnu": "20.3.2",
-    "@nx/nx-linux-arm64-musl": "20.3.2",
-    "@nx/nx-linux-x64-gnu": "20.3.2",
-    "@nx/nx-linux-x64-musl": "20.3.2",
-    "@nx/nx-win32-arm64-msvc": "20.3.2",
-    "@nx/nx-win32-x64-msvc": "20.3.2"
+    "@nx/nx-darwin-arm64": "20.4.0-beta.1",
+    "@nx/nx-darwin-x64": "20.4.0-beta.1",
+    "@nx/nx-freebsd-x64": "20.4.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "20.4.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "20.4.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "20.4.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "20.4.0-beta.1",
+    "@nx/nx-linux-x64-musl": "20.4.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "20.4.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "20.4.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -114,7 +114,8 @@ function updateProjectOutputs(repoRoot, project) {
         else if (target.executor === '@angular-eslint/builder:lint') {
             target.outputs = ['{options.outputFile}'];
         }
-        else if (target.executor === '@angular-devkit/build-angular:ng-packagr') {
+        else if (target.executor === '@angular-devkit/build-angular:ng-packagr' ||
+            target.executor === '@angular/build:ng-packagr') {
             try {
                 const ngPackageJsonPath = (0, path_1.join)(repoRoot, target.options.project);
                 const ngPackageJson = (0, fileutils_1.readJsonFile)(ngPackageJsonPath);

package/src/command-line/run/run-one.js

@@ -12,6 +12,7 @@ const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
 const graph_1 = require("../graph/graph");
+const find_matching_projects_1 = require("../../utils/find-matching-projects");
 async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
     excludeTaskDependencies: args.excludeTaskDependencies,
     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
@@ -31,7 +32,7 @@ async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
         process.exit(0);
     }
     await (0, connect_to_nx_cloud_1.connectToNxCloudIfExplicitlyAsked)(nxArgs);
-    const { projects } = getProjects(projectGraph, opts.project);
+    const { projects, projectName } = getProjects(projectGraph, opts.project);
     if (nxArgs.graph) {
         const projectNames = projects.map((t) => t.name);
         const file = (0, command_line_utils_1.readGraphFileFromGraphArg)(nxArgs);
@@ -45,22 +46,45 @@ async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
         }, projectNames);
     }
     else {
-        const status = await (0, run_command_1.runCommand)(projects, projectGraph, { nxJson }, nxArgs, overrides, opts.project, extraTargetDependencies, extraOptions);
+        const status = await (0, run_command_1.runCommand)(projects, projectGraph, { nxJson }, nxArgs, overrides, projectName, extraTargetDependencies, extraOptions);
         process.exit(status);
     }
 }
-function getProjects(projectGraph, project) {
-    if (!projectGraph.nodes[project]) {
-        output_1.output.error({
-            title: `Cannot find project '${project}'`,
-        });
-        process.exit(1);
+function getProjects(projectGraph, projectName) {
+    if (projectGraph.nodes[projectName]) {
+        return {
+            projectName: projectName,
+            projects: [projectGraph.nodes[projectName]],
+            projectsMap: {
+                [projectName]: projectGraph.nodes[projectName],
+            },
+        };
     }
-    let projects = [projectGraph.nodes[project]];
-    let projectsMap = {
-        [project]: projectGraph.nodes[project],
-    };
-    return { projects, projectsMap };
+    else {
+        const projects = (0, find_matching_projects_1.findMatchingProjects)([projectName], projectGraph.nodes);
+        if (projects.length === 1) {
+            const projectName = projects[0];
+            const project = projectGraph.nodes[projectName];
+            return {
+                projectName,
+                projects: [project],
+                projectsMap: {
+                    [project.data.name]: project,
+                },
+            };
+        }
+        else if (projects.length > 1) {
+            output_1.output.error({
+                title: `Multiple projects matched:`,
+                bodyLines: projects.length > 100 ? [...projects.slice(0, 100), '...'] : projects,
+            });
+            process.exit(1);
+        }
+    }
+    output_1.output.error({
+        title: `Cannot find project '${projectName}'`,
+    });
+    process.exit(1);
 }
 const targetAliases = {
     b: 'build',

package/src/command-line/show/project.js

@@ -4,14 +4,32 @@ exports.showProjectHandler = showProjectHandler;
 const output_1 = require("../../utils/output");
 const project_graph_1 = require("../../project-graph/project-graph");
 const graph_1 = require("../graph/graph");
+const find_matching_projects_1 = require("../../utils/find-matching-projects");
 async function showProjectHandler(args) {
     performance.mark('code-loading:end');
     performance.measure('code-loading', 'init-local', 'code-loading:end');
     const graph = await (0, project_graph_1.createProjectGraphAsync)();
-    const node = graph.nodes[args.projectName];
+    let node = graph.nodes[args.projectName];
     if (!node) {
-        console.log(`Could not find project ${args.projectName}`);
-        process.exit(1);
+        const projects = (0, find_matching_projects_1.findMatchingProjects)([args.projectName], graph.nodes);
+        if (projects.length === 1) {
+            const projectName = projects[0];
+            node = graph.nodes[projectName];
+        }
+        else if (projects.length > 1) {
+            output_1.output.error({
+                title: `Multiple projects matched:`,
+                bodyLines: projects.length > 100 ? [...projects.slice(0, 100), '...'] : projects,
+            });
+            console.log(`Multiple projects matched:\n  ${(projects.length > 100
+                ? [...projects.slice(0, 100), '...']
+                : projects).join('  \n')}`);
+            process.exit(1);
+        }
+        else {
+            console.log(`Could not find project ${args.projectName}`);
+            process.exit(1);
+        }
     }
     if (args.json) {
         console.log(JSON.stringify(node.data));

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -15,6 +15,7 @@ export interface RunOptions {
     nxBail: boolean;
     nxIgnoreCycles: boolean;
     skipNxCache: boolean;
+    skipRemoteCache: boolean;
     cloud: boolean;
     dte: boolean;
     batch: boolean;

package/src/command-line/yargs-utils/shared-options.js

@@ -75,6 +75,13 @@ function withRunOptions(yargs) {
         describe: 'Rerun the tasks even when the results are available in the cache.',
         type: 'boolean',
         default: false,
+        alias: 'disableNxCache',
+    })
+        .options('skipRemoteCache', {
+        type: 'boolean',
+        describe: 'Disables the remote cache.',
+        default: false,
+        alias: 'disableRemoteCache',
     })
         .options('excludeTaskDependencies', {
         describe: 'Skips running dependent tasks first.',