nx 20.4.0-canary.20250109-0edd110 → 20.4.0-canary.20250111-bbbfd9f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.4.0-canary.20250109-0edd110",
+  "version": "20.4.0-canary.20250111-bbbfd9f",
   "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.4.0-canary.20250109-0edd110",
-    "@nx/nx-darwin-x64": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-freebsd-x64": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-linux-arm-gnueabihf": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-linux-arm64-gnu": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-linux-arm64-musl": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-linux-x64-gnu": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-linux-x64-musl": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-win32-arm64-msvc": "20.4.0-canary.20250109-0edd110",
-    "@nx/nx-win32-x64-msvc": "20.4.0-canary.20250109-0edd110"
+    "@nx/nx-darwin-arm64": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-darwin-x64": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-freebsd-x64": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-linux-arm-gnueabihf": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-linux-arm64-gnu": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-linux-arm64-musl": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-linux-x64-gnu": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-linux-x64-musl": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-win32-arm64-msvc": "20.4.0-canary.20250111-bbbfd9f",
+    "@nx/nx-win32-x64-msvc": "20.4.0-canary.20250111-bbbfd9f"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -191,7 +191,10 @@ class TargetProjectLocator {
     }
     findDependencyInWorkspaceProjects(dep) {
         this.packageEntryPointsToProjectMap ??= (0, packages_1.getPackageEntryPointsToProjectMap)(this.nodes);
-        return this.packageEntryPointsToProjectMap[dep]?.name ?? null;
+        return (this.packageEntryPointsToProjectMap[dep]?.name ??
+            // if the package exports do not include ".", look for subpath exports
+            Object.entries(this.packageEntryPointsToProjectMap).find(([entryPoint]) => dep.startsWith(`${entryPoint}/`))?.[1]?.name ??
+            null);
     }
     resolveImportWithTypescript(normalizedImportExpr, filePath) {
         let resolvedModule;

package/src/plugins/js/utils/packages.js

@@ -10,14 +10,28 @@ function getPackageEntryPointsToProjectMap(projects) {
             continue;
         }
         const { packageName, packageExports } = metadata.js;
-        if (!packageExports || typeof packageExports === 'string') {
+        if (!packageExports ||
+            typeof packageExports === 'string' ||
+            !Object.keys(packageExports).length) {
             // no `exports` or it points to a file, which would be the equivalent of
             // an '.' export, in which case the package name is the entry point
             result[packageName] = project;
         }
         else {
             for (const entryPoint of Object.keys(packageExports)) {
-                result[(0, posix_1.join)(packageName, entryPoint)] = project;
+                // if entrypoint begins with '.', it is a relative subpath export
+                // otherwise, it is a conditional export
+                // https://nodejs.org/api/packages.html#conditional-exports
+                if (entryPoint.startsWith('.')) {
+                    result[(0, posix_1.join)(packageName, entryPoint)] = project;
+                }
+                else {
+                    result[packageName] = project;
+                }
+            }
+            // if there was no '.' entrypoint, ensure the package name is matched with the project
+            if (!result[packageName]) {
+                result[packageName] = project;
             }
         }
     }

package/src/utils/find-matching-projects.js

@@ -112,6 +112,17 @@ function addMatchingProjectsByName(projectNames, projects, pattern, matchedProje
         return;
     }
     if (!(0, globs_1.isGlobPattern)(pattern.value)) {
+        // Custom regex that is basically \b without underscores, so "foo" pattern matches "foo_bar".
+        const regex = new RegExp(`(?<![a-zA-Z0-9])${pattern.value}(?![a-zA-Z0-9])`, 'i');
+        const matchingProjects = Object.keys(projects).filter((name) => regex.test(name));
+        for (const projectName of matchingProjects) {
+            if (pattern.exclude) {
+                matchedProjects.delete(projectName);
+            }
+            else {
+                matchedProjects.add(projectName);
+            }
+        }
         return;
     }
     const matchedProjectNames = (0, exports.getMatchingStringsWithCache)(pattern.value, projectNames);

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

@@ -36,6 +36,7 @@ export interface PackageJson {
         require?: string;
         import?: string;
         development?: string;
+        default?: string;
     }>;
     dependencies?: Record<string, string>;
     devDependencies?: Record<string, string>;