Merge pull request #26711 from qmonmert/prettier333

Upgrade Prettier 3.3.3
jhipster · Jul 13, 2024 · 9041014 · 9041014
2 parents 48b49c9 + 1e7a4c1
commit 9041014
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/generators/base-application/support/prepare-entity.ts b/generators/base-application/support/prepare-entity.ts
@@ -240,7 +240,7 @@ export default function prepareEntity(entityWithConfig, generator, application)
     __override__: false,
     i18nKeyPrefix: data => data.i18nKeyPrefix ?? `${data.frontendAppName}.${data.entityTranslationKey}`,
     i18nAlertHeaderPrefix: data =>
-      data.i18nAlertHeaderPrefix ?? data.microserviceAppName
+      (data.i18nAlertHeaderPrefix ?? data.microserviceAppName)
         ? `${data.microserviceAppName}.${data.entityTranslationKey}`
         : data.i18nKeyPrefix,
     hasRelationshipWithBuiltInUser: ({ relationships }) => relationships.some(relationship => relationship.otherEntity.builtInUser),

diff --git a/generators/client/support/files.ts b/generators/client/support/files.ts
@@ -66,7 +66,7 @@ function clientBlock({
 }): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
   const block: RelativeWriteFileBlock | undefined = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
   const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
-  const relativePath: string = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
+  const relativePath: string = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : (blockOrRelativePath.relativePath ?? '');
   return {
     path: `${srcPath}${relativeToSrc}${relativePath}`,
     ...block,

diff --git a/generators/cypress/generator.ts b/generators/cypress/generator.ts
@@ -84,9 +84,9 @@ export default class CypressGenerator extends BaseApplicationGenerator {
   get preparing() {
     return this.asPreparingTaskGroup({
       prepareForTemplates({ application }) {
-        application.cypressDir = application.cypressDir ?? application.clientTestDir ? `${application.clientTestDir}cypress/` : 'cypress';
+        application.cypressDir = (application.cypressDir ?? application.clientTestDir) ? `${application.clientTestDir}cypress/` : 'cypress';
         application.cypressTemporaryDir =
-          application.cypressTemporaryDir ?? application.temporaryDir ? `${application.temporaryDir}cypress/` : '.cypress/';
+          (application.cypressTemporaryDir ?? application.temporaryDir) ? `${application.temporaryDir}cypress/` : '.cypress/';
         application.cypressBootstrapEntities = application.cypressBootstrapEntities ?? true;
       },
     });

diff --git a/generators/java/support/files.ts b/generators/java/support/files.ts
@@ -119,7 +119,7 @@ function javaBlock({
 }): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
   const block: RelativeWriteFileBlock | undefined = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
   const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
-  const relativePath: string = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
+  const relativePath: string = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : (blockOrRelativePath.relativePath ?? '');
   return {
     path: `${srcPath}${relativePath}`,
     ...block,

diff --git a/generators/jdl/generator.ts b/generators/jdl/generator.ts
@@ -157,7 +157,7 @@ export default class JdlGenerator extends BaseGenerator {
         const interactiveFallback = !allNew;
 
         this.interactive = this.interactive ?? interactiveFallback;
-        this.force = this.options.force ?? (nrApplications > 0 && allNew) ? true : undefined;
+        this.force = (this.options.force ?? (nrApplications > 0 && allNew)) ? true : undefined;
         this.reproducible = allNew;
       },
       customizeApplication() {

diff --git a/generators/spring-data-relational/support/database-data.ts b/generators/spring-data-relational/support/database-data.ts
@@ -79,7 +79,7 @@ const h2GetProdDatabaseData = (
     data.port = ':12344';
   }
 
-  const h2ProdDatabaseMode = prodDatabaseType ? H2_PROD_DATABASE_MODE[prodDatabaseType] ?? '' : '';
+  const h2ProdDatabaseMode = prodDatabaseType ? (H2_PROD_DATABASE_MODE[prodDatabaseType] ?? '') : '';
   return {
     ...data,
     localDirectory,

diff --git a/generators/upgrade/generator.js b/generators/upgrade/generator.js
@@ -296,7 +296,7 @@ export default class UpgradeGenerator extends BaseGenerator {
    */
   async cleanUp() {
     const gitignoreContent = this.readDestination('.gitignore', { defaults: '' });
-    const ignoredFiles = gitignoreContent ? gitignore(gitignoreContent).patterns ?? [] : [];
+    const ignoredFiles = gitignoreContent ? (gitignore(gitignoreContent).patterns ?? []) : [];
     const filesToKeep = ['.yo-rc.json', '.jhipster', 'package.json', 'package-lock.json', 'node_modules', '.git', ...ignoredFiles];
     for (const file of await readdir(this.destinationPath())) {
       if (!filesToKeep.includes(file)) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -159,7 +159,7 @@
     "parse-gitignore": "2.0.0",
     "piscina": "4.6.1",
     "pluralize": "8.0.0",
-    "prettier": "3.3.2",
+    "prettier": "3.3.3",
     "prettier-plugin-java": "2.6.4",
     "prettier-plugin-packagejson": "2.5.0",
     "prettier-plugin-properties": "0.3.0",