nx 19.7.3 → 19.8.0-beta.0

package/src/tasks-runner/init-tasks-runner.js

@@ -39,7 +39,7 @@ async function initTasksRunner(nxArgs) {
                     return acc;
                 }, {}),
             };
-            const status = await (0, run_command_1.invokeTasksRunner)({
+            const taskResults = await (0, run_command_1.invokeTasksRunner)({
                 tasks: opts.tasks,
                 projectGraph,
                 taskGraph,
@@ -50,9 +50,11 @@ async function initTasksRunner(nxArgs) {
                 initiatingProject: null,
             });
             return {
-                status,
+                status: Object.values(taskResults).some((taskResult) => taskResult.status === 'failure' || taskResult.status === 'skipped')
+                    ? 1
+                    : 0,
                 taskGraph,
-                taskResults: lifeCycle.getTaskResults(),
+                taskResults,
             };
         },
     };

package/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.d.ts

@@ -5,11 +5,9 @@ export declare class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle {
     private readonly tasks;
     failedTasks: Task[];
     cachedTasks: Task[];
-    private taskResults;
     constructor(tasks: Task[]);
     startCommand(): void;
     endCommand(): void;
     endTasks(taskResults: TaskResult[]): void;
     printTaskTerminalOutput(task: Task, cacheStatus: TaskStatus, terminalOutput: string): void;
-    getTaskResults(): Record<string, TaskResult>;
 }

package/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.js

@@ -8,7 +8,6 @@ class InvokeRunnerTerminalOutputLifeCycle {
         this.tasks = tasks;
         this.failedTasks = [];
         this.cachedTasks = [];
-        this.taskResults = {};
     }
     startCommand() {
         output_1.output.log({
@@ -46,7 +45,6 @@ class InvokeRunnerTerminalOutputLifeCycle {
     }
     endTasks(taskResults) {
         for (let t of taskResults) {
-            this.taskResults[t.task.id] = t;
             if (t.status === 'failure') {
                 this.failedTasks.push(t.task);
             }
@@ -65,8 +63,5 @@ class InvokeRunnerTerminalOutputLifeCycle {
         const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
         output_1.output.logCommandOutput(args.join(' '), cacheStatus, terminalOutput);
     }
-    getTaskResults() {
-        return this.taskResults;
-    }
 }
 exports.InvokeRunnerTerminalOutputLifeCycle = InvokeRunnerTerminalOutputLifeCycle;

package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.d.ts

@@ -1,5 +1,5 @@
 import { TaskStatus } from '../tasks-runner';
-import type { LifeCycle } from '../life-cycle';
+import type { LifeCycle, TaskResult } from '../life-cycle';
 import { Task } from '../../config/task-graph';
 /**
  * The following life cycle's outputs are static, meaning no previous content
@@ -24,10 +24,6 @@ export declare class StaticRunManyTerminalOutputLifeCycle implements LifeCycle {
     startCommand(): void;
     endCommand(): void;
     private skippedTasks;
-    endTasks(taskResults: {
-        task: Task;
-        status: TaskStatus;
-        code: number;
-    }[]): void;
+    endTasks(taskResults: TaskResult[]): void;
     printTaskTerminalOutput(task: Task, cacheStatus: TaskStatus, terminalOutput: string): void;
 }

package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.d.ts

@@ -1,5 +1,5 @@
 import { TaskStatus } from '../tasks-runner';
-import type { LifeCycle } from '../life-cycle';
+import type { LifeCycle, TaskResult } from '../life-cycle';
 import { Task } from '../../config/task-graph';
 /**
  * The following life cycle's outputs are static, meaning no previous content
@@ -23,10 +23,6 @@ export declare class StaticRunOneTerminalOutputLifeCycle implements LifeCycle {
     });
     startCommand(): void;
     endCommand(): void;
-    endTasks(taskResults: {
-        task: Task;
-        status: TaskStatus;
-        code: number;
-    }[]): void;
+    endTasks(taskResults: TaskResult[]): void;
     printTaskTerminalOutput(task: Task, status: TaskStatus, terminalOutput: string): void;
 }

package/src/tasks-runner/life-cycles/store-run-information-life-cycle.d.ts

@@ -1,6 +1,5 @@
-import { LifeCycle } from '../../tasks-runner/life-cycle';
+import { LifeCycle, TaskResult } from '../../tasks-runner/life-cycle';
 import { Task } from '../../config/task-graph';
-import { TaskStatus } from '../../tasks-runner/tasks-runner';
 export declare class StoreRunInformationLifeCycle implements LifeCycle {
     private readonly command;
     private readonly storeFile;
@@ -10,11 +9,7 @@ export declare class StoreRunInformationLifeCycle implements LifeCycle {
     private taskResults;
     constructor(command?: string, storeFile?: typeof storeFileFunction, now?: () => string);
     startTasks(tasks: Task[]): void;
-    endTasks(taskResults: Array<{
-        task: Task;
-        status: TaskStatus;
-        code: number;
-    }>): void;
+    endTasks(taskResults: TaskResult[]): void;
     startCommand(): void;
     endCommand(): any;
 }

package/src/tasks-runner/life-cycles/task-history-life-cycle.js

@@ -8,7 +8,7 @@ class TaskHistoryLifeCycle {
     constructor() {
         this.startTimings = {};
         this.taskRuns = new Map();
-        this.taskHistory = new task_history_1.TaskHistory();
+        this.taskHistory = (0, task_history_1.getTaskHistory)();
     }
     startTasks(tasks) {
         for (let task of tasks) {

package/src/tasks-runner/life-cycles/task-profiling-life-cycle.d.ts

@@ -1,5 +1,4 @@
-import { LifeCycle, TaskMetadata } from '../life-cycle';
-import { TaskStatus } from '../tasks-runner';
+import { LifeCycle, TaskMetadata, TaskResult } from '../life-cycle';
 import { Task } from '../../config/task-graph';
 export declare class TaskProfilingLifeCycle implements LifeCycle {
     private timings;
@@ -8,11 +7,7 @@ export declare class TaskProfilingLifeCycle implements LifeCycle {
     private registeredGroups;
     constructor(_profileFile: string);
     startTasks(tasks: Task[], { groupId }: TaskMetadata): void;
-    endTasks(taskResults: Array<{
-        task: Task;
-        status: TaskStatus;
-        code: number;
-    }>, metadata: TaskMetadata): void;
+    endTasks(taskResults: TaskResult[], metadata: TaskMetadata): void;
     endCommand(): void;
     private recordTaskCompletions;
     private registerGroup;

package/src/tasks-runner/life-cycles/task-results-life-cycle.d.ts

@@ -0,0 +1,6 @@
+import type { LifeCycle, TaskResult } from '../life-cycle';
+export declare class TaskResultsLifeCycle implements LifeCycle {
+    private taskResults;
+    endTasks(taskResults: TaskResult[]): void;
+    getTaskResults(): Record<string, TaskResult>;
+}

package/src/tasks-runner/life-cycles/task-results-life-cycle.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskResultsLifeCycle = void 0;
+class TaskResultsLifeCycle {
+    constructor() {
+        this.taskResults = {};
+    }
+    endTasks(taskResults) {
+        for (let t of taskResults) {
+            this.taskResults[t.task.id] = t;
+        }
+    }
+    getTaskResults() {
+        return this.taskResults;
+    }
+}
+exports.TaskResultsLifeCycle = TaskResultsLifeCycle;

package/src/tasks-runner/life-cycles/task-timings-life-cycle.d.ts

@@ -1,13 +1,8 @@
 import { Task } from '../../config/task-graph';
-import { LifeCycle } from '../life-cycle';
-import { TaskStatus } from '../tasks-runner';
+import { LifeCycle, TaskResult } from '../life-cycle';
 export declare class TaskTimingsLifeCycle implements LifeCycle {
     private timings;
     startTasks(tasks: Task[]): void;
-    endTasks(taskResults: Array<{
-        task: Task;
-        status: TaskStatus;
-        code: number;
-    }>): void;
+    endTasks(taskResults: TaskResult[]): void;
     endCommand(): void;
 }

package/src/tasks-runner/run-command.d.ts

@@ -3,7 +3,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import { Task, TaskGraph } from '../config/task-graph';
 import { TargetDependencyConfig } from '../config/workspace-json-project-json';
 import { NxArgs } from '../utils/command-line-utils';
-import { LifeCycle } from './life-cycle';
+import { LifeCycle, TaskResult } from './life-cycle';
 import { TasksRunner } from './tasks-runner';
 export declare function runCommand(projectsToRun: ProjectGraphProjectNode[], currentProjectGraph: ProjectGraph, { nxJson }: {
     nxJson: NxJsonConfiguration;
@@ -11,6 +11,14 @@ export declare function runCommand(projectsToRun: ProjectGraphProjectNode[], cur
     excludeTaskDependencies: boolean;
     loadDotEnvFiles: boolean;
 }): Promise<NodeJS.Process['exitCode']>;
+export declare function runCommandForTasks(projectsToRun: ProjectGraphProjectNode[], currentProjectGraph: ProjectGraph, { nxJson }: {
+    nxJson: NxJsonConfiguration;
+}, nxArgs: NxArgs, overrides: any, initiatingProject: string | null, extraTargetDependencies: Record<string, (TargetDependencyConfig | string)[]>, extraOptions: {
+    excludeTaskDependencies: boolean;
+    loadDotEnvFiles: boolean;
+}): Promise<{
+    [id: string]: TaskResult;
+}>;
 export declare function invokeTasksRunner({ tasks, projectGraph, taskGraph, lifeCycle, nxJson, nxArgs, loadDotEnvFiles, initiatingProject, }: {
     tasks: Task[];
     projectGraph: ProjectGraph;
@@ -20,7 +28,9 @@ export declare function invokeTasksRunner({ tasks, projectGraph, taskGraph, life
     nxArgs: NxArgs;
     loadDotEnvFiles: boolean;
     initiatingProject: string | null;
-}): Promise<1 | 0>;
+}): Promise<{
+    [id: string]: TaskResult;
+}>;
 export declare function getRunner(nxArgs: NxArgs, nxJson: NxJsonConfiguration): {
     tasksRunner: TasksRunner;
     runnerOptions: any;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommand = runCommand;
+exports.runCommandForTasks = runCommandForTasks;
 exports.invokeTasksRunner = invokeTasksRunner;
 exports.getRunner = getRunner;
 exports.getRunnerOptions = getRunnerOptions;
@@ -31,6 +32,7 @@ const task_history_life_cycle_1 = require("./life-cycles/task-history-life-cycle
 const task_history_life_cycle_old_1 = require("./life-cycles/task-history-life-cycle-old");
 const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-cycle");
 const task_timings_life_cycle_1 = require("./life-cycles/task-timings-life-cycle");
+const task_results_life_cycle_1 = require("./life-cycles/task-results-life-cycle");
 const task_graph_utils_1 = require("./task-graph-utils");
 const utils_1 = require("./utils");
 const chalk = require("chalk");
@@ -99,25 +101,31 @@ function createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies,
 }
 async function runCommand(projectsToRun, currentProjectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions) {
     const status = await (0, handle_errors_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
-        const projectNames = projectsToRun.map((t) => t.name);
-        const { projectGraph, taskGraph } = await ensureWorkspaceIsInSyncAndGetGraphs(currentProjectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions);
-        const tasks = Object.values(taskGraph.tasks);
-        const { lifeCycle, renderIsDone } = await getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, nxJson, overrides);
-        const status = await invokeTasksRunner({
-            tasks,
-            projectGraph,
-            taskGraph,
-            lifeCycle,
-            nxJson,
-            nxArgs,
-            loadDotEnvFiles: extraOptions.loadDotEnvFiles,
-            initiatingProject,
-        });
-        await renderIsDone;
-        return status;
+        const taskResults = await runCommandForTasks(projectsToRun, currentProjectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions);
+        return Object.values(taskResults).some((taskResult) => taskResult.status === 'failure' || taskResult.status === 'skipped')
+            ? 1
+            : 0;
     });
     return status;
 }
+async function runCommandForTasks(projectsToRun, currentProjectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions) {
+    const projectNames = projectsToRun.map((t) => t.name);
+    const { projectGraph, taskGraph } = await ensureWorkspaceIsInSyncAndGetGraphs(currentProjectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions);
+    const tasks = Object.values(taskGraph.tasks);
+    const { lifeCycle, renderIsDone } = await getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, nxJson, overrides);
+    const taskResults = await invokeTasksRunner({
+        tasks,
+        projectGraph,
+        taskGraph,
+        lifeCycle,
+        nxJson,
+        nxArgs,
+        loadDotEnvFiles: extraOptions.loadDotEnvFiles,
+        initiatingProject,
+    });
+    await renderIsDone;
+    return taskResults;
+}
 async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions) {
     let taskGraph = createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies ?? {}, projectNames, nxArgs, overrides, extraOptions);
     if (nxArgs.skipSync) {
@@ -359,9 +367,14 @@ async function invokeTasksRunner({ tasks, projectGraph, taskGraph, lifeCycle, nx
     // to submit everything that is known in advance to Nx Cloud to run in
     // a distributed fashion
     await (0, hash_task_1.hashTasksThatDoNotDependOnOutputsOfOtherTasks)(hasher, projectGraph, taskGraph, nxJson);
-    const promiseOrObservable = tasksRunner(tasks, {
+    const taskResultsLifecycle = new task_results_life_cycle_1.TaskResultsLifeCycle();
+    const compositedLifeCycle = new life_cycle_1.CompositeLifeCycle([
+        ...constructLifeCycles(lifeCycle),
+        taskResultsLifecycle,
+    ]);
+    let promiseOrObservable = tasksRunner(tasks, {
         ...runnerOptions,
-        lifeCycle: new life_cycle_1.CompositeLifeCycle(constructLifeCycles(lifeCycle)),
+        lifeCycle: compositedLifeCycle,
     }, {
         initiatingProject: nxArgs.outputStyle === 'compact' ? null : initiatingProject,
         projectGraph,
@@ -418,15 +431,11 @@ async function invokeTasksRunner({ tasks, projectGraph, taskGraph, lifeCycle, nx
         },
         daemon: client_1.daemonClient,
     });
-    let anyFailures;
     if (promiseOrObservable.subscribe) {
-        anyFailures = await anyFailuresInObservable(promiseOrObservable);
-    }
-    else {
-        // simply await the promise
-        anyFailures = await anyFailuresInPromise(promiseOrObservable);
+        promiseOrObservable = convertObservableToPromise(promiseOrObservable);
     }
-    return anyFailures ? 1 : 0;
+    await promiseOrObservable;
+    return taskResultsLifecycle.getTaskResults();
 }
 function constructLifeCycles(lifeCycle) {
     const lifeCycles = [];
@@ -439,45 +448,29 @@ 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;
 }
-function mergeTargetDependencies(defaults, deps) {
-    const res = {};
-    Object.keys(defaults ?? {}).forEach((k) => {
-        res[k] = defaults[k].dependsOn;
-    });
-    if (deps) {
-        Object.keys(deps).forEach((k) => {
-            if (res[k]) {
-                res[k] = [...res[k], deps[k]];
-            }
-            else {
-                res[k] = deps[k];
-            }
-        });
-        return res;
-    }
-}
-async function anyFailuresInPromise(promise) {
-    return Object.values(await promise).some((v) => v === 'failure' || v === 'skipped');
-}
-async function anyFailuresInObservable(obs) {
+async function convertObservableToPromise(obs) {
     return await new Promise((res) => {
-        let anyFailures = false;
-        obs.subscribe((t) => {
-            if (!t.success) {
-                anyFailures = true;
-            }
-        }, (error) => {
-            output_1.output.error({
-                title: 'Unhandled error in task executor',
-            });
-            console.error(error);
-            res(true);
-        }, () => {
-            res(anyFailures);
+        let tasksResults = {};
+        obs.subscribe({
+            next: (t) => {
+                tasksResults[t.task.id] = t.success ? 'success' : 'failure';
+            },
+            error: (error) => {
+                output_1.output.error({
+                    title: 'Unhandled error in task executor',
+                });
+                console.error(error);
+                res(tasksResults);
+            },
+            complete: () => {
+                res(tasksResults);
+            },
         });
     });
 }

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

@@ -41,9 +41,12 @@ class TaskOrchestrator {
     }
     async run() {
         // Init the ForkedProcessTaskRunner
-        await this.forkedProcessTaskRunner.init();
+        await Promise.all([
+            this.forkedProcessTaskRunner.init(),
+            this.tasksSchedule.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 +68,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 +377,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/tasks-runner/tasks-schedule.d.ts

@@ -12,12 +12,15 @@ export declare class TasksSchedule {
     private notScheduledTaskGraph;
     private reverseTaskDeps;
     private reverseProjectGraph;
+    private taskHistory;
     private scheduledBatches;
     private scheduledTasks;
     private runningTasks;
     private completedTasks;
     private scheduleRequestsExecutionChain;
+    private estimatedTaskTimings;
     constructor(projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions);
+    init(): Promise<void>;
     scheduleNextTasks(): Promise<void>;
     hasTasks(): boolean;
     complete(taskIds: string[]): void;

package/src/tasks-runner/tasks-schedule.js

@@ -4,6 +4,7 @@ exports.TasksSchedule = void 0;
 const utils_1 = require("./utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const operators_1 = require("../project-graph/operators");
+const task_history_1 = require("../utils/task-history");
 class TasksSchedule {
     constructor(projectGraph, taskGraph, options) {
         this.projectGraph = projectGraph;
@@ -12,11 +13,19 @@ class TasksSchedule {
         this.notScheduledTaskGraph = this.taskGraph;
         this.reverseTaskDeps = (0, utils_1.calculateReverseDeps)(this.taskGraph);
         this.reverseProjectGraph = (0, operators_1.reverse)(this.projectGraph);
+        this.taskHistory = process.env.NX_DISABLE_DB !== 'true' ? (0, task_history_1.getTaskHistory)() : null;
         this.scheduledBatches = [];
         this.scheduledTasks = [];
         this.runningTasks = new Set();
         this.completedTasks = new Set();
         this.scheduleRequestsExecutionChain = Promise.resolve();
+        this.estimatedTaskTimings = {};
+    }
+    async init() {
+        if (this.taskHistory) {
+            this.estimatedTaskTimings =
+                await this.taskHistory.getEstimatedTaskTimings(Object.values(this.taskGraph.tasks).map((t) => t.target));
+        }
     }
     async scheduleNextTasks() {
         this.scheduleRequestsExecutionChain =
@@ -81,10 +90,23 @@ class TasksSchedule {
             // Most likely tasks with no dependencies such as test
             const project1 = this.taskGraph.tasks[taskId1].target.project;
             const project2 = this.taskGraph.tasks[taskId2].target.project;
-            return ((0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph)
-                .length -
-                (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph)
-                    .length);
+            const project1NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph).length;
+            const project2NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph).length;
+            const dependenciesDiff = project2NodeDependencies - project1NodeDependencies;
+            if (dependenciesDiff !== 0) {
+                return dependenciesDiff;
+            }
+            const task1Timing = this.estimatedTaskTimings[taskId1];
+            if (!task1Timing) {
+                // if no timing or 0, put task1 at beginning
+                return -1;
+            }
+            const task2Timing = this.estimatedTaskTimings[taskId2];
+            if (!task2Timing) {
+                // if no timing or 0, put task2 at beginning
+                return 1;
+            }
+            return task2Timing - task1Timing;
         });
         this.runningTasks.add(taskId);
     }

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

@@ -7,6 +7,7 @@ export declare class GitRepository {
     root: string;
     constructor(directory: string);
     getGitRootPath(cwd: string): string;
+    hasUncommittedChanges(): Promise<boolean>;
     addFetchRemote(remoteName: string, branch: string): Promise<string>;
     showStat(): Promise<string>;
     listBranches(): Promise<string[]>;
@@ -25,10 +26,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

@@ -40,6 +40,10 @@ class GitRepository {
             .toString()
             .trim();
     }
+    async hasUncommittedChanges() {
+        const data = await this.execAsync(`git status --porcelain`);
+        return data.trim() !== '';
+    }
     async addFetchRemote(remoteName, branch) {
         return await this.execAsync(`git config --add remote.${remoteName}.fetch "+refs/heads/${branch}:refs/remotes/${remoteName}/${branch}"`);
     }
@@ -105,32 +109,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;