nx 23.0.0-beta.1 → 23.0.0-beta.2

package/dist/bin/nx.js

@@ -109,10 +109,10 @@ async function main() {
             warnIfUsingOutdatedGlobalInstall(GLOBAL_NX_VERSION, LOCAL_NX_VERSION);
             if (localNx.includes('.nx')) {
                 const nxWrapperPath = localNx.replace(/\.nx.*/, '.nx/') + 'nxw.js';
-                await import(nxWrapperPath);
+                require(nxWrapperPath);
             }
             else {
-                await import(localNx);
+                require(localNx);
             }
         }
     }

package/dist/src/ai/set-up-ai-agents/set-up-ai-agents.js

@@ -15,38 +15,30 @@ const package_json_1 = require("../../utils/package-json");
 const ignore_1 = require("../../utils/ignore");
 const provenance_1 = require("../../utils/provenance");
 const workspace_root_1 = require("../../utils/workspace-root");
+const installed_nx_version_1 = require("../../utils/installed-nx-version");
 const constants_1 = require("../constants");
 const clone_ai_config_repo_1 = require("../clone-ai-config-repo");
 const utils_1 = require("../utils");
 const handle_import_1 = require("../../utils/handle-import");
 /**
- * Get the installed Nx version, with fallback to workspace package.json or default version.
+ * Best-effort fallback when `getInstalledNxVersion()` can't find an
+ * installed nx — read the version declared in the workspace's
+ * `package.json` (devDependencies/dependencies), stripping any semver
+ * range prefix, and finally a sane default.
  */
-function getNxVersion() {
+function getDeclaredNxVersionOrDefault() {
     try {
-        // Try to read from node_modules first
-        const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)('nx');
-        return version;
+        const workspacePackageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'), 'utf-8'));
+        const declared = workspacePackageJson.devDependencies?.nx ||
+            workspacePackageJson.dependencies?.nx;
+        if (declared) {
+            return declared.replace(/^[\^~>=<]+/, '');
+        }
     }
     catch {
-        try {
-            // Fallback: try to read from workspace package.json
-            const workspacePackageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'), 'utf-8'));
-            // Check devDependencies first, then dependencies
-            const nxVersion = workspacePackageJson.devDependencies?.nx ||
-                workspacePackageJson.dependencies?.nx;
-            if (nxVersion) {
-                // Remove any semver range characters (^, ~, >=, etc.)
-                return nxVersion.replace(/^[\^~>=<]+/, '');
-            }
-            throw new Error('Nx not found in package.json');
-        }
-        catch {
-            // If we can't determine the version, default to the newer format
-            // This handles cases where nx might not be installed or is globally installed
-            return '22.0.0';
-        }
+        // fall through to default
     }
+    return '22.0.0';
 }
 async function setupAiAgentsGenerator(tree, options, inner = false) {
     const normalizedOptions = normalizeOptions(options);
@@ -77,7 +69,7 @@ function normalizeOptions(options) {
 }
 async function setupAiAgentsGeneratorImpl(tree, options) {
     const hasAgent = (agent) => options.agents.includes(agent);
-    const nxVersion = getNxVersion();
+    const nxVersion = (0, installed_nx_version_1.getInstalledNxVersion)() ?? getDeclaredNxVersionOrDefault();
     const agentsMd = (0, constants_1.agentsMdPath)(options.directory);
     // write AGENTS.md for most agents
     if (hasAgent('cursor') ||

package/dist/src/command-line/graph/graph.js

@@ -402,7 +402,6 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
         // Avoid https://en.wikipedia.org/wiki/Directory_traversal_attack
         // e.g curl --path-as-is http://localhost:9000/../fileInDanger.txt
         // by limiting the path to current directory only
-        res.setHeader('Access-Control-Allow-Origin', '*');
         const sanitizePath = (0, node_path_1.basename)(parsedUrl.pathname);
         if (sanitizePath === 'project-graph.json') {
             const requestFull = parsedUrl.searchParams.get('full') === 'true';

package/dist/src/command-line/release/utils/shared.js

@@ -15,6 +15,7 @@ const semver_1 = require("semver");
 const utils_1 = require("../../../tasks-runner/utils");
 const output_1 = require("../../../utils/output");
 const git_1 = require("./git");
+const find_matching_projects_1 = require("../../../utils/find-matching-projects");
 exports.noDiffInChangelogMessage = pc.yellow(`NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`);
 function isPrerelease(version) {
     // prerelease returns an array of matching prerelease "components", or null if the version is not a prerelease
@@ -329,23 +330,32 @@ async function getCommitsRelevantToProjects(projectGraph, commits, projects, nxR
         // Try to get the graph associated with the commit shortHash
         // if not available, calculate it and store it in the cache
         let affectedGraph = await releaseGraph.resolveAffectedFilesPerCommitInProjectGraph(commit, projectGraph);
+        // Resolve commit scopes using Nx matcher
+        const scopePatterns = commit.scope
+            ? commit.scope.split(',').map((s) => s.trim())
+            : [];
+        let scopedProjects = null;
+        if (scopePatterns.length > 0) {
+            const matches = (0, find_matching_projects_1.findMatchingProjects)(scopePatterns, projectGraph.nodes);
+            // detect ambiguity
+            for (const pattern of scopePatterns) {
+                const perPatternMatches = (0, find_matching_projects_1.findMatchingProjects)([pattern], projectGraph.nodes);
+                if (perPatternMatches.length > 1) {
+                    throw new Error(`Ambiguous scope "${pattern}" in commit "${commit.message}". ` +
+                        `Matches: ${perPatternMatches.join(', ')}`);
+                }
+            }
+            scopedProjects = new Set(matches);
+        }
         for (const projectName of Object.keys(affectedGraph.nodes)) {
             if (projectSet.has(projectName)) {
                 if (!relevantCommits.has(projectName)) {
                     relevantCommits.set(projectName, []);
                 }
-                if (commit.scope === projectName ||
-                    commit.scope.split(',').includes(projectName) ||
-                    !commit.scope) {
-                    relevantCommits
-                        .get(projectName)
-                        ?.push({ commit, isProjectScopedCommit: true });
-                }
-                else {
-                    relevantCommits
-                        .get(projectName)
-                        ?.push({ commit, isProjectScopedCommit: false });
-                }
+                const isProjectScopedCommit = scopedProjects === null || scopedProjects.has(projectName);
+                relevantCommits
+                    .get(projectName)
+                    ?.push({ commit, isProjectScopedCommit });
             }
         }
     }