generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/README.md

@@ -20,20 +20,6 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
 
 **Thank you to our sponsors!**
 
-### Platinum Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://developer.okta.com/signup?utm_source=JHipster&utm_medium=logo&utm_campaign=Platinum-Sponsor" target="_blank">
-          <img width="425em" src="https://www.jhipster.tech/images/open-collective/okta.png">
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
 ### Gold Sponsors
 
 <table>

package/dist/cli/cli.mjs

@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import semver from 'semver';
-import { dirname, relative } from 'path';
+import { dirname, join, relative } from 'path';
 import { fileURLToPath } from 'url';
 import { existsSync } from 'fs';
+import semver from 'semver';
 import chalk from 'chalk';
 import { packageJson } from '../lib/index.mjs';
 import { runJHipster } from './program.mjs';
@@ -28,11 +28,17 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const currentNodeVersion = process.versions.node;
 const minimumNodeVersion = packageJson.engines.node;
-if (!process.argv.includes('--skip-checks') && !semver.satisfies(currentNodeVersion, minimumNodeVersion)) {
-    logger.fatal(`You are running Node version ${currentNodeVersion}\nJHipster requires Node version ${minimumNodeVersion}\nPlease update your version of Node.`);
+if (!process.argv.includes('--skip-checks')) {
+    if (!semver.satisfies(currentNodeVersion, minimumNodeVersion) &&
+        // Allow upgrade to be executed using node 16 due to https://github.com/jhipster/generator-jhipster/issues/20349
+        (!process.argv.includes('upgrade') || !semver.satisfies(currentNodeVersion, '^16.0.0'))) {
+        logger.fatal(`You are running Node version ${currentNodeVersion}\nJHipster requires Node version ${minimumNodeVersion}\nPlease update your version of Node.`);
+    }
 }
-if (relative(__dirname, process.cwd()).startsWith('..') &&
-    (existsSync('node_modules/.bin/jhipster') || existsSync('../node_modules/.bin/jhipster'))) {
+const appFolderOrWorkspaceRoot = existsSync('../node_modules') ? join(process.cwd(), '..') : process.cwd();
+// If this file is not inside app npm repository and the executable exists inside the repository show warning.
+if (relative(appFolderOrWorkspaceRoot, __dirname).startsWith('..') &&
+    existsSync(join(appFolderOrWorkspaceRoot, 'node_modules/.bin/jhipster'))) {
     logger.warn(`Since JHipster v8, the jhipster command will not use the locally installed generator-jhipster.
     If you want to execute the locally installed generator-jhipster, run: ${chalk.yellow('npx jhipster')}`);
 }

package/dist/cli/commands.mjs

@@ -16,6 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import chalk from 'chalk';
+const removedV8 = chalk.yellow(`
+
+This sub-generator is no longer maintained and has been removed from JHipster starting from v8.
+If you are interested in maintaining this sub-generator fill a feature request on the JHipster bug tracker.
+`);
 const defaultCommands = {
     add: {
         desc: 'Add a feature to current project',
@@ -25,18 +31,22 @@ const defaultCommands = {
     },
     aws: {
         desc: 'Deploy the current application to Amazon Web Services',
+        removed: removedV8,
     },
     'azure-app-service': {
         desc: 'Deploy the current application to Azure App Service',
+        removed: removedV8,
     },
     'azure-spring-cloud': {
         desc: 'Deploy the current application to Azure Spring Cloud',
+        removed: removedV8,
     },
     'ci-cd': {
         desc: 'Create pipeline scripts for popular Continuous Integration/Continuous Deployment tools',
     },
     cloudfoundry: {
         desc: 'Generate a `deploy/cloudfoundry` folder with a specific manifest.yml to deploy to Cloud Foundry',
+        removed: removedV8,
     },
     'docker-compose': {
         desc: 'Create all required Docker deployment configuration for the selected applications',
@@ -57,6 +67,7 @@ const defaultCommands = {
     },
     gae: {
         desc: 'Deploy the current application to Google App Engine',
+        removed: removedV8,
     },
     'generate-blueprint': {
         desc: 'Generate a blueprint',
@@ -119,6 +130,7 @@ const defaultCommands = {
     },
     openshift: {
         desc: 'Deploy the current application to OpenShift',
+        removed: removedV8,
     },
     page: {
         desc: 'Create a new page. (Supports vue clients)',
@@ -130,18 +142,18 @@ const defaultCommands = {
         desc: 'Run a module or custom generator',
         argument: ['[generator]'],
     },
-    'spring-boot': {
-        desc: 'Create a Spring Boot application (alpha)',
-    },
     'spring-service': {
         alias: 'service',
         desc: 'Create a new Spring service bean',
+        removed: removedV8,
     },
     'spring-controller': {
         desc: 'Create a new Spring controller',
+        removed: removedV8,
     },
     'openapi-client': {
         desc: 'Generates java client code from an OpenAPI/Swagger definition',
+        removed: removedV8,
     },
     upgrade: {
         desc: 'Upgrade the JHipster version, and upgrade the generated application',

package/dist/cli/environment-builder.mjs

@@ -17,19 +17,20 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import chalk from 'chalk';
-import _ from 'lodash';
 import { existsSync, readFileSync } from 'fs';
+import path, { dirname, resolve } from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+import chalk from 'chalk';
+import * as _ from 'lodash-es';
 import Environment from 'yeoman-environment';
-import path from 'path';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
 import { QueuedAdapter } from '@yeoman/adapter';
 import { CLI_NAME, logger } from './utils.mjs';
 import { createJHipsterLogger, packageNameToNamespace } from '../generators/base/support/index.mjs';
 import { parseBlueprintInfo, loadBlueprintsFromConfiguration, mergeBlueprints } from '../generators/base/internal/index.mjs';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+const jhipsterDevBlueprintPath = process.env.JHIPSTER_DEV_BLUEPRINT === 'true' ? path.join(__dirname, '../.blueprint') : undefined;
+const devBlueprintNamespace = '@jhipster/jhipster-dev';
 function loadYoRc(filePath = '.yo-rc.json') {
     if (!existsSync(filePath)) {
         return undefined;
@@ -38,15 +39,10 @@ function loadYoRc(filePath = '.yo-rc.json') {
 }
 const createEnvironment = (options = {}) => {
     options.adapter = options.adapter ?? new QueuedAdapter({ log: createJHipsterLogger() });
-    // Remove after migration to environment 3.
-    const configOptions = {};
-    const sharedOptions = {
-        ...options.sharedOptions,
-        configOptions,
-    };
-    return new Environment({ newErrorHandler: true, ...options, sharedOptions });
+    return new Environment({ newErrorHandler: true, ...options });
 };
 export default class EnvironmentBuilder {
+    devBlueprintPath;
     /**
      * Creates a new EnvironmentBuilder with a new Environment.
      *
@@ -93,9 +89,11 @@ export default class EnvironmentBuilder {
     constructor(env) {
         this.env = env;
     }
-    async prepare({ blueprints, lookups } = {}) {
+    async prepare({ blueprints, lookups, devBlueprintPath = jhipsterDevBlueprintPath } = {}) {
+        this.devBlueprintPath = existsSync(devBlueprintPath) ? devBlueprintPath : undefined;
         await this._lookupJHipster();
         await this._lookupLocalBlueprint();
+        await this._lookupDevBlueprint();
         this._loadBlueprints(blueprints);
         await this._lookups(lookups);
         await this._lookupBlueprints();
@@ -106,6 +104,7 @@ export default class EnvironmentBuilder {
         return [
             ...Object.keys(this._blueprintsWithVersion).map(packageName => packageNameToNamespace(packageName)),
             '@jhipster/jhipster-local',
+            ...(this.devBlueprintPath ? [devBlueprintNamespace] : []),
         ];
     }
     /**
@@ -150,11 +149,19 @@ export default class EnvironmentBuilder {
             const generators = await this.env.lookup({ packagePaths: [localBlueprintPath], lookups: ['.'] });
             if (generators.length > 0) {
                 this.env.alias(/^@jhipster\/jhipster-local(:(.*))?$/, '.blueprint$1');
-                this.env.sharedOptions.localBlueprint = true;
+                this.env.sharedOptions.composeWithLocalBlueprint = true;
             }
         }
         return this;
     }
+    async _lookupDevBlueprint() {
+        // Register jhipster generators.
+        const generators = await this.env.lookup({ packagePaths: [this.devBlueprintPath], lookups: ['.'] });
+        if (generators.length > 0) {
+            this.env.alias(/^@jhipster\/jhipster-dev(:(.*))?$/, '.blueprint$1');
+        }
+        return this;
+    }
     async _lookups(lookups = []) {
         lookups = [].concat(lookups);
         for (const lookup of lookups) {
@@ -222,7 +229,11 @@ export default class EnvironmentBuilder {
      * @return {Object[]} blueprint commands.
      */
     async getBlueprintCommands() {
-        const blueprintsPackagePath = await this._getBlueprintPackagePaths();
+        let blueprintsPackagePath = await this._getBlueprintPackagePaths();
+        if (this.devBlueprintPath) {
+            blueprintsPackagePath = blueprintsPackagePath ?? [];
+            blueprintsPackagePath.push([devBlueprintNamespace, this.devBlueprintPath]);
+        }
         return this._getBlueprintCommands(blueprintsPackagePath);
     }
     /**
@@ -327,9 +338,9 @@ export default class EnvironmentBuilder {
             const blueprintCommandFile = `${packagePath}/cli/commands`;
             const blueprintCommandExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(`${blueprintCommandFile}${extension}`));
             if (blueprintCommandExtension) {
-                const blueprintCommandsPath = `${blueprintCommandFile}${blueprintCommandExtension}`;
+                const blueprintCommandsUrl = pathToFileURL(resolve(`${blueprintCommandFile}${blueprintCommandExtension}`));
                 try {
-                    blueprintCommand = (await import(blueprintCommandsPath)).default;
+                    blueprintCommand = (await import(blueprintCommandsUrl)).default;
                     const blueprintCommands = _.cloneDeep(blueprintCommand);
                     Object.entries(blueprintCommands).forEach(([_command, commandSpec]) => {
                         commandSpec.blueprint = commandSpec.blueprint || blueprint;
@@ -337,7 +348,7 @@ export default class EnvironmentBuilder {
                     result = { ...result, ...blueprintCommands };
                 }
                 catch (e) {
-                    const msg = `Error parsing custom commands found within blueprint: ${blueprint} at ${blueprintCommandsPath}`;
+                    const msg = `Error parsing custom commands found within blueprint: ${blueprint} at ${blueprintCommandsUrl}`;
                     /* eslint-disable no-console */
                     console.info(`${chalk.green.bold('INFO!')} ${msg}`);
                 }
@@ -372,32 +383,35 @@ export default class EnvironmentBuilder {
             }
             return [objValue, srcValue];
         }
-        async function loadSharedOptionsFromFile(sharedOptionsFile, msg, errorMsg) {
+        async function loadSharedOptionsFromFile(sharedOptionsBase, msg, errorMsg) {
             /* eslint-disable import/no-dynamic-require */
             /* eslint-disable global-require */
             try {
-                const { default: opts } = await import(sharedOptionsFile);
-                /* eslint-disable no-console */
-                if (msg) {
-                    console.info(`${chalk.green.bold('INFO!')} ${msg}`);
+                const baseExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(resolve(`${sharedOptionsBase}${extension}`)));
+                if (baseExtension) {
+                    const { default: opts } = await import(pathToFileURL(resolve(`${sharedOptionsBase}${baseExtension}`)));
+                    /* eslint-disable no-console */
+                    if (msg) {
+                        console.info(`${chalk.green.bold('INFO!')} ${msg}`);
+                    }
+                    return opts;
                 }
-                return opts;
             }
             catch (e) {
                 if (errorMsg) {
-                    console.info(`${chalk.green.bold('INFO!')} ${errorMsg}`);
+                    console.info(`${chalk.green.bold('INFO!')} ${errorMsg}`, e);
                 }
             }
             return {};
         }
         const localPath = './.jhipster/sharedOptions';
-        let result = await loadSharedOptionsFromFile(path.resolve(localPath), `SharedOptions found at local config ${localPath}`);
+        let result = await loadSharedOptionsFromFile(localPath, `SharedOptions found at local config ${localPath}`);
         if (!blueprintPackagePaths) {
             return undefined;
         }
         for (const [blueprint, packagePath] of blueprintPackagePaths) {
             const errorMsg = `No custom sharedOptions found within blueprint: ${blueprint} at ${packagePath}`;
-            const opts = await loadSharedOptionsFromFile(`${packagePath}/cli/sharedOptions.js`, undefined, errorMsg);
+            const opts = await loadSharedOptionsFromFile(`${packagePath}/cli/sharedOptions`, undefined, errorMsg);
             result = _.mergeWith(result, opts, joiner);
         }
         return result;

package/dist/cli/jhipster-command.mjs

@@ -19,6 +19,7 @@
 import chalk from 'chalk';
 import { Command, Option } from 'commander';
 import lodash from 'lodash';
+import { convertConfigToOption } from '../lib/internal/index.mjs';
 const { kebabCase } = lodash;
 export default class JHipsterCommand extends Command {
     createCommand(name) {
@@ -162,6 +163,15 @@ export default class JHipsterCommand extends Command {
         });
         return this;
     }
+    addJHipsterConfigs(configs = {}, blueprintOptionDescription) {
+        Object.entries(configs).forEach(([name, config]) => {
+            const option = convertConfigToOption(name, config);
+            if (option) {
+                this._addGeneratorOption(kebabCase(option.name), option, blueprintOptionDescription);
+            }
+        });
+        return this;
+    }
     _addGeneratorOption(optionName, optionDefinition, additionalDescription = '') {
         if (optionName === 'help') {
             return undefined;
@@ -176,12 +186,12 @@ export default class JHipsterCommand extends Command {
             cmdString = `-${optionDefinition.alias}, `;
         }
         cmdString = `${cmdString}${longOption}`;
-        if (optionDefinition.type === String) {
-            cmdString = optionDefinition.required !== false ? `${cmdString} <value>` : `${cmdString} [value]`;
-        }
-        else if (optionDefinition.type === Array) {
+        if (optionDefinition.type === Array) {
             cmdString = optionDefinition.required !== false ? `${cmdString} <value...>` : `${cmdString} [value...]`;
         }
+        else if (optionDefinition.type && optionDefinition.type !== Boolean) {
+            cmdString = optionDefinition.required !== false ? `${cmdString} <value>` : `${cmdString} [value]`;
+        }
         const option = new Option(cmdString, optionDefinition.description + additionalDescription)
             .default(optionDefinition.default)
             .hideHelp(optionDefinition.hide ?? false);

package/dist/cli/program.mjs

@@ -18,11 +18,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import chalk from 'chalk';
-import didYouMean from 'didyoumean';
 import fs from 'fs';
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
+import didYouMean from 'didyoumean';
+import chalk from 'chalk';
 import logo from './logo.mjs';
 import EnvironmentBuilder from './environment-builder.mjs';
 import SUB_GENERATORS from './commands.mjs';
@@ -42,25 +42,42 @@ export const printJHipsterLogo = () => {
     // eslint-disable-next-line no-console
     console.log(logo);
 };
-const buildAllDependencies = async (generatorNames, { env }) => {
+const buildAllDependencies = async (generatorNames, { env, blueprintNamespaces }) => {
     const allDependencies = {};
-    const buildGeneratorDependencies = async (dependencyName) => {
-        const meta = await env.getGeneratorMeta(dependencyName.includes(':') ? dependencyName : `${JHIPSTER_NS}:${dependencyName}`);
-        if (!meta) {
-            return;
+    const registerDependency = async ({ namespace, blueprintNamespace }) => {
+        const meta = await env.getGeneratorMeta(namespace.includes(':') ? namespace : `${JHIPSTER_NS}:${namespace}`);
+        if (meta) {
+            allDependencies[namespace] = { meta, blueprintNamespace };
         }
-        allDependencies[dependencyName] = meta;
-        const generatorModule = await meta.importModule();
-        if (generatorModule.command) {
-            for (const dependency of generatorModule.command.import ?? []) {
-                if (!allDependencies[dependency]) {
-                    await buildGeneratorDependencies(dependency);
+        return meta?.importModule();
+    };
+    const lookupDependencyOptions = async ({ namespace, blueprintNamespace }) => {
+        const lookupGeneratorAndImports = async ({ namespace, blueprintNamespace }) => {
+            const module = await registerDependency({ namespace, blueprintNamespace });
+            if (module?.command?.import) {
+                for (const generator of module?.command?.import ?? []) {
+                    await lookupDependencyOptions({ namespace: generator, blueprintNamespace });
                 }
             }
+            return module?.command?.override;
+        };
+        let overridden = false;
+        if (!namespace.includes(':')) {
+            for (const nextBlueprint of blueprintNamespaces) {
+                const blueprintSubGenerator = `${nextBlueprint}:${namespace}`;
+                if (!allDependencies[blueprintSubGenerator]) {
+                    if (await lookupGeneratorAndImports({ namespace: blueprintSubGenerator, blueprintNamespace: nextBlueprint })) {
+                        overridden = true;
+                    }
+                }
+            }
+        }
+        if (!overridden && !allDependencies[namespace]) {
+            await lookupGeneratorAndImports({ namespace, blueprintNamespace });
         }
     };
     for (const generatorName of generatorNames) {
-        await buildGeneratorDependencies(generatorName);
+        await lookupDependencyOptions({ namespace: generatorName });
     }
     return allDependencies;
 };
@@ -68,6 +85,7 @@ const addCommandGeneratorOptions = async (command, generatorMeta, { root, bluepr
     const generatorModule = await generatorMeta.importModule();
     if (generatorModule.command) {
         command.addJHipsterOptions(generatorModule.command.options, blueprintOptionDescription);
+        command.addJHipsterConfigs(generatorModule.command.configs, blueprintOptionDescription);
     }
     try {
         if (root || !generatorModule.command || generatorModule.command.loadGeneratorOptions) {
@@ -117,7 +135,8 @@ export const createProgram = ({ executableName = CLI_NAME, executableVersion } =
         .option('--install-path', 'Show jhipster install path', false)
         .option('--skip-regenerate', "Don't regenerate identical files", false)
         .option('--skip-yo-resolve', 'Ignore .yo-resolve files', false)
-        .addJHipsterOptions(command.options));
+        .addJHipsterOptions(command.options)
+        .addJHipsterConfigs(command.configs));
 };
 const rejectExtraArgs = ({ program, command, extraArgs }) => {
     // if extraArgs exists: Unknown commands or unknown argument.
@@ -136,7 +155,7 @@ const rejectExtraArgs = ({ program, command, extraArgs }) => {
 export const buildCommands = async ({ program, commands = {}, envBuilder, env, loadCommand, defaultCommand = 'app', printLogo = printJHipsterLogo, printBlueprintLogo = () => { }, createEnvBuilder, }) => {
     /* create commands */
     Object.entries(commands).forEach(([cmdName, opts]) => {
-        const { desc, blueprint, argument, options: commandOptions, alias, help: commandHelp, cliOnly, useOptions = {} } = opts;
+        const { desc, blueprint, argument, options: commandOptions, alias, help: commandHelp, cliOnly, removed, useOptions = {} } = opts;
         program
             .command(cmdName, '', { isDefault: cmdName === defaultCommand })
             .description(desc + (blueprint ? chalk.yellow(` (blueprint: ${blueprint})`) : ''))
@@ -149,6 +168,10 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
         })
             .lazyBuildCommand(async function (operands) {
             logger.debug(`cmd: lazyBuildCommand ${cmdName} ${operands}`);
+            if (removed) {
+                logger.fatal(removed);
+                return;
+            }
             const command = this;
             if (cmdName === 'run') {
                 command.usage(`${operands} [options]`);
@@ -174,24 +197,20 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
                 await addCommandRootGeneratorOptions(command, generatorMeta);
                 // Add bootstrap options, may be dropped if every generator is migrated to new structure and correctly depends on bootstrap.
                 const boostrapGen = ['bootstrap', generator];
-                const allDependencies = await buildAllDependencies(boostrapGen, { env });
-                for (const [metaName, generatorMeta] of Object.entries(allDependencies)) {
-                    await addCommandGeneratorOptions(command, generatorMeta, { root: metaName === generator });
-                }
-                if (!blueprint) {
-                    // Register blueprint specific options.
-                    for (const blueprintNamespace of envBuilder.getBlueprintsNamespaces() ?? []) {
-                        for (const generatorName of Object.keys(allDependencies).filter(ns => !ns.includes(':'))) {
-                            const generatorNamespace = `${blueprintNamespace}:${generatorName}`;
-                            const blueprintMeta = env.getGeneratorMeta(generatorNamespace);
-                            if (blueprintMeta) {
-                                const blueprintOptionDescription = chalk.yellow(` (blueprint option: ${blueprintNamespace.replace(/^jhipster-/, '')})`);
-                                await addCommandGeneratorOptions(command, blueprintMeta, {
-                                    blueprintOptionDescription,
-                                    info: `Error parsing options for generator ${generatorNamespace}`,
-                                });
-                            }
-                        }
+                const allDependencies = await buildAllDependencies(boostrapGen, {
+                    env,
+                    blueprintNamespaces: blueprint ? [] : envBuilder.getBlueprintsNamespaces(),
+                });
+                for (const [metaName, { meta: generatorMeta, blueprintNamespace }] of Object.entries(allDependencies)) {
+                    if (blueprintNamespace) {
+                        const blueprintOptionDescription = chalk.yellow(` (blueprint option: ${blueprintNamespace.replace(/^jhipster-/, '')})`);
+                        await addCommandGeneratorOptions(command, generatorMeta, {
+                            blueprintOptionDescription,
+                            info: `Error parsing options for generator ${metaName}`,
+                        });
+                    }
+                    else {
+                        await addCommandGeneratorOptions(command, generatorMeta, { root: metaName === generator });
                     }
                 }
             }
@@ -234,14 +253,15 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
         });
     });
 };
-export const buildJHipster = async ({ executableName, executableVersion, program = createProgram({ executableName, executableVersion }), blueprints, lookups, createEnvBuilder, envBuilder, commands, printLogo, printBlueprintLogo, env, 
+export const buildJHipster = async ({ executableName, executableVersion, program = createProgram({ executableName, executableVersion }), blueprints, lookups, createEnvBuilder, envBuilder, commands, printLogo, printBlueprintLogo, devBlueprintPath, env, 
 /* eslint-disable-next-line global-require, import/no-dynamic-require */
 loadCommand = async (key) => {
     const { default: command } = await import(`./${key}.mjs`);
     return command;
 }, defaultCommand, } = {}) => {
     // eslint-disable-next-line chai-friendly/no-unused-expressions
-    createEnvBuilder = createEnvBuilder ?? (async (options) => EnvironmentBuilder.create(options).prepare({ blueprints, lookups }));
+    createEnvBuilder =
+        createEnvBuilder ?? (async (options) => EnvironmentBuilder.create(options).prepare({ blueprints, lookups, devBlueprintPath }));
     envBuilder = envBuilder ?? (await createEnvBuilder());
     env = env ?? envBuilder.getEnvironment();
     commands = commands ?? { ...SUB_GENERATORS, ...(await envBuilder.getBlueprintCommands()) };

package/dist/cli/utils.mjs

@@ -18,13 +18,12 @@
  */
 /* eslint-disable no-console */
 import chalk from 'chalk';
-import _ from 'lodash';
 import { createJHipsterLogger, CLI_LOGGER } from '../generators/base/support/index.mjs';
 export const CLI_NAME = 'jhipster';
 export const GENERATOR_NAME = 'generator-jhipster';
 const SUCCESS_MESSAGE = `Congratulations, JHipster execution is complete!
 If you find JHipster useful consider sponsoring the project ${chalk.yellow('https://www.jhipster.tech/sponsors/')}`;
-const SPONSOR_MESSAGE = 'Sponsored with ❤️  by @oktadev.';
+const SPONSOR_MESSAGE = 'Thanks for using JHipster!';
 export const logger = createJHipsterLogger({ namespace: CLI_LOGGER });
 /**
  *  Get options for the command

package/dist/generators/angular/entity-files-angular.mjs

@@ -1,49 +1,48 @@
-import { clientApplicationBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock } from '../client/support/files.mjs';
 export const angularFiles = {
     client: [
         {
-            ...clientApplicationBlock,
-            templates: ['entities/_entityFolder/_entityFile.model.ts', 'entities/_entityFolder/_entityFile.test-samples.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: ['entities/_entityFolder_/_entityFile_.model.ts', 'entities/_entityFolder_/_entityFile_.test-samples.ts'],
         },
         {
             condition: generator => !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
-                'entities/_entityFolder/_entityFile.routes.ts',
-                'entities/_entityFolder/detail/_entityFile-detail.component.html',
-                'entities/_entityFolder/detail/_entityFile-detail.component.ts',
-                'entities/_entityFolder/detail/_entityFile-detail.component.spec.ts',
-                'entities/_entityFolder/list/_entityFile.component.html',
-                'entities/_entityFolder/list/_entityFile.component.ts',
-                'entities/_entityFolder/list/_entityFile.component.spec.ts',
-                'entities/_entityFolder/route/_entityFile-routing-resolve.service.ts',
-                'entities/_entityFolder/route/_entityFile-routing-resolve.service.spec.ts',
-                'entities/_entityFolder/service/_entityFile.service.ts',
-                'entities/_entityFolder/service/_entityFile.service.spec.ts',
+                'entities/_entityFolder_/_entityFile_.routes.ts',
+                'entities/_entityFolder_/detail/_entityFile_-detail.component.html',
+                'entities/_entityFolder_/detail/_entityFile_-detail.component.ts',
+                'entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts',
+                'entities/_entityFolder_/list/_entityFile_.component.html',
+                'entities/_entityFolder_/list/_entityFile_.component.ts',
+                'entities/_entityFolder_/list/_entityFile_.component.spec.ts',
+                'entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts',
+                'entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts',
+                'entities/_entityFolder_/service/_entityFile_.service.ts',
+                'entities/_entityFolder_/service/_entityFile_.service.spec.ts',
             ],
         },
         {
             condition: generator => !generator.readOnly && !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
-                'entities/_entityFolder/update/_entityFile-form.service.ts',
-                'entities/_entityFolder/update/_entityFile-form.service.spec.ts',
-                'entities/_entityFolder/update/_entityFile-update.component.html',
-                'entities/_entityFolder/update/_entityFile-update.component.spec.ts',
-                'entities/_entityFolder/delete/_entityFile-delete-dialog.component.html',
-                'entities/_entityFolder/update/_entityFile-update.component.ts',
-                'entities/_entityFolder/delete/_entityFile-delete-dialog.component.ts',
-                'entities/_entityFolder/delete/_entityFile-delete-dialog.component.spec.ts',
+                'entities/_entityFolder_/update/_entityFile_-form.service.ts',
+                'entities/_entityFolder_/update/_entityFile_-form.service.spec.ts',
+                'entities/_entityFolder_/update/_entityFile_-update.component.html',
+                'entities/_entityFolder_/update/_entityFile_-update.component.spec.ts',
+                'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html',
+                'entities/_entityFolder_/update/_entityFile_-update.component.ts',
+                'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.ts',
+                'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts',
             ],
         },
     ],
 };
-export async function writeEntitiesFiles({ application, entities, control }) {
-    await control.loadClientTranslations?.();
+export async function writeEntitiesFiles({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
         await this.writeFiles({
             sections: angularFiles,
-            context: { ...application, ...entity, getWebappTranslation: control.getWebappTranslation },
+            context: { ...application, ...entity },
         });
     }
 }