nx 19.7.3 → 19.7.4

package/package.json

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

package/schemas/nx-schema.json

@@ -634,7 +634,7 @@
           "description": "Custom git commit message to use when committing the changes made by this command"
         },
         "commitArgs": {
-          "type": "string",
+          "type": ["string", "array"],
           "description": "Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes"
         },
         "stageChanges": {
@@ -650,7 +650,7 @@
           "description": "Custom git tag message to use when tagging the changes made by this command. This defaults to be the same value as the tag itself."
         },
         "tagArgs": {
-          "type": "string",
+          "type": ["string", "array"],
           "description": "Additional arguments to pass to the `git tag` command invoked behind the scenes"
         }
       }

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

@@ -232,8 +232,9 @@ async function importHandler(options) {
         title: `Merging these changes into ${(0, command_line_utils_1.getBaseRef)(nxJson)}`,
         bodyLines: [
             `MERGE these changes when merging these changes.`,
-            `Do NOT squash and do NOT rebase these changes when merging these changes.`,
-            `If you would like to UNDO these changes, run "git reset HEAD~1 --hard"`,
+            `Do NOT squash these commits when merging these changes.`,
+            `If you rebase, make sure to use "--rebase-merges" to preserve merge commits.`,
+            `To UNDO these changes, run "git reset HEAD~1 --hard"`,
         ],
     });
 }

package/src/command-line/import/utils/prepare-source-repo.js

@@ -3,46 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareSourceRepo = prepareSourceRepo;
 const createSpinner = require("ora");
 const path_1 = require("path");
-const promises_1 = require("node:fs/promises");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
-    if (relativeSourceDir !== '') {
-        if (await gitClient.hasFilterRepoInstalled()) {
-            spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
-            await gitClient.filterRepo(relativeSourceDir);
-        }
-        else {
-            spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
-            await gitClient.filterBranch(relativeSourceDir, tempImportBranch);
-        }
-        spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    if (await gitClient.hasFilterRepoInstalled()) {
+        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
-    const destinationInSource = (0, path_1.join)(gitClient.root, relativeDestination);
-    spinner.start(`Moving files and git history to ${destinationInSource}`);
-    // The result of filter-branch will contain only the files in the subdirectory at its root.
-    const files = await gitClient.getGitFiles('.');
-    try {
-        await (0, promises_1.rm)(destinationInSource, {
-            recursive: true,
-        });
+    else {
+        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    catch { }
-    await (0, promises_1.mkdir)(destinationInSource, { recursive: true });
-    for (const file of files) {
-        spinner.start(`Moving files and git history to ${destinationInSource}: ${file}`);
-        const newPath = (0, path_1.join)(destinationInSource, file);
-        await (0, promises_1.mkdir)((0, path_1.dirname)(newPath), { recursive: true });
-        try {
-            await gitClient.move(file, newPath);
-        }
-        catch {
-            await wait(100);
-            await gitClient.move(file, newPath);
-        }
-    }
-    await gitClient.commit(`chore(repo): move ${source} to ${relativeDestination} to prepare to be imported`);
-    await gitClient.amendCommit();
+    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

package/src/command-line/init/init-v2.js

@@ -128,7 +128,7 @@ const npmPackageToPluginMap = {
     '@remix-run/dev': '@nx/remix',
 };
 async function detectPlugins(nxJson, interactive) {
-    let files = ['package.json'].concat(await (0, workspace_context_1.globWithWorkspaceContext)(process.cwd(), ['**/*/package.json']));
+    let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));
     const currentPlugins = new Set((nxJson.plugins ?? []).map((p) => {
         const plugin = typeof p === 'string' ? p : p.plugin;
         return (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(plugin);
@@ -155,7 +155,11 @@ async function detectPlugins(nxJson, interactive) {
             }
         }
     }
-    if ((0, fs_1.existsSync)('gradlew') || (0, fs_1.existsSync)('gradlew.bat')) {
+    let gradlewFiles = ['gradlew', 'gradlew.bat'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), [
+        '**/gradlew',
+        '**/gradlew.bat',
+    ]));
+    if (gradlewFiles.some((f) => (0, fs_1.existsSync)(f))) {
         detectedPlugins.add('@nx/gradle');
     }
     // Remove existing plugins

package/src/command-line/release/command-object.d.ts

@@ -14,10 +14,10 @@ interface GitCommitAndTagOptions {
     stageChanges?: boolean;
     gitCommit?: boolean;
     gitCommitMessage?: string;
-    gitCommitArgs?: string;
+    gitCommitArgs?: string | string[];
     gitTag?: boolean;
     gitTagMessage?: string;
-    gitTagArgs?: string;
+    gitTagArgs?: string | string[];
 }
 export type VersionOptions = NxReleaseArgs & GitCommitAndTagOptions & VersionPlanArgs & FirstReleaseArgs & {
     specifier?: string;

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

@@ -21,6 +21,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const find_matching_projects_1 = require("../../../utils/find-matching-projects");
 const output_1 = require("../../../utils/output");
 const workspace_root_1 = require("../../../utils/workspace-root");
+const path_1 = require("../../../utils/path");
 const resolve_changelog_renderer_1 = require("../utils/resolve-changelog-renderer");
 const resolve_nx_json_error_message_1 = require("../utils/resolve-nx-json-error-message");
 const conventional_commits_1 = require("./conventional-commits");
@@ -154,6 +155,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             conventionalCommits: false,
             generator: '@nx/js:release-version',
             generatorOptions: {},
+            groupPreVersionCommand: '',
         },
         changelog: {
             createRelease: false,
@@ -205,7 +207,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         WORKSPACE_DEFAULTS.versionPlans);
     const rootConventionalCommitsConfig = deepMergeDefaults([WORKSPACE_DEFAULTS.conventionalCommits], fillUnspecifiedConventionalCommitsProperties(normalizeConventionalCommitsConfig(userConfig.conventionalCommits)));
     // these options are not supported at the group level, only the root/command level
-    const rootVersionWithoutGlobalOptions = { ...rootVersionConfig };
+    const rootVersionWithoutGlobalOptions = {
+        ...rootVersionConfig,
+    };
     delete rootVersionWithoutGlobalOptions.git;
     delete rootVersionWithoutGlobalOptions.preVersionCommand;
     // Apply conventionalCommits shorthand to the final group defaults if explicitly configured in the original user config
@@ -315,7 +319,10 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             projects: matchingProjects,
             version: deepMergeDefaults(
             // First apply any group level defaults, then apply actual root level config, then group level config
-            [GROUP_DEFAULTS.version, rootVersionWithoutGlobalOptions], releaseGroup.version),
+            [
+                GROUP_DEFAULTS.version,
+                { ...rootVersionWithoutGlobalOptions, groupPreVersionCommand: '' },
+            ], releaseGroup.version),
             // If the user has set any changelog config at all, including at the root level, then use one set of defaults, otherwise default to false for the whole feature
             changelog: releaseGroup.changelog || rootChangelogConfig.projectChangelogs
                 ? deepMergeDefaults(groupChangelogDefaults, releaseGroup.changelog || {})
@@ -657,7 +664,7 @@ async function getDefaultProjects(projectGraph, projectFileMap) {
 function isProjectPublic(project, projectGraph, projectFileMap) {
     const projectNode = projectGraph.nodes[project];
     const packageJsonPath = (0, node_path_1.join)(projectNode.data.root, 'package.json');
-    if (!projectFileMap[project]?.find((f) => f.file === packageJsonPath)) {
+    if (!projectFileMap[project]?.find((f) => f.file === (0, path_1.normalizePath)(packageJsonPath))) {
         return false;
     }
     try {

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

@@ -37,7 +37,7 @@ export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, lo
 }): Promise<string>;
 export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }: {
     messages: string[];
-    additionalArgs?: string;
+    additionalArgs?: string | string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (message: string) => void;
@@ -45,7 +45,7 @@ export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, l
 export declare function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, }: {
     tag: string;
     message?: string;
-    additionalArgs?: string;
+    additionalArgs?: string | string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (message: string) => void;

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

@@ -188,7 +188,12 @@ async function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, })
         commandArgs.push('--message', message);
     }
     if (additionalArgs) {
-        commandArgs.push(...additionalArgs.split(' '));
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
     }
     if (verbose) {
         logFn(dryRun
@@ -224,7 +229,12 @@ async function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, })
         message || tag,
     ];
     if (additionalArgs) {
-        commandArgs.push(...additionalArgs.split(' '));
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
     }
     if (verbose) {
         logFn(dryRun

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

@@ -45,7 +45,7 @@ export declare function commitChanges({ changedFiles, deletedFiles, isDryRun, is
     isDryRun?: boolean;
     isVerbose?: boolean;
     gitCommitMessages?: string[];
-    gitCommitArgs?: string;
+    gitCommitArgs?: string | string[];
 }): Promise<void>;
 export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, commitMessage: string): string[];
 export declare function createGitTagValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData): string[];

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

@@ -207,6 +207,10 @@ function createAPI(overrideReleaseConfig) {
          */
         for (const releaseGroup of releaseGroups) {
             const releaseGroupName = releaseGroup.name;
+            runPreVersionCommand(releaseGroup.version.groupPreVersionCommand, {
+                dryRun: args.dryRun,
+                verbose: args.verbose,
+            });
             const projectBatches = (0, batch_projects_by_generator_config_1.batchProjectsByGeneratorConfig)(projectGraph, releaseGroup, 
             // Batch based on all projects within the release group
             releaseGroup.projects);

package/src/config/nx-json.d.ts

@@ -101,9 +101,9 @@ export interface NxReleaseGitConfiguration {
      */
     commitMessage?: string;
     /**
-     * Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes
+     * Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes. May be a string or array of strings.
      */
-    commitArgs?: string;
+    commitArgs?: string | string[];
     /**
      * Whether or not to stage the changes made by this command. Always treated as true if commit is true.
      */
@@ -117,9 +117,9 @@ export interface NxReleaseGitConfiguration {
      */
     tagMessage?: string;
     /**
-     * Additional arguments to pass to the `git tag` command invoked behind the scenes
+     * Additional arguments to pass to the `git tag` command invoked behind the scenes. . May be a string or array of strings.
      */
-    tagArgs?: string;
+    tagArgs?: string | string[];
 }
 export interface NxReleaseConventionalCommitsConfiguration {
     types?: Record<string, 
@@ -179,7 +179,15 @@ export interface NxReleaseConfiguration {
          *
          * NOTE: git configuration is not supported at the group level, only the root/command level
          */
-        version?: NxReleaseVersionConfiguration;
+        version?: NxReleaseVersionConfiguration & {
+            /**
+             * A command to run after validation of nx release configuration, but before versioning begins.
+             * Used for preparing build artifacts. If --dry-run is passed, the command is still executed, but
+             * with the NX_DRY_RUN environment variable set to 'true'.
+             * It will run in addition to the global `preVersionCommand`
+             */
+            groupPreVersionCommand?: string;
+        };
         /**
          * Project changelogs are disabled by default.
          *

package/src/hasher/hash-task.js

@@ -11,7 +11,7 @@ const db_connection_1 = require("../utils/db-connection");
 let taskDetails;
 function getTaskDetails() {
     // TODO: Remove when wasm supports sqlite
-    if (native_1.IS_WASM) {
+    if (process.env.NX_DISABLE_DB === 'true' || native_1.IS_WASM) {
         return null;
     }
     if (!taskDetails) {
@@ -42,7 +42,7 @@ async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGrap
         tasksToHash[i].hash = hashes[i].value;
         tasksToHash[i].hashDetails = hashes[i].details;
     }
-    // TODO: Remove if when wasm supports sqlite
+    // TODO: Remove if when sqlite is always on
     if (taskDetails) {
         taskDetails.recordTaskDetails(tasksToHash.map((task) => ({
             hash: task.hash,

package/src/native/nx.wasi-browser.js

@@ -51,63 +51,51 @@ const {
 })
 
 function __napi_rs_initialize_modules(__napiInstance) {
-  __napiInstance.exports['__napi_register__CachedResult_struct_0']?.()
-  __napiInstance.exports['__napi_register__NxCache_struct_1']?.()
-  __napiInstance.exports['__napi_register__NxCache_impl_9']?.()
-  __napiInstance.exports['__napi_register__expand_outputs_10']?.()
-  __napiInstance.exports['__napi_register__get_files_for_outputs_11']?.()
-  __napiInstance.exports['__napi_register__remove_12']?.()
-  __napiInstance.exports['__napi_register__copy_13']?.()
-  __napiInstance.exports['__napi_register__validate_outputs_14']?.()
-  __napiInstance.exports['__napi_register__get_transformable_outputs_15']?.()
-  __napiInstance.exports['__napi_register__hash_array_16']?.()
-  __napiInstance.exports['__napi_register__hash_file_17']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_18']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_19']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_20']?.()
-  __napiInstance.exports['__napi_register__find_imports_21']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_22']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_23']?.()
-  __napiInstance.exports['__napi_register__Target_struct_24']?.()
-  __napiInstance.exports['__napi_register__Project_struct_25']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_26']?.()
-  __napiInstance.exports['__napi_register__HashedTask_struct_27']?.()
-  __napiInstance.exports['__napi_register__TaskDetails_struct_28']?.()
-  __napiInstance.exports['__napi_register__TaskDetails_impl_31']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_32']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_36']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_37']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_38']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_39']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_42']?.()
-  __napiInstance.exports['__napi_register__TaskRun_struct_43']?.()
-  __napiInstance.exports['__napi_register__NxTaskHistory_struct_44']?.()
-  __napiInstance.exports['__napi_register__NxTaskHistory_impl_48']?.()
-  __napiInstance.exports['__napi_register__Task_struct_49']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_50']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_51']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_52']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_53']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_54']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_55']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_56']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_57']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_58']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_59']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_60']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_69']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_70']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_71']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_72']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_73']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_74']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_75']?.()
+  __napiInstance.exports['__napi_register__expand_outputs_0']?.()
+  __napiInstance.exports['__napi_register__get_files_for_outputs_1']?.()
+  __napiInstance.exports['__napi_register__remove_2']?.()
+  __napiInstance.exports['__napi_register__copy_3']?.()
+  __napiInstance.exports['__napi_register__validate_outputs_4']?.()
+  __napiInstance.exports['__napi_register__get_transformable_outputs_5']?.()
+  __napiInstance.exports['__napi_register__hash_array_6']?.()
+  __napiInstance.exports['__napi_register__hash_file_7']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_8']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_9']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_10']?.()
+  __napiInstance.exports['__napi_register__find_imports_11']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_12']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_13']?.()
+  __napiInstance.exports['__napi_register__Target_struct_14']?.()
+  __napiInstance.exports['__napi_register__Project_struct_15']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_16']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_17']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_21']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_22']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_23']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_24']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
+  __napiInstance.exports['__napi_register__Task_struct_28']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_30']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_31']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_32']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_39']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_48']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_49']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_50']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_51']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_52']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_53']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_54']?.()
 }
 export const HashPlanner = __napiModule.exports.HashPlanner
 export const ImportResult = __napiModule.exports.ImportResult
-export const NxCache = __napiModule.exports.NxCache
-export const NxTaskHistory = __napiModule.exports.NxTaskHistory
-export const TaskDetails = __napiModule.exports.TaskDetails
 export const TaskHasher = __napiModule.exports.TaskHasher
 export const WorkspaceContext = __napiModule.exports.WorkspaceContext
 export const copy = __napiModule.exports.copy

package/src/native/nx.wasi.cjs

@@ -82,63 +82,51 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
 })
 
 function __napi_rs_initialize_modules(__napiInstance) {
-  __napiInstance.exports['__napi_register__CachedResult_struct_0']?.()
-  __napiInstance.exports['__napi_register__NxCache_struct_1']?.()
-  __napiInstance.exports['__napi_register__NxCache_impl_9']?.()
-  __napiInstance.exports['__napi_register__expand_outputs_10']?.()
-  __napiInstance.exports['__napi_register__get_files_for_outputs_11']?.()
-  __napiInstance.exports['__napi_register__remove_12']?.()
-  __napiInstance.exports['__napi_register__copy_13']?.()
-  __napiInstance.exports['__napi_register__validate_outputs_14']?.()
-  __napiInstance.exports['__napi_register__get_transformable_outputs_15']?.()
-  __napiInstance.exports['__napi_register__hash_array_16']?.()
-  __napiInstance.exports['__napi_register__hash_file_17']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_18']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_19']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_20']?.()
-  __napiInstance.exports['__napi_register__find_imports_21']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_22']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_23']?.()
-  __napiInstance.exports['__napi_register__Target_struct_24']?.()
-  __napiInstance.exports['__napi_register__Project_struct_25']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_26']?.()
-  __napiInstance.exports['__napi_register__HashedTask_struct_27']?.()
-  __napiInstance.exports['__napi_register__TaskDetails_struct_28']?.()
-  __napiInstance.exports['__napi_register__TaskDetails_impl_31']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_32']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_36']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_37']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_38']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_39']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_42']?.()
-  __napiInstance.exports['__napi_register__TaskRun_struct_43']?.()
-  __napiInstance.exports['__napi_register__NxTaskHistory_struct_44']?.()
-  __napiInstance.exports['__napi_register__NxTaskHistory_impl_48']?.()
-  __napiInstance.exports['__napi_register__Task_struct_49']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_50']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_51']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_52']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_53']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_54']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_55']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_56']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_57']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_58']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_59']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_60']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_69']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_70']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_71']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_72']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_73']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_74']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_75']?.()
+  __napiInstance.exports['__napi_register__expand_outputs_0']?.()
+  __napiInstance.exports['__napi_register__get_files_for_outputs_1']?.()
+  __napiInstance.exports['__napi_register__remove_2']?.()
+  __napiInstance.exports['__napi_register__copy_3']?.()
+  __napiInstance.exports['__napi_register__validate_outputs_4']?.()
+  __napiInstance.exports['__napi_register__get_transformable_outputs_5']?.()
+  __napiInstance.exports['__napi_register__hash_array_6']?.()
+  __napiInstance.exports['__napi_register__hash_file_7']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_8']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_9']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_10']?.()
+  __napiInstance.exports['__napi_register__find_imports_11']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_12']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_13']?.()
+  __napiInstance.exports['__napi_register__Target_struct_14']?.()
+  __napiInstance.exports['__napi_register__Project_struct_15']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_16']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_17']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_21']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_22']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_23']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_24']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
+  __napiInstance.exports['__napi_register__Task_struct_28']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_30']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_31']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_32']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_39']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_48']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_49']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_50']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_51']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_52']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_53']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_54']?.()
 }
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
-module.exports.NxCache = __napiModule.exports.NxCache
-module.exports.NxTaskHistory = __napiModule.exports.NxTaskHistory
-module.exports.TaskDetails = __napiModule.exports.TaskDetails
 module.exports.TaskHasher = __napiModule.exports.TaskHasher
 module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
 module.exports.copy = __napiModule.exports.copy

package/src/plugins/js/utils/register.js

@@ -63,6 +63,13 @@ function registerTsProject(path, configFilename) {
     //       Based on limited testing, it doesn't seem to matter if we register it multiple times, but just in
     //       case let's keep a flag to prevent it.
     if (!isTsEsmLoaderRegistered) {
+        // We need a way to ensure that `.ts` files are treated as ESM not CJS.
+        // Since there is no way to pass compilerOptions like we do with the programmatic API, we should default
+        // the environment variable that ts-node checks.
+        process.env.TS_NODE_COMPILER_OPTIONS ??= JSON.stringify({
+            moduleResolution: 'nodenext',
+            module: 'nodenext',
+        });
         const module = require('node:module');
         if (module.register && packageIsInstalled('ts-node/esm')) {
             const url = require('node:url');

package/src/tasks-runner/cache.js

@@ -17,7 +17,8 @@ const nx_json_1 = require("../config/nx-json");
 const update_manager_1 = require("../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
 function getCache(options) {
-    return process.env.NX_DB_CACHE === 'true'
+    return process.env.NX_DISABLE_DB !== 'true' &&
+        process.env.NX_DB_CACHE === 'true'
         ? new DbCache({
             // Remove this in Nx 21
             nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())

package/src/tasks-runner/run-command.js

@@ -439,7 +439,9 @@ function constructLifeCycles(lifeCycle) {
         lifeCycles.push(new task_profiling_life_cycle_1.TaskProfilingLifeCycle(process.env.NX_PROFILE));
     }
     if (!(0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())) {
-        lifeCycles.push(!native_1.IS_WASM ? new task_history_life_cycle_1.TaskHistoryLifeCycle() : new task_history_life_cycle_old_1.LegacyTaskHistoryLifeCycle());
+        lifeCycles.push(process.env.NX_DISABLE_DB !== 'true' && !native_1.IS_WASM
+            ? new task_history_life_cycle_1.TaskHistoryLifeCycle()
+            : new task_history_life_cycle_old_1.LegacyTaskHistoryLifeCycle());
     }
     return lifeCycles;
 }

package/src/tasks-runner/task-orchestrator.d.ts

@@ -40,7 +40,6 @@ export declare class TaskOrchestrator {
     private runTaskInForkedProcess;
     private preRunSteps;
     private postRunSteps;
-    private scheduleNextTasks;
     private complete;
     private pipeOutputCapture;
     private shouldCacheTaskResult;

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

@@ -43,7 +43,7 @@ class TaskOrchestrator {
         // Init the ForkedProcessTaskRunner
         await this.forkedProcessTaskRunner.init();
         // initial scheduling
-        await this.scheduleNextTasks();
+        await this.tasksSchedule.scheduleNextTasks();
         perf_hooks_1.performance.mark('task-execution:start');
         const threads = [];
         process.stdout.setMaxListeners(this.options.parallel + events_1.defaultMaxListeners);
@@ -65,6 +65,7 @@ class TaskOrchestrator {
         }
         const doNotSkipCache = this.options.skipNxCache === false ||
             this.options.skipNxCache === undefined;
+        this.processAllScheduledTasks();
         const batch = this.tasksSchedule.nextBatch();
         if (batch) {
             const groupId = this.closeGroup();
@@ -373,15 +374,11 @@ class TaskOrchestrator {
                 status,
             };
         }));
-        await this.scheduleNextTasks();
+        await this.tasksSchedule.scheduleNextTasks();
         // release blocked threads
         this.waitingForTasks.forEach((f) => f(null));
         this.waitingForTasks.length = 0;
     }
-    async scheduleNextTasks() {
-        await this.tasksSchedule.scheduleNextTasks();
-        this.processAllScheduledTasks();
-    }
     complete(taskResults) {
         this.tasksSchedule.complete(taskResults.map(({ taskId }) => taskId));
         for (const { taskId, status } of taskResults) {

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

@@ -25,10 +25,11 @@ export declare class GitRepository {
     deleteGitRemote(name: string): Promise<string>;
     addGitRemote(name: string, url: string): Promise<string>;
     hasFilterRepoInstalled(): Promise<boolean>;
-    filterRepo(subdirectory: string): Promise<string>;
-    filterBranch(subdirectory: string, branchName: string): Promise<string>;
+    filterRepo(source: string, destination: string): Promise<void>;
+    filterBranch(source: string, destination: string, branchName: string): Promise<void>;
     private execAsync;
     private quotePath;
+    private quoteArg;
 }
 /**
  * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.

package/src/utils/git-utils.index-filter.js

@@ -0,0 +1,20 @@
+/**
+ * This is meant to be used with `git filter-branch --index-filter` to rewrite
+ * history such that only commits related to the subdirectory is kept.
+ *
+ * Example:
+ * NX_IMPORT_SOURCE=<source> git filter-branch --index-filter 'node git-utils.index-filter.js' --prune-empty -- --all
+ */
+try {
+    const { execSync } = require('child_process');
+    // NOTE: Using env vars because Windows PowerShell has its own handling of quotes (") messes up quotes in args, even if escaped.
+    const src = process.env.NX_IMPORT_SOURCE;
+    execSync('git read-tree --empty', { stdio: 'inherit' });
+    execSync(`git reset ${process.env.GIT_COMMIT} -- "${src}"`, {
+        stdio: 'inherit',
+    });
+}
+catch (error) {
+    console.error(`Error executing Git commands: ${error}`);
+    process.exit(1);
+}

package/src/utils/git-utils.js

@@ -105,32 +105,63 @@ class GitRepository {
     }
     // git-filter-repo is much faster than filter-branch, but needs to be installed by user
     // Use `hasFilterRepoInstalled` to check if it's installed
-    async filterRepo(subdirectory) {
-        // filter-repo requires POSIX path to work
-        const posixPath = subdirectory.split(path_1.sep).join(path_1.posix.sep);
-        return await this.execAsync(`git filter-repo -f --subdirectory-filter ${this.quotePath(posixPath)}`);
-    }
-    async filterBranch(subdirectory, branchName) {
-        // filter-repo requires POSIX path to work
-        const posixPath = subdirectory.split(path_1.sep).join(path_1.posix.sep);
+    async filterRepo(source, destination) {
+        // NOTE: filter-repo requires POSIX path to work
+        const sourcePosixPath = source.split(path_1.sep).join(path_1.posix.sep);
+        const destinationPosixPath = destination.split(path_1.sep).join(path_1.posix.sep);
+        await this.execAsync(`git filter-repo -f ${source !== '' ? `--path ${this.quotePath(sourcePosixPath)}` : ''} ${source !== destination
+            ? `--path-rename ${this.quotePath(sourcePosixPath, true)}:${this.quotePath(destinationPosixPath, true)}`
+            : ''}`);
+    }
+    async filterBranch(source, destination, branchName) {
         // We need non-ASCII file names to not be quoted, or else filter-branch will exclude them.
         await this.execAsync(`git config core.quotepath false`);
-        return await this.execAsync(`git filter-branch --subdirectory-filter ${this.quotePath(posixPath)} -- ${branchName}`);
+        // NOTE: filter-repo requires POSIX path to work
+        const sourcePosixPath = source.split(path_1.sep).join(path_1.posix.sep);
+        const destinationPosixPath = destination.split(path_1.sep).join(path_1.posix.sep);
+        // First, if the source is not a root project, then only include commits relevant to the subdirectory.
+        if (source !== '') {
+            const indexFilterCommand = this.quoteArg(`node ${(0, path_1.join)(__dirname, 'git-utils.index-filter.js')}`);
+            await this.execAsync(`git filter-branch -f --index-filter ${indexFilterCommand} --prune-empty -- ${branchName}`, {
+                NX_IMPORT_SOURCE: sourcePosixPath,
+                NX_IMPORT_DESTINATION: destinationPosixPath,
+            });
+        }
+        // Then, move files to their new location if necessary.
+        if (source === '' || source !== destination) {
+            const treeFilterCommand = this.quoteArg(`node ${(0, path_1.join)(__dirname, 'git-utils.tree-filter.js')}`);
+            await this.execAsync(`git filter-branch -f --tree-filter ${treeFilterCommand} -- ${branchName}`, {
+                NX_IMPORT_SOURCE: sourcePosixPath,
+                NX_IMPORT_DESTINATION: destinationPosixPath,
+            });
+        }
     }
-    execAsync(command) {
+    execAsync(command, env) {
         return execAsync(command, {
             cwd: this.root,
             maxBuffer: 10 * 1024 * 1024,
+            env: {
+                ...process.env,
+                ...env,
+            },
         });
     }
-    quotePath(path) {
+    quotePath(path, ensureTrailingSlash) {
+        return this.quoteArg(ensureTrailingSlash && path !== '' && !path.endsWith('/')
+            ? `${path}/`
+            : path);
+    }
+    quoteArg(arg) {
         return process.platform === 'win32'
             ? // Windows/CMD only understands double-quotes, single-quotes are treated as part of the file name
                 // Bash and other shells will substitute `$` in file names with a variable value.
-                `"${path}"`
+                `"${arg
+                    // Need to keep two slashes for Windows or else the path will be invalid.
+                    // e.g. 'C:\Users\bob\projects\repo' is invalid, but 'C:\\Users\\bob\\projects\\repo' is valid
+                    .replaceAll('\\', '\\\\')}"`
             : // e.g. `git mv "$$file.txt" "libs/a/$$file.txt"` will not work since `$$` is swapped with the PID of the last process.
                 // Using single-quotes prevents this substitution.
-                `'${path}'`;
+                `'${arg}'`;
     }
 }
 exports.GitRepository = GitRepository;

package/src/utils/git-utils.tree-filter.d.ts

@@ -0,0 +1,11 @@
+/**
+ * This is meant to be used with `git filter-branch --tree-filter` to rewrite
+ * history to only include commits related to the source project folder. If the
+ * destination folder is different, this script also moves the files over.
+ *
+ * Example:
+ * NX_IMPORT_SOURCE=<source> NX_IMPORT_DESTINATION=<destination> git filter-branch --tree-filter 'node git-utils.tree-filter.js' --prune-empty -- --all
+ */
+declare const execSync: any;
+declare const existsSync: any, mkdirSync: any, renameSync: any, rmSync: any;
+declare const posix: any;

package/src/utils/git-utils.tree-filter.js

@@ -0,0 +1,43 @@
+/**
+ * This is meant to be used with `git filter-branch --tree-filter` to rewrite
+ * history to only include commits related to the source project folder. If the
+ * destination folder is different, this script also moves the files over.
+ *
+ * Example:
+ * NX_IMPORT_SOURCE=<source> NX_IMPORT_DESTINATION=<destination> git filter-branch --tree-filter 'node git-utils.tree-filter.js' --prune-empty -- --all
+ */
+const { execSync } = require('child_process');
+const { existsSync, mkdirSync, renameSync, rmSync } = require('fs');
+// NOTE: The path passed to `git filter-branch` is POSIX, so we need to use the `posix` module.
+const { posix } = require('path');
+try {
+    // NOTE: Using env vars because Windows PowerShell has its own handling of quotes (") messes up quotes in args, even if escaped.
+    const src = process.env.NX_IMPORT_SOURCE;
+    const dest = process.env.NX_IMPORT_DESTINATION;
+    const files = execSync(`git ls-files -z ${src}`)
+        .toString()
+        .trim()
+        .split('\x00')
+        .map((s) => s.trim())
+        .filter(Boolean);
+    for (const file of files) {
+        if (src === '' || file.startsWith(src)) {
+            // If source and destination are the same, then keep the file as is.
+            if (src === dest)
+                continue;
+            const destFile = posix.join(dest, file.replace(src, ''));
+            const dir = posix.dirname(destFile);
+            if (!existsSync(dir))
+                mkdirSync(dir, { recursive: true });
+            renameSync(file, destFile);
+        }
+        else {
+            // If not matching the source we are filtering, remove it.
+            rmSync(file);
+        }
+    }
+}
+catch (error) {
+    console.error(`Error executing Git commands: ${error}`);
+    process.exit(1);
+}