generator-jhipster 7.3.1 → 7.6.0

package/generators/generator-base.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -41,15 +41,13 @@ const { formatDateForChangelog } = require('../utils/liquibase');
 const { calculateDbNameWithLimit, hibernateSnakeCase } = require('../utils/db');
 const defaultApplicationOptions = require('../jdl/jhipster/default-application-options');
 const databaseTypes = require('../jdl/jhipster/database-types');
+const { ANGULAR_X: ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = require('../jdl/jhipster/client-framework-types');
 
 const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 const MODULES_HOOK_FILE = `${JHIPSTER_CONFIG_DIR}/modules/jhi-hooks.json`;
 const GENERATOR_JHIPSTER = 'generator-jhipster';
 
 const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
-const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
-const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
-const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
 const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA, H2_MEMORY, H2_DISK } = databaseTypes;
 const NO_DATABASE = databaseTypes.NO;
@@ -126,7 +124,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     this._sharedData = this.options.jhipsterSharedData;
 
     /* Force config to use 'generator-jhipster' namespace. */
-    this._config = this._getStorage('generator-jhipster');
+    this._config = this._getStorage('generator-jhipster', { sorted: true });
     /* JHipster config using proxy mode used as a plain object instead of using get/set. */
     this.jhipsterConfig = this.config.createProxy();
 
@@ -159,7 +157,13 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
    * Alternative templatePath that fetches from the blueprinted generator, instead of the blueprint.
    */
   jhipsterTemplatePath(...args) {
-    this._jhipsterGenerator = this._jhipsterGenerator || this.env.requireNamespace(this.options.namespace).generator;
+    try {
+      this._jhipsterGenerator = this._jhipsterGenerator || this.env.requireNamespace(this.options.namespace).generator;
+    } catch (error) {
+      throw new Error(
+        `The Namespace ${this.options.namespace} may not be correct. Please check your configuration and ensure your blueprint folder start with "generator-". Detail: ${error}`
+      );
+    }
     return this.fetchFromInstalledJHipster(this._jhipsterGenerator, 'templates', ...args);
   }
 
@@ -450,8 +454,8 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     } else if (clientFramework === VUE) {
       this.needleApi.clientVue.addEntityToRouterImport(entityName, entityFileName, entityFolderName, readOnly);
       this.needleApi.clientVue.addEntityToRouter(entityInstance, entityName, entityFileName, readOnly);
-      this.needleApi.clientVue.addEntityServiceToMainImport(entityName, entityClass, entityFileName, entityFolderName);
-      this.needleApi.clientVue.addEntityServiceToMain(entityInstance, entityName);
+      this.needleApi.clientVue.addEntityServiceToEntitiesComponentImport(entityName, entityClass, entityFileName, entityFolderName);
+      this.needleApi.clientVue.addEntityServiceToEntitiesComponent(entityInstance, entityName);
     }
   }
 
@@ -1893,7 +1897,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
                 + '-storetype PKCS12 '
                 + '-keyalg RSA '
                 + '-alias selfsigned '
-                + `-keystore ${keyStoreFile} `
+                + `-keystore "${keyStoreFile}" `
                 + '-storepass password '
                 + '-keypass password '
                 + '-keysize 2048 '
@@ -2621,7 +2625,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       this.jhipsterConfig.clientFramework = options.clientFramework;
     }
     if (options.testFrameworks) {
-      this.jhipsterConfig.testFrameworks = options.testFrameworks;
+      this.jhipsterConfig.testFrameworks = [...new Set([...(this.jhipsterConfig.testFrameworks || []), ...options.testFrameworks])];
     }
     if (options.cypressCoverage !== undefined) {
       this.jhipsterConfig.cypressCoverage = options.cypressCoverage;
@@ -2632,7 +2636,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     if (options.language) {
       // workaround double options parsing, remove once generator supports skipping parse options
       const languages = options.language.flat();
-      this.jhipsterConfig.languages = [...this.jhipsterConfig.languages, ...languages];
+      if (languages.length === 1 && languages[0] === 'false') {
+        this.jhipsterConfig.enableTranslation = false;
+      } else {
+        this.jhipsterConfig.languages = [...this.jhipsterConfig.languages, ...languages];
+      }
     }
     if (options.nativeLanguage) {
       if (typeof options.nativeLanguage === 'string') {
@@ -2667,6 +2675,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       this.jhipsterConfig.reactive = options.reactive;
     }
 
+    if (options.enableSwaggerCodegen !== undefined) {
+      this.jhipsterConfig.enableSwaggerCodegen = options.enableSwaggerCodegen;
+    }
+
     if (options.clientPackageManager) {
       this.jhipsterConfig.clientPackageManager = options.clientPackageManager;
     }
@@ -2721,7 +2733,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadAppConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadAppConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.jhipsterVersion = config.jhipsterVersion;
     dest.baseName = config.baseName;
     dest.applicationType = config.applicationType;
@@ -2732,6 +2744,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.dtoSuffix = config.dtoSuffix;
     dest.skipUserManagement = config.skipUserManagement;
     dest.skipCheckLengthOfIdentifier = config.skipCheckLengthOfIdentifier;
+    dest.microfrontend = config.microfrontend;
 
     dest.skipServer = config.skipServer;
     dest.skipCommitHook = config.skipCommitHook;
@@ -2741,7 +2754,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.pages = config.pages;
     dest.skipJhipsterDependencies = !!config.skipJhipsterDependencies;
     dest.withAdminUi = config.withAdminUi;
-    dest.microfrontend = config.microfrontend;
     dest.gatewayServerPort = config.gatewayServerPort;
 
     dest.capitalizedBaseName = config.capitalizedBaseName;
@@ -2752,6 +2764,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.testFrameworks = config.testFrameworks || [];
     dest.cypressCoverage = config.cypressCoverage;
 
+    dest.remotes = Object.entries(config.applications || {}).map(([baseName, config]) => ({ baseName, ...config })) || [];
+
     dest.gatlingTests = dest.testFrameworks.includes(GATLING);
     dest.cucumberTests = dest.testFrameworks.includes(CUCUMBER);
     dest.protractorTests = dest.testFrameworks.includes(PROTRACTOR);
@@ -2779,7 +2793,17 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       dest.humanizedBaseName =
         dest.humanizedBaseName || (dest.baseName.toLowerCase() === 'jhipster' ? 'JHipster' : _.startCase(dest.baseName));
       dest.projectDescription = dest.projectDescription || `Description for ${this.baseName}`;
+      dest.endpointPrefix = !dest.applicationType || dest.applicationTypeMicroservice ? `services/${dest.lowercaseBaseName}` : '';
+    }
+
+    if (dest.remotes) {
+      dest.remotes.forEach(app => this.loadDerivedAppConfig(app));
+      dest.microfrontends = dest.remotes.filter(r => r.clientFramework && r.clientFramework !== CLIENT_FRAMEWORK_NO);
     }
+    dest.microfrontend =
+      dest.microfrontend ||
+      (dest.applicationTypeMicroservice && !dest.skipClient) ||
+      (dest.applicationTypeGateway && dest.microfrontends && dest.microfrontends.length > 0);
   }
 
   /**
@@ -2789,7 +2813,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadClientConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadClientConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.clientPackageManager = config.clientPackageManager;
     dest.clientFramework = config.clientFramework;
     dest.clientTheme = config.clientTheme;
@@ -2820,7 +2844,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadTranslationConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadTranslationConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.enableTranslation = config.enableTranslation;
     dest.nativeLanguage = config.nativeLanguage;
     dest.languages = config.languages;
@@ -2833,7 +2857,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadServerConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadServerConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.packageName = config.packageName;
     dest.packageFolder = config.packageFolder;
     dest.serverPort = config.serverPort;
@@ -2947,7 +2971,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         [MYSQL, POSTGRESQL, MSSQL, MARIADB].includes(dest.devDatabaseType));
   }
 
-  loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.serviceDiscoveryType = config.serviceDiscoveryType;
     dest.monitoring = config.monitoring;
     this.loadDerivedPlatformConfig(dest);
@@ -2983,7 +3007,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
   getEntityConfig(entityName, create = false) {
     const entityPath = this.destinationPath(JHIPSTER_CONFIG_DIR, `${_.upperFirst(entityName)}.json`);
     if (!create && !this.fs.exists(entityPath)) return undefined;
-    return this.createStorage(entityPath);
+    return this.createStorage(entityPath, { sorted: true });
   }
 
   /**
@@ -3017,11 +3041,21 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     return this._needleApi;
   }
 
+  /**
+   * Default config based on current applicationType
+   */
+  get jhipsterDefaults() {
+    return this.getDefaultConfigForApplicationType();
+  }
+
   /**
    * Get default config based on applicationType
    */
   getDefaultConfigForApplicationType(applicationType = this.jhipsterConfig.applicationType) {
-    return { ...defaultApplicationOptions.getConfigForApplicationType(applicationType), ...defaultConfig };
+    return {
+      ...defaultApplicationOptions.getConfigForApplicationType(applicationType),
+      ...(applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig),
+    };
   }
 
   setConfigDefaults(defaults = this.jhipsterConfig.applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig) {

package/generators/generator-constants.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 const validationOptions = require('../jdl/jhipster/validations');
+const gradleOptions = require('./gradle/constants.cjs');
 const databaseTypes = require('../jdl/jhipster/database-types');
 const { ANGULAR_X, REACT, VUE } = require('../jdl/jhipster/client-framework-types');
 const commonPackageJson = require('./common/templates/package.json');
@@ -26,52 +27,52 @@ const JAVA_VERSION = '11';
 const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
 
 // Version of Node, NPM
-const NODE_VERSION = '14.17.6';
+const NODE_VERSION = '16.13.1';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
 
-const GRADLE_VERSION = '7.0.2';
-const JIB_VERSION = '3.1.4';
+const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
+const JIB_VERSION = '3.2.0';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.3.1';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.6.0';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
-const SPRING_BOOT_VERSION = '2.5.5';
-const LIQUIBASE_VERSION = '4.5.0';
+const SPRING_BOOT_VERSION = '2.6.3';
+const LIQUIBASE_VERSION = '4.6.1';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
-const HIBERNATE_VERSION = '5.4.32.Final';
+const HIBERNATE_VERSION = '5.6.4.Final';
 
 const JACOCO_VERSION = '0.8.7';
-const KAFKA_VERSION = '5.5.5';
-const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.1';
+const KAFKA_VERSION = '5.5.7';
+const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
 // const DOCKER_JHIPSTER_REGISTRY = 'ghcr.io/jhipster/jhipster-registry:main';
-const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.1.0';
+const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.2.0';
 const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.5.0';
 const DOCKER_JAVA_JRE = 'eclipse-temurin:11-jre-focal';
-const DOCKER_MYSQL = 'mysql:8.0.26';
-const DOCKER_MARIADB = 'mariadb:10.6.4';
-const DOCKER_POSTGRESQL = 'postgres:13.4';
-const DOCKER_MONGODB = 'mongo:4.4.8';
+const DOCKER_MYSQL = 'mysql:8.0.27';
+const DOCKER_MARIADB = 'mariadb:10.7.1';
+const DOCKER_POSTGRESQL = 'postgres:14.1';
+const DOCKER_MONGODB = 'mongo:4.4.11';
 const DOCKER_COUCHBASE = 'couchbase/server:7.0.0';
 const DOCKER_CASSANDRA = 'cassandra:3.11.11';
-const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04';
-const DOCKER_NEO4J = 'neo4j:4.2.11';
-const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.06';
-const DOCKER_MEMCACHED = 'memcached:1.6.10-alpine';
-const DOCKER_REDIS = 'redis:6.2.5';
-const DOCKER_KEYCLOAK = 'jboss/keycloak:15.0.2'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
-const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.13.3'; // The version should be coherent with the one from spring-data-elasticsearch project
+const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU14-ubuntu-20.04';
+const DOCKER_NEO4J = 'neo4j:4.4.2';
+const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.12-1';
+const DOCKER_MEMCACHED = 'memcached:1.6.12-alpine';
+const DOCKER_REDIS = 'redis:6.2.6';
+const DOCKER_KEYCLOAK = 'jboss/keycloak:16.1.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
+const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.15.2'; // The version should be coherent with the one from spring-data-elasticsearch project
 const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
 const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;
-const DOCKER_SONAR = 'sonarqube:8.9.2-community';
-const DOCKER_CONSUL = 'consul:1.9.9';
+const DOCKER_SONAR = 'sonarqube:9.2.4-community';
+const DOCKER_CONSUL = 'consul:1.11.1';
 const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
-const DOCKER_PROMETHEUS = 'prom/prometheus:v2.29.2';
+const DOCKER_PROMETHEUS = 'prom/prometheus:v2.32.1';
 const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
-const DOCKER_GRAFANA = 'grafana/grafana:8.1.3';
+const DOCKER_GRAFANA = 'grafana/grafana:8.3.3';
 const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11';
 const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest';
 const DOCKER_PROMETHEUS_OPERATOR = 'quay.io/coreos/prometheus-operator:v0.42.1';
@@ -83,7 +84,7 @@ const KUBERNETES_BATCH_API_VERSION = 'batch/v1';
 const KUBERNETES_DEPLOYMENT_API_VERSION = 'apps/v1';
 const KUBERNETES_STATEFULSET_API_VERSION = 'apps/v1';
 const KUBERNETES_INGRESS_API_VERSION = 'networking.k8s.io/v1beta1';
-const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1alpha3';
+const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1beta1';
 const KUBERNETES_RBAC_API_VERSION = 'rbac.authorization.k8s.io/v1';
 
 // Helm versions
@@ -95,6 +96,7 @@ const HELM_MYSQL = '^1.4.0';
 const HELM_MARIADB = '^6.12.2';
 const HELM_POSTGRESQL = '^6.5.3';
 const HELM_MOGODB_REPLICASET = '^3.10.1';
+const HELM_COUCHBASE_OPERATOR = '^2.2.1';
 
 // all constants used throughout all generators
 
@@ -254,7 +256,7 @@ const LANGUAGES = [
            And https://github.com/jhipster/generator-jhipster/issues/9494
            Java 17 supports 'id' locale, for compatibility with java 11, we will keep legacy 'in' value while we support java 11.
            When running with java 17 users must set 'java.locale.useOldISOCodes=true' environment variable.
-           See https://bugs.openjdk.java.net/browse/JDK-8267069. 
+           See https://bugs.openjdk.java.net/browse/JDK-8267069.
         */
     value: 'in',
     localeId: 'id',
@@ -425,6 +427,7 @@ const constants = {
   HELM_MARIADB,
   HELM_POSTGRESQL,
   HELM_MOGODB_REPLICASET,
+  HELM_COUCHBASE_OPERATOR,
 };
 
 module.exports = constants;

package/generators/generator-defaults.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/generator-list.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/generator-transforms.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -18,24 +18,31 @@
  */
 const { State } = require('mem-fs-editor');
 const path = require('path');
-const { createFileTransform } = require('yeoman-environment/lib/util/transform');
+const { passthrough } = require('p-transform');
 const prettier = require('prettier');
 const prettierPluginJava = require('prettier-plugin-java');
 const prettierPluginPackagejson = require('prettier-plugin-packagejson');
+const { patternSpy } = require('yeoman-environment/transform');
 
 const { isFileStateDeleted } = State;
 
-const prettierTransform = function (options, generator, ignoreErrors = false) {
-  return createFileTransform((file, encoding, callback) => {
-    if (isFileStateDeleted(file)) {
-      callback(null, file);
-      return Promise.resolve();
-    }
-    /* resolve from the projects config */
-    let fileContent;
-    return prettier
-      .resolveConfig(file.relative)
-      .then(function (resolvedDestinationFileOptions) {
+const prettierTransform = function (options, generator, transformOptions = {}) {
+  if (typeof transformOptions === 'boolean') {
+    transformOptions = { ignoreErrors: transformOptions };
+  }
+  const { ignoreErrors = false, extensions = generator.getPrettierExtensions() } = transformOptions;
+  return patternSpy(
+    async file => {
+      if (isFileStateDeleted(file)) {
+        return file;
+      }
+      if (!file.contents) {
+        throw new Error(`File content doesn't exist for ${file.relative}`);
+      }
+      /* resolve from the projects config */
+      let fileContent;
+      try {
+        const resolvedDestinationFileOptions = await prettier.resolveConfig(file.relative);
         const prettierOptions = {
           plugins: [],
           // Config from disk
@@ -52,27 +59,33 @@ const prettierTransform = function (options, generator, ignoreErrors = false) {
         fileContent = file.contents.toString('utf8');
         const data = prettier.format(fileContent, prettierOptions);
         file.contents = Buffer.from(data);
-        callback(null, file);
-      })
-      .catch(error => {
-        const errorMessage = `Error parsing file ${file.relative}: ${error}
+        return file;
+      } catch (error) {
+        let errorMessage;
+        if (fileContent) {
+          errorMessage = `Error parsing file ${file.relative}: ${error}
 
 At: ${fileContent
-          .split('\n')
-          .map((value, idx) => `${idx + 1}: ${value}`)
-          .join('\n')}`;
+            .split('\n')
+            .map((value, idx) => `${idx + 1}: ${value}`)
+            .join('\n')}`;
+        } else {
+          errorMessage = `Unknown prettier error: ${error}`;
+        }
         if (ignoreErrors) {
           generator.warning(errorMessage);
-          callback(null, file);
-        } else {
-          callback(new Error(errorMessage));
+          return file;
         }
-      });
-  });
+        throw new Error(errorMessage);
+      }
+    },
+    `**/*.{${extensions}}`,
+    { dot: true }
+  ).name('jhipster:prettier');
 };
 
 const generatedAnnotationTransform = generator => {
-  return createFileTransform(function (file, encoding, callback) {
+  return passthrough(file => {
     if (
       !file.path.endsWith('package-info.java') &&
       !file.path.endsWith('MavenWrapperDownloader.java') &&
@@ -92,8 +105,7 @@ const generatedAnnotationTransform = generator => {
         file.contents = Buffer.from(newContent);
       }
     }
-    callback(null, file);
-  });
+  }, 'jhipster:generated-by-annotation');
 };
 
 module.exports = {

package/generators/gradle/constants.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const GRADLE_VERSION = '7.0.2';
+const GRADLE_VERSION = '7.3.1';
 const GRADLE = 'gradle';
 const GRADLE_DESCRIPTION = 'Gradle';
 const BUILD_DESTINATION_VALUE = 'build';

package/generators/gradle/files.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/gradle/generator.spec.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/gradle/index.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/gradle/templates/.eslintignore.jhi.gradle.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/gradle/templates/.gitignore.jhi.gradle.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/gradle/templates/.prettierignore.jhi.gradle.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/gradle/templates/build.gradle.jhi.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/gradle/templates/gradle.properties.jhi.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/gradle/templates/settings.gradle.jhi.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/heroku/esm.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/heroku/generator.spec.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.