nx 19.3.0-canary.20240608-55197fb → 19.3.0-canary.20240611-1600875

package/package.json

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

package/src/command-line/release/utils/git.d.ts

@@ -27,12 +27,12 @@ export declare function getLatestGitTagForPattern(releaseTagPattern: string, add
     extractedVersion: string;
 } | null>;
 export declare function getGitDiff(from: string | undefined, to?: string): Promise<RawGitCommit[]>;
-export declare function getChangedTrackedFiles(): Promise<Set<string>>;
-export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }: {
+export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }: {
     changedFiles?: string[];
     deletedFiles?: string[];
     dryRun?: boolean;
     verbose?: boolean;
+    cwd?: string;
     logFn?: (...messages: string[]) => void;
 }): Promise<string>;
 export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }: {

package/src/command-line/release/utils/git.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstGitCommit = exports.getCommitHash = exports.parseGitCommit = exports.parseConventionalCommitsMessage = exports.parseCommits = exports.gitPush = exports.gitTag = exports.gitCommit = exports.gitAdd = exports.getChangedTrackedFiles = exports.getGitDiff = exports.getLatestGitTagForPattern = void 0;
+exports.getFirstGitCommit = exports.getCommitHash = exports.parseGitCommit = exports.parseConventionalCommitsMessage = exports.parseCommits = exports.gitPush = exports.gitTag = exports.gitCommit = exports.gitAdd = exports.getGitDiff = exports.getLatestGitTagForPattern = void 0;
 /**
  * Special thanks to changelogen for the original inspiration for many of these utilities:
  * https://github.com/unjs/changelogen
  */
 const utils_1 = require("../../../tasks-runner/utils");
+const app_root_1 = require("../../../utils/app-root");
 const exec_command_1 = require("./exec-command");
 function escapeRegExp(string) {
     return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
@@ -97,18 +98,21 @@ async function getGitDiff(from, to = 'HEAD') {
     });
 }
 exports.getGitDiff = getGitDiff;
-async function getChangedTrackedFiles() {
-    const result = await (0, exec_command_1.execCommand)('git', ['status', '--porcelain']);
+async function getChangedTrackedFiles(cwd) {
+    const result = await (0, exec_command_1.execCommand)('git', ['status', '--porcelain'], {
+        cwd,
+    });
     const lines = result.split('\n').filter((l) => l.trim().length > 0);
     return new Set(lines.map((l) => l.substring(3)));
 }
-exports.getChangedTrackedFiles = getChangedTrackedFiles;
-async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
+async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }) {
     logFn = logFn || console.log;
+    // Default to running git add related commands from the workspace root
+    cwd = cwd || app_root_1.workspaceRoot;
     let ignoredFiles = [];
     let filesToAdd = [];
     for (const f of changedFiles ?? []) {
-        const isFileIgnored = await isIgnored(f);
+        const isFileIgnored = await isIgnored(f, cwd);
         if (isFileIgnored) {
             ignoredFiles.push(f);
         }
@@ -117,9 +121,9 @@ async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
         }
     }
     if (deletedFiles?.length > 0) {
-        const changedTrackedFiles = await getChangedTrackedFiles();
+        const changedTrackedFiles = await getChangedTrackedFiles(cwd);
         for (const f of deletedFiles ?? []) {
-            const isFileIgnored = await isIgnored(f);
+            const isFileIgnored = await isIgnored(f, cwd);
             if (isFileIgnored) {
                 ignoredFiles.push(f);
                 // git add will fail if trying to add an untracked file that doesn't exist
@@ -151,13 +155,17 @@ async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
     if (dryRun) {
         return;
     }
-    return (0, exec_command_1.execCommand)('git', commandArgs);
+    return (0, exec_command_1.execCommand)('git', commandArgs, {
+        cwd,
+    });
 }
 exports.gitAdd = gitAdd;
-async function isIgnored(filePath) {
+async function isIgnored(filePath, cwd) {
     try {
         // This command will error if the file is not ignored
-        await (0, exec_command_1.execCommand)('git', ['check-ignore', filePath]);
+        await (0, exec_command_1.execCommand)('git', ['check-ignore', filePath], {
+            cwd,
+        });
         return true;
     }
     catch {

package/src/command-line/release/version.js

@@ -378,7 +378,7 @@ function resolveGeneratorData({ collectionName, generatorName, configGeneratorOp
                  * the @nx/js generator config in their nx.json so we need to be clear about what the problem is)
                  */
                 if (collectionName === '@nx/js') {
-                    throw new Error('The @nx/js plugin is required in order to version your JavaScript packages. Please install it and try again.');
+                    throw new Error('The @nx/js plugin is required in order to version your JavaScript packages. Run "nx add @nx/js" to add it to your workspace.');
                 }
                 throw new Error(`Unable to resolve the package ${collectionName} in order to load the generator called ${generatorName}. Is the package installed?`);
             }

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

@@ -147,7 +147,7 @@ function readAndCombineAllProjectConfigurations(tree) {
         }
         else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, json_1.readJson)(tree, projectFile);
-            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, projectFile, (0, nx_json_1.readNxJson)(tree));
+            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, tree.root, projectFile, (0, nx_json_1.readNxJson)(tree));
             if (!rootMap[config.root]) {
                 (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
                 // Inferred targets, tags, etc don't show up when running generators

package/src/plugins/package-json-workspaces/create-nodes.d.ts

@@ -4,14 +4,14 @@ import { PackageJson } from '../../utils/package-json';
 import { CreateNodes } from '../../project-graph/plugins';
 export declare const createNodes: CreateNodes;
 export declare function buildPackageJsonWorkspacesMatcher(workspaceRoot: string, readJson: (string: any) => any): (p: string) => boolean;
-export declare function createNodeFromPackageJson(pkgJsonPath: string, root: string): {
+export declare function createNodeFromPackageJson(pkgJsonPath: string, workspaceRoot: string): {
     projects: {
         [x: string]: ProjectConfiguration & {
             name: string;
         };
     };
 };
-export declare function buildProjectConfigurationFromPackageJson(packageJson: PackageJson, path: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
+export declare function buildProjectConfigurationFromPackageJson(packageJson: PackageJson, workspaceRoot: string, packageJsonPath: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
     name: string;
 };
 /**

package/src/plugins/package-json-workspaces/create-nodes.js

@@ -50,9 +50,9 @@ function buildPackageJsonWorkspacesMatcher(workspaceRoot, readJson) {
         negativePatterns.every((negative) => (0, minimatch_1.minimatch)(p, negative));
 }
 exports.buildPackageJsonWorkspacesMatcher = buildPackageJsonWorkspacesMatcher;
-function createNodeFromPackageJson(pkgJsonPath, root) {
-    const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, pkgJsonPath));
-    const project = buildProjectConfigurationFromPackageJson(json, pkgJsonPath, (0, nx_json_1.readNxJson)(root));
+function createNodeFromPackageJson(pkgJsonPath, workspaceRoot) {
+    const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, pkgJsonPath));
+    const project = buildProjectConfigurationFromPackageJson(json, workspaceRoot, pkgJsonPath, (0, nx_json_1.readNxJson)(workspaceRoot));
     return {
         projects: {
             [project.root]: project,
@@ -60,21 +60,27 @@ function createNodeFromPackageJson(pkgJsonPath, root) {
     };
 }
 exports.createNodeFromPackageJson = createNodeFromPackageJson;
-function buildProjectConfigurationFromPackageJson(packageJson, path, nxJson) {
-    const normalizedPath = path.split('\\').join('/');
-    const directory = (0, node_path_1.dirname)(normalizedPath);
-    if (!packageJson.name && directory === '.') {
+function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, packageJsonPath, nxJson) {
+    const normalizedPath = packageJsonPath.split('\\').join('/');
+    const projectRoot = (0, node_path_1.dirname)(normalizedPath);
+    const siblingProjectJson = tryReadJson((0, node_path_1.join)(workspaceRoot, projectRoot, 'project.json'));
+    if (siblingProjectJson) {
+        for (const target of Object.keys(siblingProjectJson?.targets ?? {})) {
+            delete packageJson.scripts?.[target];
+        }
+    }
+    if (!packageJson.name && projectRoot === '.') {
         throw new Error('Nx requires the root package.json to specify a name if it is being used as an Nx project.');
     }
     let name = packageJson.name ?? (0, to_project_name_1.toProjectName)(normalizedPath);
     const projectType = nxJson?.workspaceLayout?.appsDir != nxJson?.workspaceLayout?.libsDir &&
         nxJson?.workspaceLayout?.appsDir &&
-        directory.startsWith(nxJson.workspaceLayout.appsDir)
+        projectRoot.startsWith(nxJson.workspaceLayout.appsDir)
         ? 'application'
         : 'library';
     return {
-        root: directory,
-        sourceRoot: directory,
+        root: projectRoot,
+        sourceRoot: projectRoot,
         name,
         projectType,
         ...packageJson.nx,
@@ -136,3 +142,11 @@ function normalizePatterns(patterns) {
 function removeRelativePath(pattern) {
     return pattern.startsWith('./') ? pattern.substring(2) : pattern;
 }
+function tryReadJson(path) {
+    try {
+        return (0, fileutils_1.readJsonFile)(path);
+    }
+    catch {
+        return null;
+    }
+}

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

@@ -162,7 +162,7 @@ function getProjectsSync(root, nxJson) {
         }
         else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, fileutils_1.readJsonFile)(projectFile);
-            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, projectFile, nxJson);
+            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, root, projectFile, nxJson);
             if (!rootMap[config.root]) {
                 (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
                 // Inferred targets, tags, etc don't show up when running generators