Skip to content

Commit

Permalink
feat: make prettier optional (#1340)
Browse files Browse the repository at this point in the history
  • Loading branch information
khalilou88 authored Oct 14, 2024
1 parent 1e200ad commit 40f62b0
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 6 deletions.
10 changes: 7 additions & 3 deletions packages/nx-gradle/src/generators/init/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,13 @@ export async function initGenerator(
updateNxJson(tree, normalizedOptions);
updateNxJsonConfiguration(tree);
updateGitIgnore(tree, normalizedOptions);
addPrettierToPackageJson(tree);
addOrUpdatePrettierRc(tree);
addOrUpdatePrettierIgnore(tree);

if (options.formatter === 'prettier') {
addPrettierToPackageJson(tree);
addOrUpdatePrettierRc(tree);
addOrUpdatePrettierIgnore(tree);
}

addOrUpdateGitattributes(tree);

if (!options.skipWrapper) {
Expand Down
1 change: 1 addition & 0 deletions packages/nx-gradle/src/generators/init/schema.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ export interface NxGradleInitGeneratorSchema {
skipWrapper?: boolean;
versionManagement: VersionManagementType;
skipFormat?: boolean;
formatter?: 'none' | 'prettier';
}
20 changes: 20 additions & 0 deletions packages/nx-gradle/src/generators/init/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,26 @@
"description": "Skip formatting files.",
"type": "boolean",
"default": false
},
"formatter": {
"description": "The tool to use for code formatting.",
"type": "string",
"enum": ["none", "prettier"],
"default": "prettier",
"x-prompt": {
"message": "Would you like to use Prettier for code formatting?",
"type": "list",
"items": [
{
"value": "prettier",
"label": "Yes"
},
{
"value": "none",
"label": "No"
}
]
}
}
},
"required": [
Expand Down
10 changes: 7 additions & 3 deletions packages/nx-maven/src/generators/init/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,13 @@ export async function initGenerator(
updateNxJson(tree, normalizedOptions);
updateNxJsonConfiguration(tree);
updateGitIgnore(tree, normalizedOptions);
addPrettierToPackageJson(tree);
addOrUpdatePrettierRc(tree);
addOrUpdatePrettierIgnore(tree, normalizedOptions);

if (options.formatter === 'prettier') {
addPrettierToPackageJson(tree);
addOrUpdatePrettierRc(tree);
addOrUpdatePrettierIgnore(tree, normalizedOptions);
}

addOrUpdateGitattributes(tree);
if (!options.skipWrapper) {
tree.changePermissions(
Expand Down
1 change: 1 addition & 0 deletions packages/nx-maven/src/generators/init/schema.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ export interface NxMavenInitGeneratorSchema {
skipWrapper?: boolean;
localRepoRelativePath: string;
skipFormat?: boolean;
formatter?: 'none' | 'prettier';
}
20 changes: 20 additions & 0 deletions packages/nx-maven/src/generators/init/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,26 @@
"description": "Skip formatting files.",
"type": "boolean",
"default": false
},
"formatter": {
"description": "The tool to use for code formatting.",
"type": "string",
"enum": ["none", "prettier"],
"default": "prettier",
"x-prompt": {
"message": "Would you like to use Prettier for code formatting?",
"type": "list",
"items": [
{
"value": "prettier",
"label": "Yes"
},
{
"value": "none",
"label": "No"
}
]
}
}
},
"required": [
Expand Down

0 comments on commit 40f62b0

Please sign in to comment.