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

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 { 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,8 +28,12 @@ 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'))) {

package/dist/cli/environment-builder.mjs

@@ -17,19 +17,20 @@
  * limitations under the License.
  */
 import assert from 'assert';
+import { existsSync, readFileSync } from 'fs';
+import path, { dirname, resolve } from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
 import chalk from 'chalk';
 import _ from 'lodash';
-import { existsSync, readFileSync } from 'fs';
 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] : []),
         ];
     }
     /**
@@ -155,6 +154,14 @@ export default class EnvironmentBuilder {
         }
         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

@@ -176,12 +176,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';
@@ -234,14 +234,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,13 +1,13 @@
-import { clientApplicationBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock } from '../client/support/files.mjs';
 export const angularFiles = {
     client: [
         {
-            ...clientApplicationBlock,
+            ...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',
@@ -24,7 +24,7 @@ export const angularFiles = {
         },
         {
             condition: generator => !generator.readOnly && !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'entities/_entityFolder/update/_entityFile-form.service.ts',
                 'entities/_entityFolder/update/_entityFile-form.service.spec.ts',

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

@@ -16,8 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createTranslationReplacer } from './support/index.mjs';
-import { clientApplicationBlock, clientSrcBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
 export const files = {
     common: [
         {
@@ -40,17 +39,17 @@ export const files = {
     ],
     sass: [
         {
-            ...clientSrcBlock,
+            ...clientSrcTemplatesBlock(),
             templates: ['content/scss/_bootstrap-variables.scss', 'content/scss/global.scss', 'content/scss/vendor.scss'],
         },
     ],
     angularApp: [
         {
-            ...clientSrcBlock,
+            ...clientSrcTemplatesBlock(),
             templates: ['main.ts', 'bootstrap.ts', 'declarations.d.ts'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['app.module.ts', 'app-routing.module.ts', 'app.constants.ts', 'app-page-title-strategy.ts'],
         },
     ],
@@ -61,13 +60,13 @@ export const files = {
         },
         {
             condition: generator => generator.microfrontend && generator.applicationTypeGateway,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['core/microfrontend/index.ts'],
         },
     ],
     angularMain: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 // entities
                 'entities/entity-navbar-items.ts',
@@ -96,28 +95,28 @@ export const files = {
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['layouts/navbar/active-menu.directive.ts'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['layouts/profiles/page-ribbon.component.scss', 'layouts/navbar/navbar.component.scss', 'home/home.component.scss'],
         },
         // login
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             condition: generator => !generator.authenticationTypeOauth2,
             templates: ['login/login.component.ts', 'login/login.component.html', 'login/login.model.ts'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             condition: generator => generator.authenticationTypeOauth2,
             templates: ['login/logout.model.ts'],
         },
     ],
     angularAccountModule: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             condition: generator => generator.generateUserManagement,
             templates: [
                 'account/account.route.ts',
@@ -152,7 +151,7 @@ export const files = {
         },
         {
             condition: generator => generator.authenticationTypeSession && generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'account/sessions/sessions.route.ts',
                 'account/sessions/session.model.ts',
@@ -165,7 +164,7 @@ export const files = {
     angularAdminModule: [
         {
             condition: generator => !generator.applicationTypeMicroservice,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/admin-routing.module.ts',
                 'admin/docs/docs.component.ts',
@@ -175,7 +174,7 @@ export const files = {
         },
         {
             condition: generator => generator.withAdminUi,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 // admin modules
                 'admin/configuration/configuration.component.ts',
@@ -218,12 +217,12 @@ export const files = {
         },
         {
             condition: generator => generator.communicationSpringWebsocket,
-            ...clientSrcBlock,
+            ...clientSrcTemplatesBlock(),
             templates: ['sockjs-client.polyfill.ts'],
         },
         {
             condition: generator => generator.communicationSpringWebsocket,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/tracker/tracker.component.ts',
                 'admin/tracker/tracker.component.html',
@@ -233,7 +232,7 @@ export const files = {
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/user-management/user-management.route.ts',
                 'admin/user-management/user-management.model.ts',
@@ -250,7 +249,7 @@ export const files = {
         },
         {
             condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/gateway/gateway-route.model.ts',
                 'admin/gateway/gateway.component.ts',
@@ -261,7 +260,7 @@ export const files = {
     ],
     angularCore: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'core/config/application-config.service.ts',
                 'core/config/application-config.service.spec.ts',
@@ -293,23 +292,23 @@ export const files = {
         },
         {
             condition: generator => generator.authenticationTypeJwt,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['core/interceptor/auth.interceptor.ts'],
         },
         {
             condition: generator => generator.generateBuiltInUserEntity,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['entities/user/user.service.ts', 'entities/user/user.service.spec.ts', 'entities/user/user.model.ts'],
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['config/language.constants.ts', 'config/translation.config.ts'],
         },
     ],
     angularShared: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'shared/shared.module.ts',
                 'shared/date/index.ts',
@@ -338,7 +337,7 @@ export const files = {
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'shared/language/index.ts',
                 'shared/language/translation.module.ts',
@@ -349,7 +348,7 @@ export const files = {
     ],
     angularAuthService: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'core/auth/state-storage.service.ts',
                 'shared/auth/has-any-authority.directive.ts',
@@ -361,24 +360,24 @@ export const files = {
         },
         {
             condition: generator => generator.authenticationTypeJwt,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['core/auth/auth-jwt.service.ts', 'core/auth/auth-jwt.service.spec.ts'],
         },
         {
             condition: generator => generator.authenticationUsesCsrf,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['core/auth/auth-session.service.ts'],
         },
         {
             condition: generator => generator.authenticationTypeSession && generator.communicationSpringWebsocket,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['core/auth/csrf.service.ts'],
         },
     ],
     clientTestFw: [
         {
             condition: generator => generator.withAdminUi,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/configuration/configuration.component.spec.ts',
                 'admin/configuration/configuration.service.spec.ts',
@@ -392,7 +391,7 @@ export const files = {
             ],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'shared/auth/has-any-authority.directive.spec.ts',
                 'core/util/event-manager.service.spec.ts',
@@ -414,12 +413,12 @@ export const files = {
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/language/translate.directive.spec.ts'],
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'account/activate/activate.component.spec.ts',
                 'account/activate/activate.service.spec.ts',
@@ -437,12 +436,12 @@ export const files = {
         },
         {
             condition: generator => !generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['login/login.component.spec.ts'],
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/user-management/list/user-management.component.spec.ts',
                 'admin/user-management/detail/user-management-detail.component.spec.ts',
@@ -453,7 +452,7 @@ export const files = {
         },
         {
             condition: generator => generator.authenticationTypeSession && generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['account/sessions/sessions.component.spec.ts'],
         },
     ],

package/dist/generators/angular/generator.mjs

@@ -26,8 +26,9 @@ import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from
 import { writeFiles } from './files-angular.mjs';
 import cleanupOldFilesTask from './cleanup.mjs';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
-import { buildAngularFormPath as angularFormPath, addEntitiesRoute, addToEntitiesMenu, translateAngularFilesTransform, isTranslatedAngularFile, } from './support/index.mjs';
+import { buildAngularFormPath as angularFormPath, addEntitiesRoute, addToEntitiesMenu, translateAngularFilesTransform, isTranslatedAngularFile, addRoute, addItemToAdminMenu, addIconImport, } from './support/index.mjs';
 import { generateEntityClientEnumImports as getClientEnumImportsFormat, getTypescriptKeyType as getTSKeyType, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, generateTypescriptTestEntity as generateTestEntity, } from '../client/support/index.mjs';
+import { createNeedleCallback } from '../base/support/index.mjs';
 const { ANGULAR } = clientFrameworkTypes;
 export default class AngularGenerator extends BaseApplicationGenerator {
     localEntities;
@@ -63,12 +64,39 @@ export default class AngularGenerator extends BaseApplicationGenerator {
                 application.webappEnumerationsDir = `${application.clientSrcDir}app/entities/enumerations/`;
                 application.angularLocaleId = application.nativeLanguageDefinition.angularLocale ?? defaultLanguage.angularLocale;
             },
-            addNeedles({ source }) {
+            addNeedles({ source, application }) {
                 source.addEntitiesToClient = param => {
                     const { application, entities } = param;
                     this.addEntitiesToModule({ application, entities });
                     this.addEntitiesToMenu({ application, entities });
                 };
+                source.addAdminRoute = (args) => this.editFile(`${application.srcMainWebapp}app/admin/admin-routing.module.ts`, addRoute({
+                    needle: 'add-admin-route',
+                    ...args,
+                }));
+                source.addItemToAdminMenu = (args) => {
+                    this.editFile(`${application.srcMainWebapp}app/layouts/navbar/navbar.component.html`, addItemToAdminMenu({
+                        enableTranslation: application.enableTranslation,
+                        jhiPrefix: application.jhiPrefix,
+                        ...args,
+                    }));
+                    if (args.icon) {
+                        source.addIconImport({ icon: args.icon });
+                    }
+                };
+                source.addIconImport = args => {
+                    const iconsPath = `${application.srcMainWebapp}app/config/font-awesome-icons.ts`;
+                    const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Icon imports not updated with icon';
+                    this.editFile(iconsPath, { ignoreNonExisting }, addIconImport(args));
+                };
+                source.addWebpackConfig = args => {
+                    const webpackPath = 'webpack/webpack.custom.js';
+                    const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
+                    this.editFile(webpackPath, { ignoreNonExisting }, createNeedleCallback({
+                        needle: 'jhipster-needle-add-webpack-config',
+                        contentToAdd: `,${args.config}`,
+                    }));
+                };
             },
         });
     }