generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/base-workspaces/generator.js

@@ -20,11 +20,11 @@ import { readdir } from 'fs/promises';
 import { existsSync } from 'fs';
 import chalk from 'chalk';
 import BaseGenerator from '../base/index.js';
-import { PRIORITY_NAMES, CUSTOM_PRIORITIES } from './priorities.js';
 import { YO_RC_FILE } from '../generator-constants.js';
 import { GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
-import command from './command.js';
 import { normalizePathEnd } from '../base/support/path.js';
+import command from './command.js';
+import { CUSTOM_PRIORITIES, PRIORITY_NAMES } from './priorities.js';
 const { PROMPTING_WORKSPACES, CONFIGURING_WORKSPACES, LOADING_WORKSPACES, PREPARING_WORKSPACES, DEFAULT, WRITING, POST_WRITING, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
 /**
  * This is the base class for a generator that generates entities.

package/dist/generators/base-workspaces/internal/deployments.js

@@ -18,7 +18,7 @@
  */
 import { defaults } from 'lodash-es';
 import { applicationOptions, deploymentOptions } from '../../../jdl/index.js';
-import { loadDerivedPlatformConfig, loadPlatformConfig, loadDerivedServerAndPlatformProperties } from '../../server/support/index.js';
+import { loadDerivedPlatformConfig, loadDerivedServerAndPlatformProperties, loadPlatformConfig } from '../../server/support/index.js';
 const { OptionNames } = applicationOptions;
 const { Options: DeploymentOptions } = deploymentOptions;
 const { JWT_SECRET_KEY } = OptionNames;

package/dist/generators/base-workspaces/internal/docker-prompts.js

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import chalk from 'chalk';
 import { readFileSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
-import { loadConfigs } from './docker-base.js';
+import chalk from 'chalk';
 import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../../jdl/jhipster/index.js';
 import { convertSecretToBase64 } from '../../base/support/index.js';
+import { loadConfigs } from './docker-base.js';
 const { MICROSERVICE, MONOLITH, GATEWAY } = applicationTypes;
 const { PROMETHEUS } = monitoringTypes;
 const monitoring = monitoringTypes;

package/dist/generators/base-workspaces/priorities.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QUEUE_PREFIX, PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE } from '../base/priorities.js';
+import { PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE, QUEUE_PREFIX } from '../base/priorities.js';
 const { DEFAULT } = PRIORITY_NAMES_BASE;
 /** Custom priorities */
 const PROMPTING_WORKSPACES = 'promptingWorkspaces';

package/dist/generators/bootstrap/generator.js

@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 import { Duplex } from 'stream';
-import { forceYoFiles, createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter';
-import { isFileStateModified, isFilePending } from 'mem-fs-editor/state';
+import { createConflicterTransform, createYoResolveTransform, forceYoFiles } from '@yeoman/conflicter';
+import { isFilePending, isFileStateModified } from 'mem-fs-editor/state';
 import { createCommitTransform } from 'mem-fs-editor/transform';
 import BaseGenerator from '../base/index.js';
-import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFilePath, createSortConfigFilesTransform, createESLintTransform, createRemoveUnusedImportsTransform, } from './support/index.js';
 import { PRETTIER_EXTENSIONS } from '../generator-constants.js';
 import { GENERATOR_UPGRADE } from '../generator-list.js';
 import { PRIORITY_NAMES, QUEUES } from '../base-application/priorities.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
+import { autoCrlfTransform, createESLintTransform, createForceWriteConfigFilesTransform, createMultiStepTransform, createPrettierTransform, createRemoveUnusedImportsTransform, createSortConfigFilesTransform, isPrettierConfigFilePath, } from './support/index.js';
 const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES;
 const { MULTISTEP_TRANSFORM_QUEUE, PRE_CONFLICTS_QUEUE } = QUEUES;
 const MULTISTEP_TRANSFORM_PRIORITY = BaseGenerator.asPriority(MULTISTEP_TRANSFORM);
@@ -55,9 +55,6 @@ export default class BootstrapGenerator extends BaseGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             validateBlueprint() {
                 if (this.jhipsterConfig.blueprints && !this.skipChecks) {
                     this.jhipsterConfig.blueprints.forEach(blueprint => {
@@ -157,7 +154,7 @@ export default class BootstrapGenerator extends BaseGenerator {
         const prettierTransforms = [];
         if (!this.skipPrettier) {
             const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand;
-            prettierTransforms.push(createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js' }), createRemoveUnusedImportsTransform.call(this, { ignoreErrors }), await createPrettierTransform.call(this, {
+            prettierTransforms.push(createESLintTransform.call(this, { ignoreErrors }), createRemoveUnusedImportsTransform.call(this, { ignoreErrors }), await createPrettierTransform.call(this, {
                 ignoreErrors,
                 prettierPackageJson: true,
                 prettierJava: !this.jhipsterConfig.skipServer,

package/dist/generators/bootstrap/support/eslint-transform.js

@@ -20,26 +20,34 @@ import { passthrough } from 'p-transform';
 import { isFileStateModified } from 'mem-fs-editor/state';
 import { Minimatch } from 'minimatch';
 import { Piscina } from 'piscina';
-import { getPackageRoot } from '../../../lib/index.js';
-import { JS_PRETTIER_EXTENSIONS } from '../../generator-constants.js';
 import { addLineNumbers } from '../internal/transform-utils.js';
-// eslint-disable-next-line import/prefer-default-export
+export class ESLintPool extends Piscina {
+    constructor(options) {
+        super({
+            maxThreads: 1,
+            filename: new URL('./eslint-worker.js', import.meta.url).href,
+            ...options,
+        });
+    }
+    apply(data) {
+        return this.run(data);
+    }
+}
 export const createESLintTransform = function (transformOptions = {}) {
-    const { extensions = JS_PRETTIER_EXTENSIONS, ignoreErrors } = transformOptions;
+    const { extensions = 'js,cjs,mjs,ts,cts,mts,jsx,tsx', ignoreErrors, cwd, poolOptions, recreateEslint } = transformOptions;
     const minimatch = new Minimatch(`**/*.{${extensions}}`, { dot: true });
-    const pool = new Piscina({
-        maxThreads: 1,
-        filename: new URL('./eslint-worker.js', import.meta.url).href,
-    });
+    const pool = new ESLintPool(poolOptions);
     return passthrough(async (file) => {
         if (!minimatch.match(file.path) || !isFileStateModified(file)) {
             return;
         }
         const fileContents = file.contents.toString();
-        const { result, error } = await pool.run({
-            resolvePluginsRelativeTo: getPackageRoot(),
+        const { result, error } = await pool.apply({
+            cwd,
             filePath: file.path,
             fileContents,
+            extensions,
+            recreateEslint,
         });
         if (result) {
             file.contents = Buffer.from(result);

package/dist/generators/bootstrap/support/eslint-worker.js

@@ -1,33 +1,23 @@
-import ESLint from 'eslint';
-let eslint;
-export default async ({ resolvePluginsRelativeTo, filePath, fileContents }) => {
-    if (!eslint) {
-        eslint = new ESLint.ESLint({
+import eslint from 'eslint';
+import ts from 'typescript-eslint';
+import jhipster from '../../../lib/eslint/index.js';
+let eslintInstance;
+export default async ({ cwd, filePath, fileContents, extensions, config, additionalConfig = [], recreateEslint }) => {
+    if (recreateEslint || !eslintInstance) {
+        eslintInstance = new eslint.ESLint({
             fix: true,
-            // Disable destination configs. We should apply plugins and rules which jhipster depends on.
-            useEslintrc: false,
-            resolvePluginsRelativeTo,
-            overrideConfig: {
-                plugins: ['unused-imports', 'import'],
-                extends: ['plugin:@typescript-eslint/base'],
-                parserOptions: {
-                    sourceType: 'module',
-                    ecmaVersion: 'latest',
-                },
-                rules: {
-                    'import/order': 'error',
-                    'import/no-duplicates': 'error',
-                    'unused-imports/no-unused-imports': 'error',
-                    'unused-imports/no-unused-vars': ['warn', { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' }],
-                },
-            },
+            overrideConfigFile: true,
+            allowInlineConfig: false,
+            cache: false,
+            cwd,
+            baseConfig: ts.config({ files: [`**/*.{${extensions}}`] }, ts.configs.base, ...additionalConfig, config ? JSON.parse(config) : jhipster.base),
         });
     }
-    if (await eslint.isPathIgnored(filePath)) {
+    if (await eslintInstance.isPathIgnored(filePath)) {
         return { result: fileContents };
     }
     try {
-        const [result] = await eslint.lintText(fileContents, { filePath });
+        const [result] = await eslintInstance.lintText(fileContents, { filePath });
         return { result: result.output ?? fileContents };
     }
     catch (error) {

package/dist/generators/bootstrap/support/java-unused-imports-transform.js

@@ -3,7 +3,6 @@ import { passthrough } from 'p-transform';
 import { isFileStateModified } from 'mem-fs-editor/state';
 import { Piscina } from 'piscina';
 import { addLineNumbers } from '../internal/transform-utils.js';
-// eslint-disable-next-line import/prefer-default-export
 export const createRemoveUnusedImportsTransform = function (options = {}) {
     const { ignoreErrors } = options;
     const pool = new Piscina({

package/dist/generators/bootstrap/support/multi-step-transform/index.js

@@ -18,7 +18,6 @@
  */
 import { transform } from 'p-transform';
 import TemplateFileFs from './template-file-fs.js';
-// eslint-disable-next-line import/prefer-default-export
 export const createMultiStepTransform = () => {
     const templateFileFs = new TemplateFileFs({});
     const templateFiles = [];

package/dist/generators/bootstrap/support/multi-step-transform/template-file.js

@@ -36,7 +36,12 @@ export default class TemplateFile {
             this._debug('======');
             this._debug(contents);
         }
-        this._compiled = ejs.compile(contents, options);
+        try {
+            this._compiled = ejs.compile(contents, options);
+        }
+        catch (error) {
+            throw new Error(`Error compiling ${this._filename}, with contents:\n${contents}`, { cause: error });
+        }
     }
     addFragment(templateFile) {
         assert(templateFile, 'templateFile is required');

package/dist/generators/bootstrap/support/prettier-support.js

@@ -23,12 +23,21 @@ import { Piscina } from 'piscina';
 const minimatch = new Minimatch('**/{.prettierrc**,.prettierignore}');
 export const isPrettierConfigFilePath = (filePath) => minimatch.match(filePath);
 export const isPrettierConfigFile = (file) => isPrettierConfigFilePath(file.path);
+export class PrettierPool extends Piscina {
+    constructor(options = {}) {
+        super({
+            maxThreads: 1,
+            filename: new URL('./prettier-worker.js', import.meta.url).href,
+            ...options,
+        });
+    }
+    apply(data) {
+        return this.run(data);
+    }
+}
 export const createPrettierTransform = async function (options = {}) {
-    const pool = new Piscina({
-        maxThreads: 1,
-        filename: new URL('./prettier-worker.js', import.meta.url).href,
-    });
-    const { ignoreErrors = false, extensions = '*', prettierPackageJson, prettierJava, prettierProperties, prettierOptions } = options;
+    const pool = new PrettierPool();
+    const { ignoreErrors = false, extensions = '*', ...workerOptions } = options;
     const globExpression = extensions.includes(',') ? `**/*.{${extensions}}` : `**/*.${extensions}`;
     const minimatch = new Minimatch(globExpression, { dot: true });
     return passthrough(async (file) => {
@@ -38,15 +47,11 @@ export const createPrettierTransform = async function (options = {}) {
         if (!file.contents) {
             throw new Error(`File content doesn't exist for ${file.relative}`);
         }
-        const { result, errorMessage } = await pool.run({
+        const { result, errorMessage } = await pool.apply({
             relativeFilePath: file.relative,
             filePath: file.path,
             fileContents: file.contents.toString('utf8'),
-            prettierOptions,
-            prettierPackageJson,
-            prettierJava,
-            prettierProperties,
-            ignoreErrors,
+            ...workerOptions,
         });
         if (result) {
             file.contents = Buffer.from(result);

package/dist/generators/bootstrap/support/prettier-worker.js

@@ -1,11 +1,11 @@
-import prettier from 'prettier';
+import { format, resolveConfig } from 'prettier';
 import prettierPluginJava from 'prettier-plugin-java';
 import prettierPluginProperties from 'prettier-plugin-properties';
 import prettierPluginPackagejson from 'prettier-plugin-packagejson';
 import { addLineNumbers } from '../internal/transform-utils.js';
 export default async ({ relativeFilePath, filePath, fileContents, prettierOptions, prettierPackageJson, prettierJava, prettierProperties, }) => {
     try {
-        const resolvedDestinationFileOptions = await prettier.resolveConfig(relativeFilePath);
+        const resolvedDestinationFileOptions = await resolveConfig(relativeFilePath);
         const fileOptions = {
             // Config from disk
             ...resolvedDestinationFileOptions,
@@ -23,7 +23,7 @@ export default async ({ relativeFilePath, filePath, fileContents, prettierOption
         if (prettierProperties) {
             fileOptions.plugins.push(prettierPluginProperties);
         }
-        return { result: await prettier.format(fileContents, fileOptions) };
+        return { result: await format(fileContents, fileOptions) };
     }
     catch (error) {
         let errorMessage;

package/dist/generators/bootstrap-application/generator.js

@@ -19,7 +19,7 @@
 import assert from 'assert';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { validations } from '../../jdl/jhipster/index.js';
-import { stringifyApplicationData, derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, } from '../base-application/support/index.js';
+import { derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, stringifyApplicationData, } from '../base-application/support/index.js';
 import { preparePostEntityServerDerivedProperties } from '../server/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL } from '../generator-constants.js';
@@ -48,8 +48,7 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
                     application.skipUserManagement = true;
                 }
                 applicationDefaults({
-                    useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeSpringBoot,
-                    documentationArchiveUrl: ({ jhipsterVersion }) => `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`,
+                    gatewayServicesApiAvailable: undefined,
                 });
                 let prettierExtensions = 'md,json,yml,html';
                 if (application.clientFrameworkAny) {
@@ -61,7 +60,12 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
                 if (!application.skipServer) {
                     prettierExtensions = `${prettierExtensions},java`;
                 }
-                application.prettierExtensions = prettierExtensions;
+                applicationDefaults({
+                    // TODO remove prettierExtensions, moved to prettier generator
+                    prettierExtensions,
+                    useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeJavaAny,
+                    documentationArchiveUrl: ({ jhipsterVersion }) => `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`,
+                });
             },
         });
     }
@@ -98,12 +102,6 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
     get [BaseApplicationGenerator.CONFIGURING_EACH_ENTITY]() {
         return this.configuringEachEntity;
     }
-    get preparingEachEntityRelationship() {
-        return this.asPreparingEachEntityRelationshipTaskGroup({});
-    }
-    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_RELATIONSHIP]() {
-        return this.preparingEachEntityRelationship;
-    }
     get postPreparingEachEntity() {
         return this.asPostPreparingEachEntityTaskGroup({
             processEntityPrimaryKeysDerivedProperties({ entity }) {

package/dist/generators/bootstrap-application-base/generator.js

@@ -23,15 +23,14 @@ import chalk from 'chalk';
 import { passthrough } from '@yeoman/transform';
 import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { addFakerToEntity, loadEntitiesAnnotations, loadEntitiesOtherSide, stringifyApplicationData, prepareEntity as prepareEntityForTemplates, prepareField as prepareFieldForTemplates, prepareRelationship, } from '../base-application/support/index.js';
-import { createAuthorityEntity, createUserEntity, createUserManagementEntity } from './utils.js';
+import { addFakerToEntity, loadEntitiesAnnotations, loadEntitiesOtherSide, prepareEntity as prepareEntityForTemplates, prepareField as prepareFieldForTemplates, prepareRelationship, stringifyApplicationData, } from '../base-application/support/index.js';
 import { JAVA_DOCKER_DIR } from '../generator-constants.js';
 import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.js';
 import { packageJson } from '../../lib/index.js';
 import { loadLanguagesConfig } from '../languages/support/index.js';
 import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.js';
+import { createAuthorityEntity, createUserEntity, createUserManagementEntity } from './utils.js';
 import { exportJDLTransform, importJDLTransform } from './support/index.js';
-import command from './command.js';
 const isWin32 = os.platform() === 'win32';
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     constructor(args, options, features) {
@@ -56,9 +55,6 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
             displayLogo() {
                 this.printDestinationInfo();
             },
-            parseOptions() {
-                this.parseJHipsterCommand(command);
-            },
             async jdlStore() {
                 if (this.jhipsterConfig.jdlStore) {
                     this.logger.warn('Storing configuration inside a JDL file is experimental');
@@ -316,6 +312,9 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     }
     get postPreparingEachEntity() {
         return this.asPostPreparingEachEntityTaskGroup({
+            hasRequiredRelationship({ entity }) {
+                entity.anyRelationshipIsRequired = entity.relationships.some(rel => rel.relationshipRequired || rel.id);
+            },
             checkForCircularRelationships({ entity }) {
                 const detectCyclicRequiredRelationship = (entity, relatedEntities) => {
                     if (relatedEntities.has(entity))

package/dist/generators/bootstrap-application-base/utils.js

@@ -65,7 +65,6 @@ export const auditableEntityFields = () => [
     },
 ];
 const authorityEntityName = 'Authority';
-// eslint-disable-next-line import/prefer-default-export
 export function createUserEntity(customUserData = {}, application) {
     const userEntityDefinition = this.getEntityConfig('User')?.getAll();
     if (userEntityDefinition) {

package/dist/generators/bootstrap-application-client/generator.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.js';
+import { filterEntitiesAndPropertiesForClient, filterEntitiesForClient, loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';
@@ -61,6 +61,10 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     }
     get postPreparingEachEntity() {
         return this.asPostPreparingEachEntityTaskGroup({
+            control({ control }) {
+                control.filterEntitiesAndPropertiesForClient = filterEntitiesAndPropertiesForClient;
+                control.filterEntitiesForClient = filterEntitiesForClient;
+            },
             postPreparingEntity({ entity }) {
                 preparePostEntityClientDerivedProperties(entity);
             },

package/dist/generators/bootstrap-application-server/generator.js

@@ -19,7 +19,7 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 import { JAVA_VERSION, MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, dockerContainers, } from '../generator-constants.js';
 import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.js';
-import { loadRequiredConfigDerivedProperties, prepareEntity as prepareEntityServerForTemplates, addEntitiesOtherRelationships, hibernateSnakeCase, loadServerConfig, loadDerivedServerConfig, prepareRelationship, } from '../server/support/index.js';
+import { addEntitiesOtherRelationships, hibernateSnakeCase, loadDerivedServerConfig, loadRequiredConfigDerivedProperties, loadServerConfig, prepareEntity as prepareEntityServerForTemplates, prepareRelationship, } from '../server/support/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/index.js';
 import { getPomVersionProperties } from '../maven/support/index.js';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.js';

package/dist/generators/ci-cd/command.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import { kebabCase, intersection } from 'lodash-es';
+import { intersection, kebabCase } from 'lodash-es';
 const includesValue = (prop, values) => answers => answers[prop] && intersection(answers[prop], values).length > 0;
 const command = {
     options: {},
@@ -168,7 +168,7 @@ const command = {
                 message: `${chalk.yellow('*Heroku*')}: name of your Heroku Application ?`,
             },
             scope: 'generator',
-            default: config => kebabCase(config.jhipsterConfigWithDefaults.baseName),
+            default: gen => kebabCase(gen.jhipsterConfigWithDefaults.baseName),
         },
     },
 };

package/dist/generators/ci-cd/generator.js

@@ -16,13 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
 import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createPomStorage } from '../maven/support/pom-store.js';
-import command from './command.js';
 import { loadConfig, loadDerivedConfig } from '../../lib/internal/config-def.js';
+import command from './command.js';
 const { REACT } = clientFrameworkTypes;
 export default class CiCdGenerator extends BaseApplicationGenerator {
     insideDocker;
@@ -40,26 +39,12 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
             sayHello() {
                 this.log.log(chalk.white('🚀 Welcome to the JHipster CI/CD Sub-Generator 🚀'));
             },
-            getConfig() {
-                this.parseJHipsterCommand(command);
-            },
         });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
     // Public API method used by the getter and also by Blueprints
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async prompting() {
-                await this.prompt(this.prepareQuestions(command.configs));
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    // Public API method used by the getter and also by Blueprints
     get loading() {
         return {
             loadSharedConfig({ application }) {
@@ -153,7 +138,7 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
             postWriting({ application }) {
                 if (application.ciCdIntegrations.includes('deploy')) {
                     if (application.buildToolMaven) {
-                        createPomStorage(this).addDistributionManagement({
+                        createPomStorage(this, { sortFile: false }).addDistributionManagement({
                             releasesId: application.artifactoryReleasesId,
                             releasesUrl: application.artifactoryReleasesUrl,
                             snapshotsId: application.artifactorySnapshotsId,
@@ -172,4 +157,7 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);
     }
+    shouldAskForPrompts() {
+        return true;
+    }
 }

package/dist/generators/ci-cd/index.js

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/ci-cd/templates/docker-registry.yml.ejs

@@ -17,7 +17,6 @@
  limitations under the License.
 -%>
 # Documentation at https://docs.docker.com/registry/deploying
-version: '2'
 services:
   registry:
     image: registry:2

package/dist/generators/ci-cd/templates/jenkins/jenkins.yml.ejs

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-version: '2'
 services:
   jenkins:
     image: <%- dockerContainers.jenkins %>

package/dist/generators/client/files-common.js

@@ -16,17 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientRootTemplatesBlock, clientSrcTemplatesBlock } from './support/files.js';
 import { clientFrameworkTypes } from '../../jdl/index.js';
+import { clientRootTemplatesBlock, clientSrcTemplatesBlock } from './support/files.js';
 const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
 export const files = {
     common: [
         {
             templates: ['README.md.jhi.client', '.prettierignore.jhi.client'],
         },
-        clientRootTemplatesBlock({
-            templates: ['.eslintignore'],
-        }),
         clientRootTemplatesBlock({
             condition: generator => generator.microfrontend && (generator.clientFrameworkVue || generator.clientFrameworkReact),
             templates: ['webpack/webpack.microfrontend.js.jhi'],

package/dist/generators/client/generator.js

@@ -17,20 +17,17 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { askForClientTheme, askForClientThemeVariant } from './prompts.js';
-import { writeFiles as writeCommonFiles } from './files-common.js';
-import { addEnumerationFiles } from './entity-files.js';
 import { LOGIN_REGEX_JS } from '../generator-constants.js';
-import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
-import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS } from '../generator-list.js';
+import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createNeedleCallback } from '../base/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
-import command from './command.js';
-import { filterEntitiesAndPropertiesForClient } from './support/index.js';
+import { addEnumerationFiles } from './entity-files.js';
+import { writeFiles as writeCommonFiles } from './files-common.js';
+import { askForClientTheme, askForClientThemeVariant } from './prompts.js';
 const { ANGULAR, VUE, REACT, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { CYPRESS } = testFrameworkTypes;
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
-    command = command;
     async beforeQueue() {
         loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
@@ -42,23 +39,8 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster(GENERATOR_COMMON);
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterCommand(this.command);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
     get prompting() {
         return this.asPromptingTaskGroup({
-            async prompting({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.prompt(this.prepareQuestions(this.command.configs));
-            },
             askForClientTheme,
             askForClientThemeVariant,
         });
@@ -189,11 +171,11 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
-            async writeEnumerationFiles({ application, entities }) {
+            async writeEnumerationFiles({ control, application, entities }) {
                 if (!application.webappEnumerationsDir || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
                     return;
                 }
-                for (const entity of filterEntitiesAndPropertiesForClient(entities)) {
+                for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities)) {
                     await addEnumerationFiles.call(this, { application, entity });
                 }
             },

package/dist/generators/client/generators/common/generator.js

@@ -27,38 +27,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             await this.dependsOnBootstrapApplication();
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async promptCommand({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.promptCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {