nx 19.6.0-canary.20240725-3890edc → 19.6.0-canary.20240726-b3c67de

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.0-canary.20240725-3890edc",
+  "version": "19.6.0-canary.20240726-b3c67de",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -41,7 +41,7 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
     "@zkochan/js-yaml": "0.0.7",
-    "axios": "^1.6.0",
+    "axios": "^1.7.2",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.6.0-canary.20240725-3890edc"
+    "@nrwl/tao": "19.6.0-canary.20240726-b3c67de"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-darwin-arm64": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240725-3890edc",
-    "@nx/nx-freebsd-x64": "19.6.0-canary.20240725-3890edc"
+    "@nx/nx-darwin-x64": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-darwin-arm64": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240726-b3c67de",
+    "@nx/nx-freebsd-x64": "19.6.0-canary.20240726-b3c67de"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -30,6 +30,7 @@ const child_process_2 = require("../../utils/child-process");
 const client_1 = require("../../daemon/client/client");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 function normalizeVersion(version) {
     const [semver, ...prereleaseTagParts] = version.split('-');
@@ -669,10 +670,10 @@ function readPackageMigrationConfig(packageName, dir) {
         };
     }
 }
-function createMigrationsFile(root, migrations) {
-    (0, fileutils_1.writeJsonFile)((0, path_1.join)(root, 'migrations.json'), { migrations });
+async function createMigrationsFile(root, migrations) {
+    await writeFormattedJsonFile((0, path_1.join)(root, 'migrations.json'), { migrations });
 }
-function updatePackageJson(root, updatedPackages) {
+async function updatePackageJson(root, updatedPackages) {
     const packageJsonPath = (0, path_1.join)(root, 'package.json');
     if (!(0, fs_1.existsSync)(packageJsonPath)) {
         return;
@@ -694,7 +695,7 @@ function updatePackageJson(root, updatedPackages) {
             json[dependencyType][p] = updatedPackages[p].version;
         }
     });
-    (0, fileutils_1.writeJsonFile)(packageJsonPath, json, {
+    await writeFormattedJsonFile(packageJsonPath, json, {
         appendNewLine: parseOptions.endsWithNewline,
     });
 }
@@ -719,7 +720,7 @@ async function updateInstallationDetails(root, updatedPackages) {
             }
         }
     }
-    (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson, {
+    await writeFormattedJsonFile(nxJsonPath, nxJson, {
         appendNewLine: parseOptions.endsWithNewline,
     });
 }
@@ -765,10 +766,10 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
             excludeAppliedMigrations: opts.excludeAppliedMigrations,
         });
         const { migrations, packageUpdates, minVersionWithSkippedUpdates } = await migrator.migrate(opts.targetPackage, opts.targetVersion);
-        updatePackageJson(root, packageUpdates);
+        await updatePackageJson(root, packageUpdates);
         await updateInstallationDetails(root, packageUpdates);
         if (migrations.length > 0) {
-            createMigrationsFile(root, [
+            await createMigrationsFile(root, [
                 ...addSplitConfigurationMigrationIfAvailable(from, packageUpdates),
                 ...migrations,
             ]);
@@ -835,6 +836,17 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
         throw e;
     }
 }
+async function writeFormattedJsonFile(filePath, content, options) {
+    const formattedContent = await (0, format_changed_files_with_prettier_if_available_1.formatFilesWithPrettierIfAvailable)([{ path: filePath, content: JSON.stringify(content) }], workspace_root_1.workspaceRoot, { silent: true });
+    if (formattedContent.has(filePath)) {
+        (0, fs_1.writeFileSync)(filePath, formattedContent.get(filePath), {
+            encoding: 'utf-8',
+        });
+    }
+    else {
+        (0, fileutils_1.writeJsonFile)(filePath, content, options);
+    }
+}
 function addSplitConfigurationMigrationIfAvailable(from, packageJson) {
     if (!packageJson['@nrwl/workspace'])
         return [];

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

@@ -31,6 +31,7 @@ export interface ReportData {
         migrateTarget: string;
     };
     projectGraphError?: Error | null;
+    nativeTarget: string | null;
 }
 export declare function getReportData(): Promise<ReportData>;
 interface OutOfSyncPackageGroup {

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

@@ -43,14 +43,18 @@ const LINE_SEPARATOR = '---------------------------------------';
  *
  */
 async function reportHandler() {
-    const { pm, pmVersion, localPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, } = await getReportData();
-    const bodyLines = [
-        `Node   : ${process.versions.node}`,
-        `OS     : ${process.platform}-${process.arch}`,
-        `${pm.padEnd(7)}: ${pmVersion}`,
-        ``,
+    const { pm, pmVersion, localPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
+    const fields = [
+        ['Node', process.versions.node],
+        ['OS', `${process.platform}-${process.arch}`],
+        ['Native Target', nativeTarget ?? 'Unavailable'],
+        [pm, pmVersion],
     ];
-    let padding = Math.max(...packageVersionsWeCareAbout.map((x) => x.package.length)) + 1;
+    let padding = Math.max(...fields.map((f) => f[0].length));
+    const bodyLines = fields.map(([field, value]) => `${field.padEnd(padding)}  : ${value}`);
+    bodyLines.push('');
+    padding =
+        Math.max(...packageVersionsWeCareAbout.map((x) => x.package.length)) + 1;
     packageVersionsWeCareAbout.forEach((p) => {
         bodyLines.push(`${chalk.green(p.package.padEnd(padding))} : ${chalk.bold(p.version)}`);
     });
@@ -116,6 +120,7 @@ async function getReportData() {
         });
     }
     const outOfSyncPackageGroup = findMisalignedPackagesForPackage(nxPackageJson);
+    const native = isNativeAvailable();
     return {
         pm,
         pmVersion,
@@ -125,6 +130,7 @@ async function getReportData() {
         packageVersionsWeCareAbout,
         outOfSyncPackageGroup,
         projectGraphError,
+        nativeTarget: native ? native.getBinaryTarget() : null,
     };
 }
 async function tryGetProjectGraph() {
@@ -248,8 +254,7 @@ function findInstalledPackagesWeCareAbout() {
 }
 function isNativeAvailable() {
     try {
-        require('../../native');
-        return true;
+        return require('../../native');
     }
     catch {
         return false;

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts

@@ -6,3 +6,9 @@ import type { Tree } from '../tree';
 export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree, options?: {
     silent?: boolean;
 }): Promise<void>;
+export declare function formatFilesWithPrettierIfAvailable(files: {
+    path: string;
+    content: string | Buffer;
+}[], root: string, options?: {
+    silent?: boolean;
+}): Promise<Map<string, string>>;

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js

@@ -1,23 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatChangedFilesWithPrettierIfAvailable = formatChangedFilesWithPrettierIfAvailable;
+exports.formatFilesWithPrettierIfAvailable = formatFilesWithPrettierIfAvailable;
 const path = require("path");
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
 async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
+    const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
+    const results = await formatFilesWithPrettierIfAvailable(Array.from(files), tree.root, options);
+    for (const [path, content] of results) {
+        tree.write(path, content);
+    }
+}
+async function formatFilesWithPrettierIfAvailable(files, root, options) {
+    const results = new Map();
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
     }
     catch { }
-    if (!prettier)
-        return;
-    const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
+    if (!prettier) {
+        return results;
+    }
     await Promise.all(Array.from(files).map(async (file) => {
         try {
-            const systemPath = path.join(tree.root, file.path);
+            const systemPath = path.join(root, file.path);
             let options = {
                 filepath: systemPath,
             };
@@ -35,7 +44,7 @@ async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
             if (support.ignored || !support.inferredParser) {
                 return;
             }
-            tree.write(file.path, 
+            results.set(file.path, 
             // In prettier v3 the format result is a promise
             await prettier.format(file.content.toString('utf-8'), options));
         }
@@ -45,4 +54,5 @@ async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
             }
         }
     }));
+    return results;
 }

package/src/native/index.d.ts

@@ -116,6 +116,8 @@ export interface FileSetInput {
 
 export declare export function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
 
+export declare export function getBinaryTarget(): string
+
 /**
  * Expands the given outputs into a list of existing files.
  * This is used when hashing outputs

package/src/native/native-bindings.js

@@ -372,6 +372,7 @@ module.exports.copy = nativeBinding.copy
 module.exports.EventType = nativeBinding.EventType
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
+module.exports.getBinaryTarget = nativeBinding.getBinaryTarget
 module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile

package/src/native/nx.wasi.cjs

@@ -88,39 +88,40 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__copy_3']?.()
   __napiInstance.exports['__napi_register__hash_array_4']?.()
   __napiInstance.exports['__napi_register__hash_file_5']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_6']?.()
-  __napiInstance.exports['__napi_register__find_imports_7']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_8']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_9']?.()
-  __napiInstance.exports['__napi_register__Target_struct_10']?.()
-  __napiInstance.exports['__napi_register__Project_struct_11']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_12']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_13']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_17']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_18']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_19']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_20']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_23']?.()
-  __napiInstance.exports['__napi_register__Task_struct_24']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_25']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_26']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_27']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_28']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_29']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_30']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_31']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_34']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_35']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_44']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_45']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_46']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_47']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_48']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_49']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_50']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_51']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_6']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_7']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_8']?.()
+  __napiInstance.exports['__napi_register__find_imports_9']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_10']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_11']?.()
+  __napiInstance.exports['__napi_register__Target_struct_12']?.()
+  __napiInstance.exports['__napi_register__Project_struct_13']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_14']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_15']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_19']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_20']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_21']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_22']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_25']?.()
+  __napiInstance.exports['__napi_register__Task_struct_26']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_27']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_28']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_29']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_30']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_31']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_32']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_36']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_37']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_46']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_47']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_48']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_49']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_50']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_51']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_52']?.()
 }
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
@@ -129,6 +130,7 @@ module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
 module.exports.copy = __napiModule.exports.copy
 module.exports.expandOutputs = __napiModule.exports.expandOutputs
 module.exports.findImports = __napiModule.exports.findImports
+module.exports.getBinaryTarget = __napiModule.exports.getBinaryTarget
 module.exports.getFilesForOutputs = __napiModule.exports.getFilesForOutputs
 module.exports.hashArray = __napiModule.exports.hashArray
 module.exports.hashFile = __napiModule.exports.hashFile

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

@@ -8,6 +8,7 @@ exports.unloadDotEnvFile = unloadDotEnvFile;
 const dotenv_1 = require("dotenv");
 const dotenv_expand_1 = require("dotenv-expand");
 const workspace_root_1 = require("../utils/workspace-root");
+const node_path_1 = require("node:path");
 function getEnvVariablesForBatchProcess(skipNxCache, captureStderr) {
     return {
         // User Process Env Variables override Dotenv Variables
@@ -158,13 +159,13 @@ function getEnvFilesForTask(task) {
 function loadDotEnvFilesForTask(task, environmentVariables) {
     const dotEnvFiles = getEnvFilesForTask(task);
     for (const file of dotEnvFiles) {
-        loadAndExpandDotEnvFile(file, environmentVariables);
+        loadAndExpandDotEnvFile((0, node_path_1.join)(workspace_root_1.workspaceRoot, file), environmentVariables);
     }
     return environmentVariables;
 }
 function unloadDotEnvFiles(environmentVariables) {
     for (const file of ['.env', '.local.env', '.env.local']) {
-        unloadDotEnvFile(file, environmentVariables);
+        unloadDotEnvFile((0, node_path_1.join)(workspace_root_1.workspaceRoot, file), environmentVariables);
     }
     return environmentVariables;
 }