Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions packages/nx-plugin/src/preset/__snapshots__/generator.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,18 @@ export default {

exports[`preset generator > should run successfully > nx.json 1`] = `
"{
"affected": { "defaultBase": "main" },
"targetDefaults": { "build": { "cache": true }, "lint": { "cache": true } }
"affected": {
"defaultBase": "main"
},
"targetDefaults": {
"build": {
"cache": true
},
"lint": {
"cache": true
}
},
"useDaemonProcess": false
}
"
`;
Expand Down
9 changes: 8 additions & 1 deletion packages/nx-plugin/src/preset/generator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
import { Tree } from '@nx/devkit';
import { Tree, readNxJson } from '@nx/devkit';
import { presetGenerator, isAmazonian } from './generator';
import { createTreeUsingTsSolutionSetup, snapshotTreeDir } from '../utils/test';
import { vi, describe, it, expect, beforeEach } from 'vitest';
Expand Down Expand Up @@ -41,6 +41,13 @@ describe('preset generator', () => {

expect((await readAwsNxPluginConfig(tree)).iac.provider).toBe('CDK');
});

it('should disable the nx daemon', async () => {
await presetGenerator(tree, { addTsPlugin: false, iacProvider: 'CDK' });

const nxJson = readNxJson(tree);
expect(nxJson?.useDaemonProcess).toBe(false);
});
});

describe('isAmazonian', () => {
Expand Down
8 changes: 8 additions & 0 deletions packages/nx-plugin/src/preset/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import {
getPackageManagerCommand,
installPackagesTask,
joinPathFragments,
readNxJson,
updateJson,
updateNxJson,
} from '@nx/devkit';
import { NxGeneratorInfo, getGeneratorInfo } from '../utils/nx';
import { addGeneratorMetricsIfApplicable } from '../utils/metrics';
Expand Down Expand Up @@ -176,6 +178,12 @@ export const presetGenerator = async (
},
);

// Disable the Nx Daemon by default, users can opt in
updateNxJson(tree, {
...readNxJson(tree),
useDaemonProcess: false,
});

await addGeneratorMetricsIfApplicable(tree, [PRESET_GENERATOR_INFO]);

await formatFilesInSubtree(tree);
Expand Down
Loading