nx 19.7.2 → 19.7.4

package/src/command-line/release/plan-check.js

@@ -8,14 +8,14 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const version_plans_1 = require("./config/version-plans");
 const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-for-group");
 const print_config_1 = require("./utils/print-config");
-const releasePlanCheckCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releasePlanCheckCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releasePlanCheckCLIHandler = releasePlanCheckCLIHandler;
 function createAPI(overrideReleaseConfig) {
     return async function releasePlanCheck(args) {

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

@@ -13,7 +13,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
@@ -23,7 +23,7 @@ const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-f
 const launch_editor_1 = require("./utils/launch-editor");
 const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
-const releasePlanCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releasePlanCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releasePlanCLIHandler = releasePlanCLIHandler;
 function createAPI(overrideReleaseConfig) {
     return async function releasePlan(args) {

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

@@ -8,14 +8,14 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const graph_1 = require("../graph/graph");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const print_config_1 = require("./utils/print-config");
-const releasePublishCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args, true));
+const releasePublishCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args, true));
 exports.releasePublishCLIHandler = releasePublishCLIHandler;
 function createAPI(overrideReleaseConfig) {
     /**

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

@@ -8,7 +8,7 @@ const nx_json_1 = require("../../config/nx-json");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const changelog_1 = require("./changelog");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
@@ -21,7 +21,7 @@ const print_config_1 = require("./utils/print-config");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
 const version_1 = require("./version");
-const releaseCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releaseCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseCLIHandler = releaseCLIHandler;
 function createAPI(overrideReleaseConfig) {
     const releaseVersion = (0, version_1.createAPI)(overrideReleaseConfig);

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

@@ -26,12 +26,13 @@ const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
+const handle_errors_1 = require("../../utils/handle-errors");
 const LARGE_BUFFER = 1024 * 1000000;
 // Reexport some utils for use in plugin release-version generator implementations
 var semver_1 = require("./utils/semver");
 Object.defineProperty(exports, "deriveNewSemverVersion", { enumerable: true, get: function () { return semver_1.deriveNewSemverVersion; } });
 exports.validReleaseVersionPrefixes = ['auto', '', '~', '^', '='];
-const releaseVersionCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releaseVersionCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseVersionCLIHandler = releaseVersionCLIHandler;
 function createAPI(overrideReleaseConfig) {
     /**
@@ -206,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/command-line/repair/repair.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repair = repair;
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const migrationsJson = require("../../../migrations.json");
 const migrate_1 = require("../migrate/migrate");
 const output_1 = require("../../utils/output");
 async function repair(args, extraMigrations = []) {
-    return (0, params_1.handleErrors)(args.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxMigrations = Object.entries(migrationsJson.generators).reduce((agg, [name, migration]) => {
             const skip = migration['x-repair-skip'];
             if (!skip) {

package/src/command-line/run/command-object.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsNxInfixCommand = exports.yargsRunCommand = void 0;
 const yargs_1 = require("yargs");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsRunCommand = {
     command: 'run [project][:target][:configuration] [_..]',
     describe: `Run a target for a project
@@ -15,7 +15,7 @@ exports.yargsRunCommand = {
     You can skip the use of Nx cache by using the --skip-nx-cache option.`,
     builder: (yargs) => (0, shared_options_1.withRunOneOptions)((0, shared_options_1.withBatch)(yargs)),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             await Promise.resolve().then(() => require('./run-one')).then((m) => m.runOne(process.cwd(), (0, shared_options_1.withOverrides)(args)));
         });
         process.exit(exitCode);
@@ -29,7 +29,7 @@ exports.yargsNxInfixCommand = {
     command: '$0 <target> [project] [_..]',
     describe: 'Run a target for a project.',
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             // Yargs parses <target> as 'undefined' if running just 'nx'
             if (!args.target || args.target === 'undefined') {
                 (0, yargs_1.showHelp)();

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

@@ -7,6 +7,7 @@ exports.printTargetRunHelp = printTargetRunHelp;
 exports.run = run;
 const npm_run_path_1 = require("npm-run-path");
 const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const print_help_1 = require("../../utils/print-help");
 const path_1 = require("path");
 const serialize_overrides_into_command_line_1 = require("../../utils/serialize-overrides-into-command-line");
@@ -163,14 +164,14 @@ async function runExecutor(targetDescription, overrides, context) {
 }
 function printTargetRunHelp(targetDescription, root) {
     const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
-    return (0, params_1.handleErrors)(false, async () => {
+    return (0, handle_errors_1.handleErrors)(false, async () => {
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         await printTargetRunHelpInternal(targetDescription, root, projectsConfigurations);
     });
 }
 function run(cwd, root, targetDescription, overrides, isVerbose, taskGraph) {
     const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
-    return (0, params_1.handleErrors)(isVerbose, async () => {
+    return (0, handle_errors_1.handleErrors)(isVerbose, async () => {
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         return iteratorToProcessStatusCode(await runExecutorInternal(targetDescription, overrides, root, cwd, projectsConfigurations, (0, configuration_1.readNxJson)(), projectGraph, taskGraph, isVerbose));
     });

package/src/command-line/run-many/command-object.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsRunManyCommand = void 0;
 const documentation_1 = require("../yargs-utils/documentation");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsRunManyCommand = {
     command: 'run-many',
     describe: 'Run target for multiple listed projects.',
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withRunManyOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withTargetAndConfigurationOption)((0, shared_options_1.withBatch)(yargs)))), 'run-many'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             await Promise.resolve().then(() => require('./run-many')).then((m) => m.runMany((0, shared_options_1.withOverrides)(args)));
         });
         process.exit(exitCode);

package/src/command-line/show/command-object.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsShowCommand = void 0;
 const yargs_1 = require("yargs");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsShowCommand = {
     command: 'show',
     describe: 'Show information about the workspace (e.g., list of projects).',
@@ -65,7 +65,7 @@ const showProjectsCommand = {
         .example('$0 show projects --type app --affected', 'Show affected apps in the workspace')
         .example('$0 show projects --affected --exclude=*-e2e', 'Show affected projects in the workspace, excluding end-to-end projects'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose, async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
             const { showProjectsHandler } = await Promise.resolve().then(() => require('./projects'));
             await showProjectsHandler(args);
         });
@@ -106,7 +106,7 @@ const showProjectCommand = {
         .example('$0 show project my-app', 'View project information for my-app in JSON format')
         .example('$0 show project my-app --web', 'View project information for my-app in the browser'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose, async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
             const { showProjectHandler } = await Promise.resolve().then(() => require('./project'));
             await showProjectHandler(args);
         });

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

@@ -5,11 +5,11 @@ const ora = require("ora");
 const nx_json_1 = require("../../config/nx-json");
 const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const sync_generators_1 = require("../../utils/sync-generators");
 const chalk = require("chalk");
 function syncHandler(options) {
-    return (0, params_1.handleErrors)(options.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
         const nxJson = (0, nx_json_1.readNxJson)();
         const syncGenerators = await (0, sync_generators_1.collectAllRegisteredSyncGenerators)(projectGraph, nxJson);
@@ -32,24 +32,82 @@ function syncHandler(options) {
             });
             return 0;
         }
+        const { failedGeneratorsCount, areAllResultsFailures, anySyncGeneratorsFailed, } = (0, sync_generators_1.processSyncGeneratorResultErrors)(results);
+        const failedSyncGeneratorsFixMessageLines = (0, sync_generators_1.getFailedSyncGeneratorsFixMessageLines)(results, options.verbose);
+        if (areAllResultsFailures) {
+            output_1.output.error({
+                title: `The workspace is probably out of sync because ${failedGeneratorsCount === 1
+                    ? 'a sync generator'
+                    : 'some sync generators'} failed to run`,
+                bodyLines: failedSyncGeneratorsFixMessageLines,
+            });
+            return 1;
+        }
+        const resultBodyLines = (0, sync_generators_1.getSyncGeneratorSuccessResultsMessageLines)(results);
         if (options.check) {
             output_1.output.error({
-                title: `The workspace is out of sync`,
-                bodyLines: (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results),
+                title: 'The workspace is out of sync',
+                bodyLines: resultBodyLines,
             });
+            if (anySyncGeneratorsFailed) {
+                output_1.output.error({
+                    title: failedGeneratorsCount === 1
+                        ? 'A sync generator failed to run'
+                        : 'Some sync generators failed to run',
+                    bodyLines: failedSyncGeneratorsFixMessageLines,
+                });
+            }
             return 1;
         }
         output_1.output.warn({
-            title: `The workspace is out of sync`,
-            bodyLines: (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results),
+            title: 'The workspace is out of sync',
+            bodyLines: resultBodyLines,
         });
         const spinner = ora('Syncing the workspace...');
         spinner.start();
-        await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
-        spinner.succeed(`The workspace was synced successfully!
-
-Please make sure to commit the changes to your repository.
-`);
+        try {
+            const flushResult = await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
+            if ('generatorFailures' in flushResult) {
+                spinner.fail();
+                output_1.output.error({
+                    title: 'Failed to sync the workspace',
+                    bodyLines: (0, sync_generators_1.getFlushFailureMessageLines)(flushResult, options.verbose),
+                });
+                return 1;
+            }
+        }
+        catch (e) {
+            spinner.fail();
+            output_1.output.error({
+                title: 'Failed to sync the workspace',
+                bodyLines: [
+                    'Syncing the workspace failed with the following error:',
+                    '',
+                    e.message,
+                    ...(options.verbose && !!e.stack ? [`\n${e.stack}`] : []),
+                    '',
+                    'Please rerun with `--verbose` and report the error at: https://github.com/nrwl/nx/issues/new/choose',
+                ],
+            });
+            return 1;
+        }
+        const successTitle = anySyncGeneratorsFailed
+            ? // the identified changes were synced successfully, but the workspace
+                // is still not up to date, which we'll mention next
+                'The identified changes were synced successfully!'
+            : // the workspace is fully up to date
+                'The workspace was synced successfully!';
+        const successSubtitle = 'Please make sure to commit the changes to your repository.';
+        spinner.succeed(`${successTitle}\n\n${successSubtitle}`);
+        if (anySyncGeneratorsFailed) {
+            output_1.output.error({
+                title: `The workspace is probably still out of sync because ${failedGeneratorsCount === 1
+                    ? 'a sync generator'
+                    : 'some sync generators'} failed to run`,
+                bodyLines: failedSyncGeneratorsFixMessageLines,
+            });
+            return 1;
+        }
         return 0;
     });
 }

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/daemon/client/client.d.ts

@@ -4,7 +4,7 @@ import { Hash } from '../../hasher/task-hasher';
 import { Task, TaskGraph } from '../../config/task-graph';
 import { ConfigurationSourceMaps } from '../../project-graph/utils/project-configuration-utils';
 import { NxWorkspaceFiles, TaskRun } from '../../native';
-import type { SyncGeneratorChangesResult } from '../../utils/sync-generators';
+import type { FlushSyncGeneratorChangesResult, SyncGeneratorRunResult } from '../../utils/sync-generators';
 export type UnregisterCallback = () => void;
 export type ChangedFile = {
     path: string;
@@ -52,8 +52,8 @@ export declare class DaemonClient {
     hashGlob(globs: string[], exclude?: string[]): Promise<string>;
     getFlakyTasks(hashes: string[]): Promise<string[]>;
     recordTaskRuns(taskRuns: TaskRun[]): Promise<void>;
-    getSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorChangesResult[]>;
-    flushSyncGeneratorChangesToDisk(generators: string[]): Promise<void>;
+    getSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorRunResult[]>;
+    flushSyncGeneratorChangesToDisk(generators: string[]): Promise<FlushSyncGeneratorChangesResult>;
     getRegisteredSyncGenerators(): Promise<string[]>;
     updateWorkspaceContext(createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): Promise<void>;
     isServerAvailable(): Promise<boolean>;

package/src/daemon/server/handle-flush-sync-generator-changes-to-disk.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleFlushSyncGeneratorChangesToDisk = handleFlushSyncGeneratorChangesToDisk;
 const sync_generators_1 = require("./sync-generators");
 async function handleFlushSyncGeneratorChangesToDisk(generators) {
-    await (0, sync_generators_1.flushSyncGeneratorChangesToDisk)(generators);
+    const result = await (0, sync_generators_1.flushSyncGeneratorChangesToDisk)(generators);
     return {
-        response: '{}',
+        response: JSON.stringify(result),
         description: 'handleFlushSyncGeneratorChangesToDisk',
     };
 }

package/src/daemon/server/handle-get-sync-generator-changes.js

@@ -4,12 +4,14 @@ exports.handleGetSyncGeneratorChanges = handleGetSyncGeneratorChanges;
 const sync_generators_1 = require("./sync-generators");
 async function handleGetSyncGeneratorChanges(generators) {
     const changes = await (0, sync_generators_1.getCachedSyncGeneratorChanges)(generators);
-    // strip out the content of the changes and any potential callback
-    const result = changes.map((change) => ({
-        generatorName: change.generatorName,
-        changes: change.changes.map((c) => ({ ...c, content: null })),
-        outOfSyncMessage: change.outOfSyncMessage,
-    }));
+    const result = changes.map((change) => 'error' in change
+        ? change
+        : // strip out the content of the changes and any potential callback
+            {
+                generatorName: change.generatorName,
+                changes: change.changes.map((c) => ({ ...c, content: null })),
+                outOfSyncMessage: change.outOfSyncMessage,
+            });
     return {
         response: JSON.stringify(result),
         description: 'handleGetSyncGeneratorChanges',

package/src/daemon/server/sync-generators.d.ts

@@ -1,10 +1,10 @@
 import type { ProjectGraph } from '../../config/project-graph';
-import { type SyncGeneratorChangesResult } from '../../utils/sync-generators';
-export declare function getCachedSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorChangesResult[]>;
-export declare function flushSyncGeneratorChangesToDisk(generators: string[]): Promise<void>;
+import { type FlushSyncGeneratorChangesResult, type SyncGeneratorRunResult } from '../../utils/sync-generators';
+export declare function getCachedSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorRunResult[]>;
+export declare function flushSyncGeneratorChangesToDisk(generators: string[]): Promise<FlushSyncGeneratorChangesResult>;
 export declare function collectAndScheduleSyncGenerators(projectGraph: ProjectGraph): void;
 export declare function getCachedRegisteredSyncGenerators(): Promise<string[]>;
 /**
  * @internal
  */
-export declare function _getConflictingGeneratorGroups(results: SyncGeneratorChangesResult[]): string[][];
+export declare function _getConflictingGeneratorGroups(results: SyncGeneratorRunResult[]): string[][];

package/src/daemon/server/sync-generators.js

@@ -59,7 +59,7 @@ async function flushSyncGeneratorChangesToDisk(generators) {
     for (const generator of generators) {
         syncGeneratorsCacheResultPromises.delete(generator);
     }
-    await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
+    return await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
 }
 function collectAndScheduleSyncGenerators(projectGraph) {
     if (!projectGraph) {
@@ -191,6 +191,7 @@ async function processConflictingGenerators(conflicts, initialResults) {
     const conflictRunResults = (await Promise.all(conflicts.map((generators) => {
         const [firstGenerator, ...generatorsToRun] = generators;
         // it must exists because the conflicts were identified from the initial results
+        // and it's guaranteed to be a success result
         const firstGeneratorResult = initialResults.find((r) => r.generatorName === firstGenerator);
         const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, `running sync generators ${generators.join(',')}`);
         // pre-apply the changes from the first generator to avoid running it
@@ -234,6 +235,9 @@ async function processConflictingGenerators(conflicts, initialResults) {
 function _getConflictingGeneratorGroups(results) {
     const changedFileToGeneratorMap = new Map();
     for (const result of results) {
+        if ('error' in result) {
+            continue;
+        }
         for (const change of result.changes) {
             if (!changedFileToGeneratorMap.has(change.path)) {
                 changedFileToGeneratorMap.set(change.path, new Set());
@@ -318,7 +322,12 @@ function runGenerator(generator, projects, tree) {
     scheduledGenerators.delete(generator);
     tree ??= new tree_1.FsTree(workspace_root_1.workspaceRoot, false, `running sync generator ${generator}`);
     return (0, sync_generators_1.runSyncGenerator)(tree, generator, projects).then((result) => {
-        log(generator, 'changes:', result.changes.map((c) => c.path).join(', '));
+        if ('error' in result) {
+            log(generator, 'error:', result.error.message);
+        }
+        else {
+            log(generator, 'changes:', result.changes.map((c) => c.path).join(', '));
+        }
         return result;
     });
 }

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,