generator-jhipster 7.6.0 → 7.8.1

package/generators/generator-base.js

@@ -29,6 +29,7 @@ const os = require('os');
 const normalize = require('normalize-path');
 const simpleGit = require('simple-git');
 
+const SharedData = require('../lib/support/shared-data.cjs');
 const packagejs = require('../package.json');
 const jhipsterUtils = require('./utils');
 const constants = require('./generator-constants');
@@ -42,6 +43,30 @@ 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 {
+  PRIORITY_NAMES: {
+    LOADING,
+    PREPARING,
+
+    CONFIGURING_EACH_ENTITY,
+    LOADING_EACH_ENTITY,
+    PREPARING_EACH_ENTITY,
+    PREPARING_FIELDS,
+    PREPARING_EACH_ENTITY_FIELD,
+    PREPARING_RELATIONSHIPS,
+    PREPARING_EACH_ENTITY_RELATIONSHIP,
+    POST_PREPARING_EACH_ENTITY,
+
+    DEFAULT,
+    WRITING,
+    WRITING_ENTITIES,
+    POST_WRITING,
+    POST_WRITING_ENTITIES,
+    PRE_CONFLICTS,
+    INSTALL,
+    END,
+  },
+} = require('../lib/constants/priorities.cjs');
 
 const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 const MODULES_HOOK_FILE = `${JHIPSTER_CONFIG_DIR}/modules/jhi-hooks.json`;
@@ -121,7 +146,6 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     // JHipster runtime config that should not be stored to .yo-rc.json.
     this.configOptions = this.options.configOptions || { sharedEntities: {} };
     this.configOptions.sharedEntities = this.configOptions.sharedEntities || {};
-    this._sharedData = this.options.jhipsterSharedData;
 
     /* Force config to use 'generator-jhipster' namespace. */
     this._config = this._getStorage('generator-jhipster', { sorted: true });
@@ -167,12 +191,29 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     return this.fetchFromInstalledJHipster(this._jhipsterGenerator, 'templates', ...args);
   }
 
+  /**
+   * Get generator dependencies for building help
+   * This is a stub and should be overwritten by the generator.
+   *
+   * @returns {string[]}
+   */
+  getPossibleDependencies() {
+    return [];
+  }
+
   /**
    * Shared Data
    */
   get sharedData() {
     if (!this._sharedData) {
-      throw new Error("Shared data doesn't exists it should be provided by the cli");
+      const { baseName } = this.jhipsterConfig;
+      if (!baseName) {
+        throw new Error('baseName is required');
+      }
+      if (!this.options.sharedData[baseName]) {
+        this.options.sharedData[baseName] = {};
+      }
+      this._sharedData = new SharedData(this.options.sharedData[baseName]);
     }
     return this._sharedData;
   }
@@ -1095,6 +1136,16 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     this.needleApi.serverGradle.addPlugin(group, name, version);
   }
 
+  /**
+   * A new Gradle plugin to plugin management block in settings.gradle
+   *
+   * @param {string} id - plugin id
+   * @param {string} version - explicit plugin version number
+   */
+  addGradlePluginToPluginManagement(id, version) {
+    this.needleApi.serverGradle.addPluginToPluginManagement(id, version);
+  }
+
   /**
    * Add Gradle plugin to the plugins block
    *
@@ -1160,6 +1211,17 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     this.needleApi.serverGradle.addMavenRepository(url, username, password);
   }
 
+  /**
+   * Add a remote Maven repository to the Gradle plugin management block in settings.gradle
+   *
+   * @param {string} url - url of the repository
+   * @param {string} username - (optional) username of the repository credentials
+   * @param {string} password - (optional) password of the repository credentials
+   */
+  addGradlePluginManagementRepository(url, username, password) {
+    this.needleApi.serverGradle.addPluginManagementRepository(url, username, password);
+  }
+
   /**
    * Generate a date to be used by Liquibase changelogs.
    *
@@ -1520,6 +1582,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
       args,
       {
         ...this.options,
+        destinationRoot: this._destinationRoot,
         configOptions: this.configOptions,
         ...options,
       },
@@ -1579,8 +1642,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
    * @return {object} entity definition
    */
   readEntityJson(entityName) {
-    const configDir = this.destinationPath(JHIPSTER_CONFIG_DIR);
-    const file = this.destinationPath(configDir, `${entityName}.json`);
+    const file = path.join(path.dirname(this.config.path), JHIPSTER_CONFIG_DIR, `${entityName}.json`);
     try {
       return this.fs.readJSON(file);
     } catch (error) {
@@ -1919,15 +1981,6 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
    * Prints a JHipster logo.
    */
   printJHipsterLogo() {
-    this.log('\n');
-    this.log(`${chalk.green('        ██╗')}${chalk.red(' ██╗   ██╗ ████████╗ ███████╗   ██████╗ ████████╗ ████████╗ ███████╗')}`);
-    this.log(`${chalk.green('        ██║')}${chalk.red(' ██║   ██║ ╚══██╔══╝ ██╔═══██╗ ██╔════╝ ╚══██╔══╝ ██╔═════╝ ██╔═══██╗')}`);
-    this.log(`${chalk.green('        ██║')}${chalk.red(' ████████║    ██║    ███████╔╝ ╚█████╗     ██║    ██████╗   ███████╔╝')}`);
-    this.log(`${chalk.green('  ██╗   ██║')}${chalk.red(' ██╔═══██║    ██║    ██╔════╝   ╚═══██╗    ██║    ██╔═══╝   ██╔══██║')}`);
-    this.log(`${chalk.green('  ╚██████╔╝')}${chalk.red(' ██║   ██║ ████████╗ ██║       ██████╔╝    ██║    ████████╗ ██║  ╚██╗')}`);
-    this.log(`${chalk.green('   ╚═════╝ ')}${chalk.red(' ╚═╝   ╚═╝ ╚═══════╝ ╚═╝       ╚═════╝     ╚═╝    ╚═══════╝ ╚═╝   ╚═╝')}\n`);
-    this.log(chalk.white.bold('                            https://www.jhipster.tech\n'));
-    this.log(chalk.white('Welcome to JHipster ') + chalk.yellow(`v${packagejs.version}`));
     this.log(chalk.white(`Application files will be generated in folder: ${chalk.yellow(process.cwd())}`));
     if (process.cwd() === this.getUserHome()) {
       this.log(chalk.red.bold('\n️⚠️  WARNING ⚠️  You are in your HOME folder!'));
@@ -2339,7 +2392,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         return val;
       }
       if (typeof val === 'function') {
-        return val(context, this);
+        return val.call(this, context, this);
       }
       throw new Error(`Type not supported ${val}`);
     };
@@ -2547,7 +2600,27 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     if (this.configOptions.optionsParsed) return;
     this.configOptions.optionsParsed = true;
 
+    // Write new definitions to memfs
+    if (options.applicationWithEntities) {
+      this.config.set({
+        ...this.config.getAll(),
+        ...options.applicationWithEntities.config,
+      });
+      if (options.applicationWithEntities.entities) {
+        const entities = options.applicationWithEntities.entities.map(entity => {
+          const entityName = _.upperFirst(entity.name);
+          const file = this.destinationPath(JHIPSTER_CONFIG_DIR, `${entityName}.json`);
+          this.fs.writeJSON(file, { ...this.fs.readJSON(file), ...entity });
+          return entityName;
+        });
+        this.jhipsterConfig.entities = [...new Set((this.jhipsterConfig.entities || []).concat(entities))];
+      }
+    }
+
     // Load stored options
+    if (options.withGeneratedFlag !== undefined) {
+      this.jhipsterConfig.withGeneratedFlag = options.withGeneratedFlag;
+    }
     if (options.skipJhipsterDependencies !== undefined) {
       this.jhipsterConfig.skipJhipsterDependencies = options.skipJhipsterDependencies;
     }
@@ -2667,6 +2740,14 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       this.jhipsterConfig.pkType = options.pkType;
     }
 
+    if (options.cacheProvider !== undefined) {
+      this.jhipsterConfig.cacheProvider = options.cacheProvider;
+    }
+
+    if (options.enableHibernateCache !== undefined) {
+      this.jhipsterConfig.enableHibernateCache = options.enableHibernateCache;
+    }
+
     if (options.microfrontend) {
       this.jhipsterConfig.microfrontend = options.microfrontend;
     }
@@ -2770,6 +2851,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.cucumberTests = dest.testFrameworks.includes(CUCUMBER);
     dest.protractorTests = dest.testFrameworks.includes(PROTRACTOR);
     dest.cypressTests = dest.testFrameworks.includes(CYPRESS);
+
+    dest.authenticationType = config.authenticationType;
+    dest.rememberMeKey = config.rememberMeKey;
+    dest.jwtSecretKey = config.jwtSecretKey;
   }
 
   loadDerivedMicroserviceAppConfig(dest = this) {
@@ -2804,6 +2889,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       dest.microfrontend ||
       (dest.applicationTypeMicroservice && !dest.skipClient) ||
       (dest.applicationTypeGateway && dest.microfrontends && dest.microfrontends.length > 0);
+
+    dest.authenticationTypeSession = dest.authenticationType === SESSION;
+    dest.authenticationTypeJwt = dest.authenticationType === JWT;
+    dest.authenticationTypeOauth2 = dest.authenticationType === OAUTH2;
   }
 
   /**
@@ -2864,10 +2953,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
 
     dest.buildTool = config.buildTool;
 
-    dest.authenticationType = config.authenticationType;
-    dest.rememberMeKey = config.rememberMeKey;
-    dest.jwtSecretKey = config.jwtSecretKey;
-
     dest.databaseType = config.databaseType;
     dest.devDatabaseType = config.devDatabaseType;
     dest.prodDatabaseType = config.prodDatabaseType;
@@ -2911,10 +2996,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       dest.messageBroker = false;
     }
 
-    dest.authenticationTypeSession = dest.authenticationType === SESSION;
-    dest.authenticationTypeJwt = dest.authenticationType === JWT;
-    dest.authenticationTypeOauth2 = dest.authenticationType === OAUTH2;
-
     dest.buildToolGradle = dest.buildTool === GRADLE;
     dest.buildToolMaven = dest.buildTool === MAVEN;
     dest.buildToolUnknown = !dest.buildToolGradle && !dest.buildToolMaven;
@@ -3048,6 +3129,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     return this.getDefaultConfigForApplicationType();
   }
 
+  /**
+   * JHipster config with default values fallback
+   */
+  get jhipsterConfigWithDefaults() {
+    return _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults);
+  }
+
   /**
    * Get default config based on applicationType
    */
@@ -3058,7 +3146,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     };
   }
 
-  setConfigDefaults(defaults = this.jhipsterConfig.applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig) {
+  setConfigDefaults(defaults = this.jhipsterDefaults) {
     const jhipsterVersion = packagejs.version;
     const baseName = this.getDefaultAppName();
     const creationTimestamp = new Date().getTime();
@@ -3176,6 +3264,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param String options - Object containing options.
    */
   jhipsterOptions(options = {}) {
+    options = _.cloneDeep(options);
     Object.entries(options).forEach(([optionName, optionDesc]) => {
       this.option(kebabCase(optionName), optionDesc);
       if (!optionDesc.scope) return;
@@ -3185,6 +3274,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
           this.config.set(optionName, optionValue);
         } else if (optionDesc.scope === 'runtime') {
           this.configOptions[optionName] = optionValue;
+        } else if (optionDesc.scope === 'generator') {
+          this[optionName] = optionValue;
         } else {
           throw new Error(`Scope ${optionDesc.scope} not supported`);
         }
@@ -3193,8 +3284,51 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     });
   }
 
+  getArgsForPriority(priorityName) {
+    if (this.features.priorityArgs) {
+      return [this.getDataArgForPriority(priorityName)];
+    }
+    return this.args;
+  }
+
+  /**
+   */
+  getDataArgForPriority(priorityName) {
+    if (
+      ![
+        LOADING,
+        PREPARING,
+
+        CONFIGURING_EACH_ENTITY,
+        LOADING_EACH_ENTITY,
+        PREPARING_EACH_ENTITY,
+        PREPARING_FIELDS,
+        PREPARING_EACH_ENTITY_FIELD,
+        PREPARING_RELATIONSHIPS,
+        PREPARING_EACH_ENTITY_RELATIONSHIP,
+        POST_PREPARING_EACH_ENTITY,
+
+        DEFAULT,
+        WRITING,
+        WRITING_ENTITIES,
+        POST_WRITING,
+        POST_WRITING_ENTITIES,
+        PRE_CONFLICTS,
+        INSTALL,
+        END,
+      ].includes(priorityName)
+    ) {
+      throw new Error(`${priorityName} data not available`);
+    }
+    if (!this.jhipsterConfig.baseName) {
+      return {};
+    }
+    return { application: this.sharedData.getApplication() };
+  }
+
   /**
    * Create a simple-git instance using current destinationPath as baseDir.
+   * @return {import('simple-git').SimpleGit}
    */
   createGit() {
     return simpleGit({ baseDir: this.destinationPath() }).env({

package/generators/generator-constants.js

@@ -24,23 +24,23 @@ const commonPackageJson = require('./common/templates/package.json');
 
 // Version of Java
 const JAVA_VERSION = '11';
-const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
+const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17', '18'];
 
 // Version of Node, NPM
-const NODE_VERSION = '16.13.1';
+const NODE_VERSION = '16.14.0';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
 
 const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
-const JIB_VERSION = '3.2.0';
+const JIB_VERSION = '3.2.1';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.6.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.8.1';
 // 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.6.3';
+const SPRING_BOOT_VERSION = '2.6.6';
 const LIQUIBASE_VERSION = '4.6.1';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
-const HIBERNATE_VERSION = '5.6.4.Final';
+const HIBERNATE_VERSION = '5.6.7.Final';
 
 const JACOCO_VERSION = '0.8.7';
 const KAFKA_VERSION = '5.5.7';
@@ -49,34 +49,35 @@ 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.2.0';
+const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.3.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.27';
+const DOCKER_MYSQL = 'mysql:8.0.28';
 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-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_POSTGRESQL = 'postgres:14.2';
+const DOCKER_MONGODB = 'mongo:4.4.12';
+const DOCKER_COUCHBASE = 'couchbase/server:7.0.3';
+const DOCKER_CASSANDRA = 'cassandra:3.11.12';
+const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU15-ubuntu-20.04';
+const DOCKER_NEO4J = 'neo4j:4.4.4';
+const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2022.01';
+const DOCKER_MEMCACHED = 'memcached:1.6.14-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:9.2.4-community';
-const DOCKER_CONSUL = 'consul:1.11.1';
+const DOCKER_SONAR = 'sonarqube:9.3.0-community';
+const DOCKER_CONSUL = 'consul:1.11.3';
 const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
-const DOCKER_PROMETHEUS = 'prom/prometheus:v2.32.1';
+const DOCKER_PROMETHEUS = 'prom/prometheus:v2.33.3';
 const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
-const DOCKER_GRAFANA = 'grafana/grafana:8.3.3';
+const DOCKER_GRAFANA = 'grafana/grafana:8.4.1';
 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';
 const DOCKER_GRAFANA_WATCHER = 'quay.io/coreos/grafana-watcher:v0.0.8';
+const DOCKER_ZIPKIN = 'openzipkin/zipkin:2.23';
 
 // Kubernetes versions
 const KUBERNETES_CORE_API_VERSION = 'v1';
@@ -418,6 +419,7 @@ const constants = {
   KUBERNETES_INGRESS_API_VERSION,
   KUBERNETES_ISTIO_NETWORKING_API_VERSION,
   KUBERNETES_RBAC_API_VERSION,
+  DOCKER_ZIPKIN,
 
   HELM_KAFKA,
   HELM_ELASTICSEARCH,

package/generators/generator-list.js

@@ -25,6 +25,7 @@ const Generators = {
   GENERATOR_AZURE_SPRING_CLOUD: 'azure-spring-cloud',
   GENERATOR_BASE: 'base',
   GENERATOR_BOOTSTRAP: 'bootstrap',
+  GENERATOR_BOOTSTRAP_APPLICATION: 'bootstrap-application',
   GENERATOR_CI_CD: 'ci-cd',
   /* @deprecated */
   GENERATOR_CICD: 'ci-cd',
@@ -45,6 +46,7 @@ const Generators = {
   GENERATOR_ENTITY_SERVER: 'entity-server',
   GENERATOR_EXPORT_JDL: 'export-jdl',
   GENERATOR_GAE: 'gae',
+  GENERATOR_GENERATE_BLUEPRINT: 'generate-blueprint',
   GENERATOR_GRADLE: 'gradle',
   GENERATOR_HEROKU: 'heroku',
   GENERATOR_INFO: 'info',

package/generators/generator-transforms.js

@@ -88,7 +88,6 @@ const generatedAnnotationTransform = generator => {
   return passthrough(file => {
     if (
       !file.path.endsWith('package-info.java') &&
-      !file.path.endsWith('MavenWrapperDownloader.java') &&
       path.extname(file.path) === '.java' &&
       !isFileStateDeleted(file) &&
       !file.path.endsWith('GeneratedByJHipster.java')

package/generators/gradle/constants.cjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const GRADLE_VERSION = '7.3.1';
+const GRADLE_VERSION = '7.4.2';
 const GRADLE = 'gradle';
 const GRADLE_DESCRIPTION = 'Gradle';
 const BUILD_DESTINATION_VALUE = 'build';

package/generators/gradle/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';

package/generators/heroku/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/info/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/init/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';

package/generators/init/files.cjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 module.exports.files = {
   prettier: [
     {
@@ -30,7 +29,14 @@ module.exports.files = {
   ],
   global: [
     {
-      templates: ['README.md', 'package.json', '.editorconfig.jhi'],
+      templates: [
+        'README.md',
+        '.editorconfig.jhi',
+        {
+          override: false,
+          file: 'package.json',
+        },
+      ],
     },
   ],
 };
@@ -39,7 +45,7 @@ module.exports.commitHooksFiles = {
   commitHooks: [
     {
       templates: [
-        '.lintstagedrc.js',
+        '.lintstagedrc.cjs',
         {
           file: '.husky/pre-commit',
           method: 'copy',

package/generators/init/index.cjs

@@ -165,6 +165,11 @@ module.exports = class extends MixedChain {
 
   get writing() {
     return {
+      cleanup() {
+        if (this.isJhipsterVersionLessThan('7.5.1')) {
+          this.removeFile('.lintstagedrc.js');
+        }
+      },
       async writeFiles() {
         if (this.shouldSkipFiles()) return;
         await this.writeFiles({ sections: files, context: this.application });

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

@@ -125,4 +125,9 @@ Desktop.ini
 ######################
 .eslintcache
 
+######################
+# Angular
+######################
+.angular
+
 <&- fragments.render({ join: '\n\n' }) &>

package/generators/java/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';