generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

package/dist/generators/generator-constants.mjs

@@ -17,46 +17,42 @@
  * limitations under the License.
  */
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-beta.1';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-beta.3';
 // Version of Java
 export const JAVA_VERSION = '17';
-export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19'];
+export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM
-export const NODE_VERSION = '18.16.0';
-export const OPENAPI_GENERATOR_CLI_VERSION = '2.5.1';
+export const NODE_VERSION = '18.17.1';
+export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
 export const javaDependencies = {
     /**
      * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
      */
-    'spring-boot': '3.0.7',
+    'spring-boot': '3.1.3',
     /*
      * hibernate version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
      * Required due to hibernate-jpamodelgen annotation processor.
      */
-    hibernate: '6.1.7.Final',
+    hibernate: '6.2.7.Final',
     /*
      * cassandra driver version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
      * Required due to java-driver-mapper-processor annotation processor.
      */
     cassandra: '4.15.0',
-    /**
-     * TODO drop once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-     */
-    'r2dbc-mariadb': '1.1.2',
 };
 Object.freeze(javaDependencies);
 // The version should be coherent with the one from spring-data-elasticsearch project
-export const ELATICSEARCH_TAG = '8.5.3';
-export const ELATICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
+export const ELASTICSEARCH_TAG = '8.7.1';
+export const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
 /**
  * Manually updated docker containers
  */
 export const dockerContainers = {
-    elasticsearchTag: ELATICSEARCH_TAG,
-    elasticsearchImage: ELATICSEARCH_IMAGE,
-    elasticsearch: `${ELATICSEARCH_IMAGE}:${ELATICSEARCH_TAG}`,
+    elasticsearchTag: ELASTICSEARCH_TAG,
+    elasticsearchImage: ELASTICSEARCH_IMAGE,
+    elasticsearch: `${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_TAG}`,
 };
 Object.freeze(dockerContainers);
 // Kubernetes versions
@@ -75,7 +71,7 @@ export const HELM_GRAFANA = '^4.0.0';
 export const HELM_MYSQL = '^1.4.0';
 export const HELM_MARIADB = '^6.12.2';
 export const HELM_POSTGRESQL = '^6.5.3';
-export const HELM_MOGODB_REPLICASET = '^3.10.1';
+export const HELM_MONGODB_REPLICASET = '^3.10.1';
 export const HELM_COUCHBASE_OPERATOR = '^2.2.1';
 // all constants used throughout all generators
 export const LOGIN_REGEX = '^(?>[a-zA-Z0-9!$&*+=?^_`{|}~.-]+@[a-zA-Z0-9-]+(?:\\\\.[a-zA-Z0-9-]+)*)|(?>[_.@A-Za-z0-9-]+)$';
@@ -89,6 +85,7 @@ export const TEST_DIR = 'src/test/';
 // Note: this will be prepended with 'target/classes' for Maven, or with 'build/resources/main' for Gradle.
 export const CLIENT_DIST_DIR = 'static/';
 export const GENERATOR_JHIPSTER = 'generator-jhipster';
+export const YO_RC_FILE = '.yo-rc.json';
 export const JHIPSTER_CONFIG_DIR = '.jhipster';
 export const DOCKER_DIR = `${MAIN_DIR}docker/`;
 export const LINE_LENGTH = 180;

package/dist/generators/generator-list.mjs

@@ -23,12 +23,15 @@ export const GENERATOR_AZURE_APP_SERVICE = 'azure-app-service';
 export const GENERATOR_AZURE_SPRING_CLOUD = 'azure-spring-cloud';
 export const GENERATOR_BASE = 'base';
 export const GENERATOR_BASE_APPLICATION = 'base-application';
-export const GENERATOR_BASE_DOCKER = 'base-docker';
+export const GENERATOR_BASE_CORE = 'base-core';
+export const GENERATOR_BASE_ENTITY_CHANGES = 'base-entity-changes';
+export const GENERATOR_BASE_WORKSPACES = 'base-workspaces';
 export const GENERATOR_BOOTSTRAP = 'bootstrap';
 export const GENERATOR_BOOTSTRAP_APPLICATION = 'bootstrap-application';
 export const GENERATOR_BOOTSTRAP_APPLICATION_BASE = 'bootstrap-application-base';
 export const GENERATOR_BOOTSTRAP_APPLICATION_CLIENT = 'bootstrap-application-client';
 export const GENERATOR_BOOTSTRAP_APPLICATION_SERVER = 'bootstrap-application-server';
+export const GENERATOR_BOOTSTRAP_WORKSPACES = 'bootstrap-workspaces';
 export const GENERATOR_CI_CD = 'ci-cd';
 export const GENERATOR_CLIENT = 'client';
 export const GENERATOR_CLOUDFOUNDRY = 'cloudfoundry';
@@ -55,7 +58,6 @@ export const GENERATOR_KUBERNETES_HELM = 'kubernetes-helm';
 export const GENERATOR_KUBERNETES_KNATIVE = 'kubernetes-knative';
 export const GENERATOR_LANGUAGES = 'languages';
 export const GENERATOR_LIQUIBASE = 'liquibase';
-export const GENERATOR_LIQUIBASE_CHANGELOGS = 'liquibase-changelogs';
 export const GENERATOR_MAVEN = 'maven';
 export const GENERATOR_OPENAPI_CLIENT = 'openapi-client';
 export const GENERATOR_OPENSHIFT = 'openshift';

package/dist/generators/gradle/constants.mjs

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

package/dist/generators/gradle/generator.mjs

@@ -25,20 +25,26 @@ import { GRADLE } from './constants.mjs';
 import cleanupOldServerFilesTask from './cleanup.mjs';
 import { applyFromGradleCallback, addGradleDependencyCallback, addGradleMavenRepositoryCallback, addGradlePluginCallback, addGradlePluginManagementCallback, addGradlePropertyCallback, } from './internal/needles.mjs';
 export default class GradleGenerator extends BaseApplicationGenerator {
-    constructor(args, options, features) {
-        super(args, options, features);
-        if (this.options.help)
-            return;
-        this.config.defaults({
-            buildTool: GRADLE,
-        });
-    }
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
             await this.composeWithBlueprints(GENERATOR_GRADLE);
         }
     }
+    get configuring() {
+        return this.asConfiguringTaskGroup({
+            configure() {
+                if (this.jhipsterConfigWithDefaults.buildTool !== GRADLE) {
+                    this.config.defaults({
+                        buildTool: GRADLE,
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.CONFIGURING]() {
+        return this.delegateTasksToBlueprint(() => this.configuring);
+    }
     get preparing() {
         return this.asPreparingTaskGroup({
             async verify({ application }) {

package/dist/generators/heroku/generator.mjs

@@ -18,10 +18,10 @@
  */
 /* eslint-disable consistent-return */
 import crypto from 'crypto';
-import _ from 'lodash';
 import fs from 'fs';
 import ChildProcess from 'child_process';
 import util from 'util';
+import _ from 'lodash';
 import chalk from 'chalk';
 import { glob } from 'glob';
 import runAsync from 'run-async';
@@ -33,6 +33,11 @@ import { authenticationTypes, buildToolTypes, cacheTypes, databaseTypes, searchE
 import { mavenProfileContent } from './templates.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
 import { addGradlePluginCallback, applyFromGradleCallback } from '../gradle/internal/needles.mjs';
+import { getFrontendAppName } from '../base/support/index.mjs';
+import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
+import { loadLanguagesConfig } from '../languages/support/index.mjs';
 const cacheProviderOptions = cacheTypes;
 const { MEMCACHED, REDIS } = cacheTypes;
 const { OAUTH2 } = authenticationTypes;
@@ -70,12 +75,13 @@ export default class HerokuGenerator extends BaseGenerator {
     get initializing() {
         return {
             loadCommonConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadTranslationConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadLanguagesConfig({ application: this, config: this.jhipsterConfigWithDefaults });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
             initializing() {
                 this.log.log(chalk.bold('Heroku configuration is starting'));
@@ -83,7 +89,7 @@ export default class HerokuGenerator extends BaseGenerator {
                 this.env.options.appPath = configuration.get('appPath') || CLIENT_MAIN_SRC_DIR;
                 this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
                 this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-                this.frontendAppName = this.getFrontendAppName();
+                this.frontendAppName = getFrontendAppName({ baseName: this.jhipsterConfig.baseName });
                 this.herokuAppName = configuration.get('herokuAppName');
                 this.dynoSize = 'Free';
                 this.herokuDeployType = configuration.get('herokuDeployType');
@@ -289,7 +295,7 @@ export default class HerokuGenerator extends BaseGenerator {
                 catch (e) {
                     // An exception is thrown if the folder doesn't exist
                     this.log.log(chalk.bold('\nInitializing Git repository'));
-                    const child = ChildProcess.exec('git init', (err, stdout, stderr) => {
+                    const child = ChildProcess.exec('git init', () => {
                         done();
                     });
                     child.stdout.on('data', data => {
@@ -309,7 +315,7 @@ export default class HerokuGenerator extends BaseGenerator {
                     }
                     else {
                         this.log.log(chalk.bold('\nInstalling Heroku CLI deployment plugin'));
-                        const child = ChildProcess.exec(`heroku plugins:install ${cliPlugin}`, (err, stdout) => {
+                        const child = ChildProcess.exec(`heroku plugins:install ${cliPlugin}`, err => {
                             if (err) {
                                 this.abort = true;
                                 this.log.error(err);
@@ -352,7 +358,7 @@ export default class HerokuGenerator extends BaseGenerator {
                             this.log.verboseInfo('');
                             this.prompt(prompts).then(props => {
                                 if (props.herokuForceName === 'Yes') {
-                                    ChildProcess.exec(`heroku git:remote --app ${this.herokuAppName}`, (err, stdout, stderr) => {
+                                    ChildProcess.exec(`heroku git:remote --app ${this.herokuAppName}`, (err, stdout) => {
                                         if (err) {
                                             this.abort = true;
                                             this.log.error(err);
@@ -368,7 +374,7 @@ export default class HerokuGenerator extends BaseGenerator {
                                     });
                                 }
                                 else {
-                                    ChildProcess.exec(`heroku create ${regionParams}`, (err, stdout, stderr) => {
+                                    ChildProcess.exec(`heroku create ${regionParams}`, (err, stdout) => {
                                         if (err) {
                                             this.abort = true;
                                             this.log.error(err);
@@ -378,7 +384,7 @@ export default class HerokuGenerator extends BaseGenerator {
                                             this.herokuAppName = stdout.substring(stdout.indexOf('https://') + 8, stdout.indexOf('.herokuapp'));
                                             this.log.verboseInfo(stdout.trim());
                                             // ensure that the git remote is the same as the appName
-                                            ChildProcess.exec(`heroku git:remote --app ${this.herokuAppName}`, (err, stdout, stderr) => {
+                                            ChildProcess.exec(`heroku git:remote --app ${this.herokuAppName}`, err => {
                                                 if (err) {
                                                     this.abort = true;
                                                     this.log.error(err);
@@ -398,13 +404,13 @@ export default class HerokuGenerator extends BaseGenerator {
                         }
                         else {
                             this.abort = true;
+                            this.herokuAppName = null;
                             if (stderr.includes('Invalid credentials')) {
                                 this.log.error("Error: Not authenticated. Run 'heroku login' to login to your heroku account and try again.");
                             }
                             else {
                                 this.log.error(err);
                             }
-                            done();
                         }
                     }
                     else {
@@ -427,7 +433,7 @@ export default class HerokuGenerator extends BaseGenerator {
                 if (this.abort)
                     return;
                 const done = this.async();
-                const addonCreateCallback = (addon, err, stdout, stderr) => {
+                const addonCreateCallback = (addon, err) => {
                     if (err) {
                         const verifyAccountUrl = 'https://heroku.com/verify';
                         if (_.includes(err, verifyAccountUrl)) {
@@ -524,7 +530,7 @@ export default class HerokuGenerator extends BaseGenerator {
                         props.herokuJHipsterRegistryPassword = encodeURIComponent(props.herokuJHipsterRegistryPassword);
                         const herokuJHipsterRegistry = `https://${props.herokuJHipsterRegistryUsername}:${props.herokuJHipsterRegistryPassword}@${props.herokuJHipsterRegistryApp}.herokuapp.com`;
                         const configSetCmd = `heroku config:set JHIPSTER_REGISTRY_URL=${herokuJHipsterRegistry} --app ${this.herokuAppName}`;
-                        const child = ChildProcess.exec(configSetCmd, (err, stdout, stderr) => {
+                        const child = ChildProcess.exec(configSetCmd, err => {
                             if (err) {
                                 this.abort = true;
                                 this.log.error(err);
@@ -557,7 +563,7 @@ export default class HerokuGenerator extends BaseGenerator {
                 }
                 if (this.useOkta) {
                     this.writeFile('provision-okta-addon.sh.ejs', 'provision-okta-addon.sh');
-                    fs.appendFile('.gitignore', 'provision-okta-addon.sh', 'utf8', (err, data) => {
+                    fs.appendFile('.gitignore', 'provision-okta-addon.sh', 'utf8', err => {
                         if (err) {
                             this.log.warn(`${chalk.yellow.bold('WARNING!')} Failed to add 'provision-okta-addon.sh' to .gitignore.'`);
                         }
@@ -609,7 +615,7 @@ export default class HerokuGenerator extends BaseGenerator {
                 }
                 const done = this.async();
                 this.log.log(chalk.bold('\nBuilding application'));
-                const child = this.buildApplication(this.buildTool, 'prod', false, err => {
+                const child = buildApplication(this.buildTool, 'prod', false, err => {
                     if (err) {
                         this.abort = true;
                         this.log.error(err);
@@ -659,7 +665,47 @@ export default class HerokuGenerator extends BaseGenerator {
                         }
                         this.log.log(chalk.bold('\nConfiguring Heroku'));
                         await execCmd(`heroku config:set ${configVars}--app ${this.herokuAppName}`);
-                        await execCmd(`heroku buildpacks:add ${buildpack} --app ${this.herokuAppName}`);
+                        const { stdout: data } = await execCmd(`heroku buildpacks:add ${buildpack} --app ${this.herokuAppName}`);
+                        if (data) {
+                            this.logger.info(data);
+                            // remote:  !     The following add-ons were automatically provisioned: . These add-ons may incur additional cost,
+                            // which is prorated to the second. Run `heroku addons` for more info.
+                            if (data.includes('Run `heroku addons` for more info.')) {
+                                await execCmd('heroku addons');
+                            }
+                            this.log('');
+                            const prompts = [
+                                {
+                                    type: 'list',
+                                    name: 'userDeployDecision',
+                                    message: 'Continue to deploy?',
+                                    choices: [
+                                        {
+                                            value: 'Yes',
+                                            name: 'Yes, I confirm',
+                                        },
+                                        {
+                                            value: 'No',
+                                            name: 'No, abort (Recommended)',
+                                        },
+                                    ],
+                                    default: 0,
+                                },
+                            ];
+                            this.log('');
+                            const props = await this.prompt(prompts);
+                            if (props.userDeployDecision === 'Yes') {
+                                this.log.info(chalk.bold('Continuing deployment...'));
+                            }
+                            else {
+                                this.log(this.logger);
+                                this.log.info(chalk.bold('You aborted deployment!'));
+                                this.abort = true;
+                                this.herokuAppName = null;
+                                return;
+                            }
+                            this.log('');
+                        }
                         this.log.log(chalk.bold('\nDeploying application'));
                         const herokuPush = execCmd('git push heroku HEAD:main', { maxBuffer: 1024 * 10000 });
                         herokuPush.child.stdout.on('data', data => {

package/dist/generators/index.js

@@ -0,0 +1,4 @@
+export { JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR, NODE_VERSION as RECOMMENDED_NODE_VERSION, JAVA_VERSION as RECOMMENDED_JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, JHIPSTER_DEPENDENCIES_VERSION, SERVER_MAIN_SRC_DIR as JAVA_MAIN_SOURCES_DIR, SERVER_MAIN_RES_DIR as JAVA_MAIN_RESOURCES_DIR, SERVER_TEST_SRC_DIR as JAVA_TEST_SOURCES_DIR, SERVER_TEST_RES_DIR as JAVA_SERVER_TEST_RESOURCES_DIR, CLIENT_MAIN_SRC_DIR as JAVA_WEBAPP_SOURCES_DIR, CLIENT_TEST_SRC_DIR as JAVA_JAVASCRIPT_TEST_DIR, DOCKER_DIR as JAVA_DOCKER_DIR, SERVER_MAIN_SRC_DIR as TEMPLATES_MAIN_SOURCES_DIR, SERVER_MAIN_RES_DIR as TEMPLATES_MAIN_RESOURCES_DIR, SERVER_TEST_SRC_DIR as TEMPLATES_TEST_SOURCES_DIR, SERVER_TEST_RES_DIR as TEMPLATES_TEST_RESOURCES_DIR, CLIENT_MAIN_SRC_DIR as TEMPLATES_WEBAPP_SOURCES_DIR, CLIENT_TEST_SRC_DIR as TEMPLATES_JAVASCRIPT_TEST_DIR, DOCKER_DIR as TEMPLATES_DOCKER_DIR, } from './generator-constants.mjs';
+export { default as GeneratorBase } from './base/index.mjs';
+export { default as GeneratorBaseCore } from './base-core/index.mjs';
+export { default as GeneratorBaseApplication } from './base-application/index.mjs';

package/dist/generators/info/generator.mjs

@@ -23,9 +23,17 @@ import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import JSONToJDLEntityConverter from '../../jdl/converters/json-to-jdl-entity-converter.js';
 import JSONToJDLOptionConverter from '../../jdl/converters/json-to-jdl-option-converter.js';
+import { YO_RC_FILE } from '../generator-constants.mjs';
+import { replaceSensitiveConfig } from './support/utils.mjs';
 export default class InfoGenerator extends BaseApplicationGenerator {
     constructor(args, options, features) {
-        super(args, options, { customInstallTask: true, customCommitTask: true, ...features });
+        super(args, options, {
+            jhipsterBootstrap: false,
+            storeJHipsterVersion: false,
+            customInstallTask: true,
+            customCommitTask: true,
+            ...features,
+        });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {
         return this.asInitializingTaskGroup({
@@ -34,7 +42,7 @@ export default class InfoGenerator extends BaseApplicationGenerator {
             },
             async checkJHipster() {
                 try {
-                    const { stdout } = await this.spawnCommand('npm', ['list', 'generator-jhipster'], { stdio: 'pipe' });
+                    const { stdout } = await this.spawnCommand('npm list generator-jhipster', { stdio: 'pipe' });
                     console.log(`\n\`\`\`\n${stdout}\`\`\`\n`);
                 }
                 catch (error) {
@@ -43,14 +51,25 @@ export default class InfoGenerator extends BaseApplicationGenerator {
             },
             displayConfiguration() {
                 // Omit sensitive information.
-                const result = JSON.stringify({ ...this.jhipsterConfig, jwtSecretKey: undefined, rememberMeKey: undefined }, null, 2);
-                console.log('\n##### **JHipster configuration, a `.yo-rc.json` file generated in the root folder**\n');
-                console.log(`\n<details>\n<summary>.yo-rc.json file</summary>\n<pre>\n${result}\n</pre>\n</details>\n`);
+                const yoRc = this.readDestinationJSON(YO_RC_FILE);
+                if (yoRc) {
+                    const result = JSON.stringify(replaceSensitiveConfig(yoRc), null, 2);
+                    console.log(`\n##### **JHipster configuration, a \`${YO_RC_FILE}\` file generated in the root folder**\n`);
+                    console.log(`\n<details>\n<summary>${YO_RC_FILE} file</summary>\n<pre>\n${result}\n</pre>\n</details>\n`);
+                }
+                else {
+                    console.log('\n##### **JHipster configuration not found**\n');
+                }
                 if (this.jhipsterConfig.packages && this.jhipsterConfig.packages.length > 0) {
                     for (const pkg of this.jhipsterConfig.packages) {
-                        const yoRc = this.readDestinationJSON(`${pkg}/.yo-rc.json`);
-                        const result = JSON.stringify({ ...yoRc['generator-jhipster'], jwtSecretKey: undefined, rememberMeKey: undefined }, null, 2);
-                        console.log(`\n<details>\n<summary>.yo-rc.json file for ${pkg}</summary>\n<pre>\n${result}\n</pre>\n</details>\n`);
+                        const yoRc = this.readDestinationJSON(this.destinationPath(pkg, YO_RC_FILE));
+                        if (yoRc) {
+                            const result = JSON.stringify(replaceSensitiveConfig(yoRc), null, 2);
+                            console.log(`\n<details>\n<summary>${YO_RC_FILE} file for ${pkg}</summary>\n<pre>\n${result}\n</pre>\n</details>\n`);
+                        }
+                        else {
+                            console.log(`\n##### **JHipster configuration for ${pkg} not found**\n`);
+                        }
                     }
                 }
             },

package/dist/generators/info/support/index.mjs

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2023 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 * from './utils.mjs';

package/dist/generators/info/support/utils.mjs

@@ -0,0 +1,23 @@
+/**
+ * Copyright 2013-2023 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.
+ */
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+export const replaceSensitiveConfig = (yoRc) => ({
+    ...yoRc,
+    [GENERATOR_JHIPSTER]: { ...yoRc[GENERATOR_JHIPSTER], jwtSecretKey: undefined, rememberMeKey: undefined },
+});

package/dist/generators/init/constants.mjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const NODE_VERSION = '14.18.1';
 export const SKIP_COMMIT_HOOK = 'skipCommitHook';
 export const SKIP_COMMIT_HOOK_DESCRIPTION = 'Skip adding husky commit hooks';
 export const SKIP_COMMIT_HOOK_DEFAULT_VALUE = false;

package/dist/generators/init/generator.mjs

@@ -19,9 +19,10 @@
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_INIT, GENERATOR_GIT, GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
 import { defaultConfig } from './config.mjs';
-import { NODE_VERSION, SKIP_COMMIT_HOOK } from './constants.mjs';
+import { SKIP_COMMIT_HOOK } from './constants.mjs';
 import { files, commitHooksFiles } from './files.mjs';
 import command from './command.mjs';
+import { packageJson } from '../../lib/index.mjs';
 /**
  * @class
  * @extends {BaseApplicationGenerator<import('../base-application/types.mjs').BaseApplication>}
@@ -47,7 +48,7 @@ export default class InitGenerator extends BaseApplicationGenerator {
         return this.asLoadingTaskGroup({
             loadConfig({ application }) {
                 const config = { ...defaultConfig, ...this.config.getAll() };
-                application.nodeVersion = NODE_VERSION;
+                application.applicationNodeEngine = packageJson.engines.node;
                 application[SKIP_COMMIT_HOOK] = config[SKIP_COMMIT_HOOK];
             },
             loadNodeDependencies({ application }) {

package/dist/generators/init/templates/package.json.ejs

@@ -32,10 +32,10 @@
     "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>"
   },
   "engines": {
-    "node": ">=<%= nodeVersion %>"
+    "node": "<%= applicationNodeEngine %>"
   },
   "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",
-    "prettier:format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\""
+    "prettier-check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",
+    "prettier-format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\""
   }
 }

package/dist/generators/java/cleanup.mjs

@@ -1,5 +1,23 @@
+/**
+ * Copyright 2013-2023 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.
+ */
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
-export default function cleanupTask({ application }) { }
+export default function cleanupTask() { }

package/dist/generators/java/support/files.mjs

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { SERVER_TEST_SRC_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../../generator-constants.mjs';
 export const replaceFilePathVariables = (data, filePath) => filePath?.replace(/_package_/, data.packageName)?.replace(/_\w*/, '');
 export const replaceEntityFilePathVariables = (data, filePath) => {
     filePath = filePath
@@ -39,3 +40,35 @@ export const moveToJavaEntityPackageSrcDir = (data, filePath) => `${data.srcMain
 export const moveToJavaEntityPackageTestDir = (data, filePath) => `${data.srcTestJava}${data.entityAbsoluteFolder}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 export const moveToSrcMainResourcesDir = (data, filePath) => `${data.srcMainResources}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 export const moveToSrcTestResourcesDir = (data, filePath) => `${data.srcTestResources}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
+export const javaMainPackageTemplatesBlock = (relativePath = '') => {
+    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+    return {
+        path: `${SERVER_MAIN_SRC_DIR}_package_/${relativePath}`,
+        renameTo: (data, filePath) => `${data.javaPackageSrcDir}${relativePath}${data.entityJavaPackageFolder ?? ''}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
+        ...(typeof relativePath === 'object' ? relativePath : undefined),
+    };
+};
+export const javaMainResourceTemplatesBlock = (relativePath = '') => {
+    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+    return {
+        path: `${SERVER_MAIN_RES_DIR}${relativePath}`,
+        renameTo: (data, filePath) => `${data.srcMainResources}${relativePath}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
+        ...(typeof relativePath === 'object' ? relativePath : undefined),
+    };
+};
+export const javaTestResourceTemplatesBlock = (relativePath = '') => {
+    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+    return {
+        path: `${SERVER_TEST_RES_DIR}${relativePath}`,
+        renameTo: (data, filePath) => `${data.srcTestResources}${relativePath}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
+        ...(typeof relativePath === 'object' ? relativePath : undefined),
+    };
+};
+export const javaTestPackageTemplatesBlock = (relativePath = '') => {
+    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+    return {
+        path: `${SERVER_TEST_SRC_DIR}_package_/${relativePath}`,
+        renameTo: (data, filePath) => `${data.javaPackageTestDir}${relativePath}${data.entityJavaPackageFolder ?? ''}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
+        ...(typeof relativePath === 'object' ? relativePath : undefined),
+    };
+};

package/dist/generators/java/support/index.mjs

@@ -21,3 +21,4 @@ export * from './checks/index.mjs';
 export * from './files.mjs';
 export { default as generatedAnnotationTransform } from './generated-annotation-transform.mjs';
 export { default as packageInfoTransform } from './package-info-transform.mjs';
+export * from './util.mjs';

package/dist/generators/java/support/util.mjs

@@ -0,0 +1,11 @@
+import _ from 'lodash';
+import { getMicroserviceAppName } from '../../base/support/index.mjs';
+const { upperFirst } = _;
+/**
+ * get the java main class name.
+ */
+export const getMainClassName = ({ baseName }) => {
+    const main = upperFirst(getMicroserviceAppName({ microserviceName: baseName }));
+    const acceptableForJava = new RegExp('^[A-Z][a-zA-Z0-9_]*$');
+    return acceptableForJava.test(main) ? main : 'Application';
+};

package/dist/generators/jdl/command.mjs

@@ -41,16 +41,6 @@ const command = {
             type: Boolean,
             scope: 'generator',
         },
-        unidirectionalRelationships: {
-            description: 'Generate unidirectional relationships',
-            type: Boolean,
-            scope: 'generator',
-        },
-        forceNoFiltering: {
-            description: "Don't filter jdl entities",
-            type: Boolean,
-            scope: 'generator',
-        },
     },
     import: [GENERATOR_APP, GENERATOR_WORKSPACES],
 };