generator-jhipster 8.6.0 → 8.7.0

package/dist/generators/base-application/support/update-application-entities-transform.js

@@ -1,8 +1,8 @@
 import { readdir } from 'fs/promises';
+import { basename, join } from 'path';
 import { loadFile } from 'mem-fs';
 import { Minimatch } from 'minimatch';
 import { transform } from 'p-transform';
-import { basename, join } from 'path';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
 export const updateApplicationEntitiesTransform = ({ destinationPath, throwOnMissingConfig = true, }) => {
     let yoRcFileInMemory;

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

@@ -16,29 +16,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { basename, join as joinPath, dirname, relative, isAbsolute, join, extname } from 'path';
+import { basename, dirname, extname, isAbsolute, join, join as joinPath, relative } from 'path';
 import { relative as posixRelative } from 'path/posix';
 import { createHash } from 'crypto';
 import { fileURLToPath } from 'url';
-import { statSync, rmSync, existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, rmSync, statSync } from 'fs';
 import assert from 'assert';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import { kebabCase, snakeCase, merge, get, set, defaults, mergeWith } from 'lodash-es';
+import { defaults, get, kebabCase, merge, mergeWith, set, snakeCase } from 'lodash-es';
 import { simpleGit } from 'simple-git';
 import semver, { lt as semverLessThan } from 'semver';
 import YeomanGenerator from 'yeoman-generator';
 import latestVersion from 'latest-version';
 import SharedData from '../base/shared-data.js';
-import { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX } from '../base/priorities.js';
+import { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX, QUEUES } from '../base/priorities.js';
 import { createJHipster7Context, formatDateForChangelog, joinCallbacks, removeFieldsWithNullishValues, } from '../base/support/index.js';
 import { packageJson } from '../../lib/index.js';
 import { GENERATOR_BOOTSTRAP } from '../generator-list.js';
 import NeedleApi from '../needle-api.js';
 import command from '../base/command.js';
 import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
-import { convertConfigToOption } from '../../lib/internal/index.js';
+import { convertConfigToOption, loadConfig } from '../../lib/internal/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
 import { dockerPlaceholderGenerator } from '../docker/utils.js';
 import { getConfigWithDefaults } from '../../jdl/index.js';
@@ -136,6 +136,11 @@ export default class CoreGenerator extends YeomanGenerator {
         // Add base template folder.
         this.jhipsterTemplatesFolders = [this.templatePath()];
         this.jhipster7Migration = this.features.jhipster7Migration ?? false;
+        if (this.features.queueCommandTasks === true) {
+            this.on('before:queueOwnTasks', () => {
+                this.queueCurrentJHipsterCommandTasks();
+            });
+        }
     }
     /**
      * Override yeoman generator's usage function to fine tune --help message.
@@ -224,6 +229,12 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         }
         return [{ control }];
     }
+    /**
+     * Check if the generator should ask for prompts.
+     */
+    shouldAskForPrompts({ control }) {
+        return !control.existingProject || this.options.askAnswered === true;
+    }
     /**
      * Override yeoman-generator method that gets methods to be queued, filtering the result.
      */
@@ -231,11 +242,97 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         let priorities = super.getTaskNames();
         if (!this.features.disableSkipPriorities && this.options.skipPriorities) {
             // Make sure yeoman-generator will not throw on empty tasks due to filtered priorities.
-            this.customLifecycle = priorities.length > 0;
+            this.customLifecycle = this.customLifecycle || priorities.length > 0;
             priorities = priorities.filter(priorityName => !this.options.skipPriorities.includes(priorityName));
         }
         return priorities;
     }
+    queueCurrentJHipsterCommandTasks() {
+        this.queueTask({
+            queueName: QUEUES.INITIALIZING_QUEUE,
+            taskName: 'parseCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    await this.getCurrentJHipsterCommand();
+                }
+                catch {
+                    return;
+                }
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.PROMPTING_QUEUE,
+            taskName: 'promptCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    const command = await this.getCurrentJHipsterCommand();
+                    if (!command.configs)
+                        return;
+                }
+                catch {
+                    return;
+                }
+                const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.INITIALIZING);
+                const [{ control }] = taskArgs;
+                if (!control)
+                    throw new Error(`Control object not found in ${this.options.namespace}`);
+                if (!this.shouldAskForPrompts({ control }))
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.CONFIGURING_QUEUE,
+            taskName: 'configureCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    const command = await this.getCurrentJHipsterCommand();
+                    if (!command.configs)
+                        return;
+                }
+                catch {
+                    return;
+                }
+                await this.configureCurrentJHipsterCommandConfig();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.COMPOSING_QUEUE,
+            taskName: 'composeCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    await this.getCurrentJHipsterCommand();
+                }
+                catch {
+                    return;
+                }
+                await this.composeCurrentJHipsterCommand();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.LOADING_QUEUE,
+            taskName: 'loadCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    const command = await this.getCurrentJHipsterCommand();
+                    if (!command.configs)
+                        return;
+                }
+                catch {
+                    return;
+                }
+                const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.LOADING);
+                const [{ application }] = taskArgs;
+                await this.loadCurrentJHipsterCommandConfig(application ?? this);
+            },
+        });
+    }
     /**
      * Get the current Command Definition for the generator.
      * `generatorCommand` takes precedence.
@@ -292,18 +389,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         if (!generatorCommand.configs) {
             throw new Error(`Configs not found for generator ${this.options.namespace}`);
         }
-        const config = this.jhipsterConfigWithDefaults;
-        Object.entries(generatorCommand.configs).forEach(([name, def]) => {
-            if (def.scope === 'storage') {
-                context[name] = context[name] ?? config?.[name] ?? this.config.get(name) ?? def.default;
-            }
-            if (def.scope === 'generator') {
-                this[name] = this[name] ?? this.options[name] ?? def.default;
-            }
-            if (def.scope === 'blueprint') {
-                context[name] = context[name] ?? this.blueprintStorage?.get(name) ?? def.default;
-            }
-        });
+        loadConfig.call(this, generatorCommand.configs, { application: context });
     }
     /**
      * @experimental
@@ -384,7 +470,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 let argument;
                 if (hasPositionalArguments || argumentDef.type !== Array) {
                     // Positional arguments already parsed or a single argument.
-                    argument = positionalArguments.shift();
+                    argument = Array.isArray(positionalArguments) ? positionalArguments.shift() : positionalArguments;
                 }
                 else {
                     // Varags argument.
@@ -502,7 +588,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         try {
             existingGenerator = this._jhipsterGenerator ?? requireNamespace(this.options.namespace).generator;
         }
-        catch (error) {
+        catch {
             if (this.options.namespace) {
                 const split = this.options.namespace.split(':', 2);
                 existingGenerator = split.length === 1 ? split[0] : split[1];
@@ -593,7 +679,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 rmSync(destinationFolder, { recursive: true });
             }
         }
-        catch (error) {
+        catch {
             this.log.log(`Could not remove folder ${destinationFolder}`);
         }
     }
@@ -617,7 +703,6 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      */
     writeFile(source, destination, data = this, options, copyOptions = {}) {
         // Convert to any because ejs types doesn't support string[] https://github.com/DefinitelyTyped/DefinitelyTyped/pull/63315
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const root = this.jhipsterTemplatesFolders ?? this.templatePath();
         try {
             return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions });
@@ -713,9 +798,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     }
                 }
                 sourceFileFrom = existingTemplates.shift();
-                if (sourceFileFrom === undefined) {
-                    throw new Error(`Template file ${sourceFile} was not found at ${rootTemplatesAbsolutePath}`);
-                }
             }
             else if (typeof rootTemplatesAbsolutePath === 'string') {
                 sourceFileFrom = this.templatePath(rootTemplatesAbsolutePath, sourceFile);
@@ -723,7 +805,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             else {
                 sourceFileFrom = this.templatePath(sourceFile);
             }
-            const file = customizeTemplatePath({ sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile });
+            const file = customizeTemplatePath.call(this, { sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile });
             if (!file) {
                 return undefined;
             }
@@ -731,13 +813,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             targetFile = file.destinationFile;
             let templatesRoots = [].concat(rootTemplatesAbsolutePath);
             for (const contextCustomizeTemplatePath of contextCustomizeTemplatePaths) {
-                const file = contextCustomizeTemplatePath({
+                const file = contextCustomizeTemplatePath.call(this, {
                     namespace: this.options.namespace,
                     sourceFile,
                     resolvedSourceFile: sourceFileFrom,
                     destinationFile: targetFile,
                     templatesRoots,
-                });
+                }, context);
                 if (!file) {
                     return undefined;
                 }
@@ -745,6 +827,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 targetFile = file.destinationFile;
                 templatesRoots = file.templatesRoots;
             }
+            if (sourceFileFrom === undefined) {
+                throw new Error(`Template file ${sourceFile} was not found at ${rootTemplatesAbsolutePath}`);
+            }
             try {
                 if (!appendEjs && extname(sourceFileFrom) !== '.ejs') {
                     await this.copyTemplateAsync(sourceFileFrom, targetFile);
@@ -866,7 +951,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     }
                     const normalizedFile = resolveCallback(sourceFile || file);
                     sourceFile = join(blockPath, normalizedFile);
-                    destinationFile = this.destinationPath(blockTo, join(resolveCallback(destinationFile || renameTo, normalizedFile)));
+                    destinationFile = join(resolveCallback(destinationFile || renameTo, normalizedFile));
+                    if (blockRenameTo) {
+                        destinationFile = this.destinationPath(blockRenameTo.call(this, context, destinationFile, this));
+                    }
+                    else {
+                        destinationFile = this.destinationPath(blockTo, destinationFile);
+                    }
                     const override = resolveCallback(fileSpec.override);
                     if (override !== undefined && !override && this.fs.exists(destinationFile)) {
                         this.log.debug(`skipping file ${destinationFile}`);
@@ -924,7 +1015,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         try {
             originalContent = this.readDestination(filePath);
         }
-        catch (_error) {
+        catch {
             // null return should be treated like an error.
         }
         if (!originalContent) {

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,cjs,mjs' }), 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,28 +1,16 @@
 import eslint from 'eslint';
-import { baseRules } from '../../../lib/eslint/base.js';
+import ts from 'typescript-eslint';
+import jhipster from '../../../lib/eslint/index.js';
 let eslintInstance;
-/* Flat config based eslint
-Blocked by https://github.com/import-js/eslint-plugin-import/issues/2556
-import eslint from 'eslint/use-at-your-own-risk';
-const { languageOptions, plugins: tseslintPlugins } = tseslint.configs.base;
-new eslint.FlatESLint({ fix: true, overrideConfigFile: true, cwd, plugins, baseConfig: { languageOptions, rules } });
-*/
-export default async ({ resolvePluginsRelativeTo, filePath, fileContents }) => {
-    if (!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: baseRules,
-            },
+            overrideConfigFile: true,
+            allowInlineConfig: false,
+            cache: false,
+            cwd,
+            baseConfig: ts.config({ files: [`**/*.{${extensions}}`] }, ts.configs.base, ...additionalConfig, config ? JSON.parse(config) : jhipster.base),
         });
     }
     if (await eslintInstance.isPathIgnored(filePath)) {

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/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.backendTypeJavaAny,
-                    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) {