npm - generator-jhipster - Versions diffs - 8.0.0-rc.1 → 8.1.0 - Mend

generator-jhipster 8.0.0-rc.1 → 8.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (369) hide show

package/README.md CHANGED Viewed

@@ -2,7 +2,7 @@
 [![NPM version][npm-image]][npm-url] [![Downloads][npmcharts-image]][npmcharts-url] [![Gitter][gitter-badge-image]][gitter-badge-url] [![Known Vulnerabilities][snyk-image]][snyk-url] [![Package Health][health-image]][health-url]
-[![Generator Build Status][github-actions-generator-image]][github-actions-url] [![Angular Build Status][github-actions-angular-image]][github-actions-url] [![React Build Status][github-actions-react-image]][github-actions-url] [![Vue Build Status][github-actions-vue-image]][github-actions-url] [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.jhipster.tech/scans)
+[![Generator Build Status][github-actions-generator-image]][github-actions-url] [![Angular Build Status][github-actions-angular-image]][github-actions-url] [![React Build Status][github-actions-react-image]][github-actions-url] [![Vue Build Status][github-actions-vue-image]][github-actions-url] [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.jhipster.tech/scans)
 Greetings, Java Hipster!
@@ -12,7 +12,16 @@ Please read our [guidelines](/CONTRIBUTING.md#submitting-an-issue) before submit
 ## Contributing
-We are honoured by any contributions you may have small or large. Please refer to our [contribution guidelines and instructions document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) for any information about contributing to the project.
+We are honored by any contributions you may have small or large. Please refer to our [contribution guidelines and instructions document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) for any information about contributing to the project.
+## Supported Java and Node versions
+The following Java and Node combinations are tested and verified by GitHub Actions:
+| Java | Node | Status |
+| ---- | ---- | ------ |
+| 21   | 20   | ✅     |
+| 17   | 18   | ✅     |
 ## Sponsors
@@ -20,20 +29,6 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
 **Thank you to our sponsors!**
-### Gold Sponsors
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://dev.entando.org/jhipster" target="_blank">
-          <img width="200em" src="https://www.jhipster.tech/images/open-collective/entandoe.png">
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
 ### Bronze sponsors
 [![BronzeSponsors][bronze-sponsors-image]][bronze-sponsors-url]
@@ -46,56 +41,74 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
 <object data="https://opencollective.com/generator-jhipster/tiers/backer.svg?avatarHeight=40&width=890&button=false" type="image/svg+xml"></object>
-## Azure Builds
+## Daily Builds
 Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hipster-labs/jhipster-daily-builds)
-| Pipeline Status                                                        |
-| :--------------------------------------------------------------------- |
-| [![Angular Maven SQL][github-angular-maven-sql]][github-actions]       |
-| [![Angular Maven NoSQL][github-angular-maven-nosql]][github-actions]   |
-| [![Angular Gradle SQL][github-angular-gradle-sql]][github-actions]     |
-| [![Angular Gradle NoSQL][github-angular-gradle-nosql]][github-actions] |
-| [![React Maven SQL][github-react-maven-sql]][github-actions]           |
-| [![React Maven NoSQL][github-react-maven-nosql]][github-actions]       |
-| [![React Gradle SQL][github-react-gradle-sql]][github-actions]         |
-| [![React Gradle NoSQL][github-react-gradle-nosql]][github-actions]     |
-| [![Vue Maven SQL][github-vue-maven-sql]][github-actions]               |
-| [![Vue Maven NoSQL][github-vue-maven-nosql]][github-actions]           |
-| [![Vue Gradle SQL][github-vue-gradle-sql]][github-actions]             |
-| [![Vue Gradle NoSQL][github-vue-gradle-nosql]][github-actions]         |
-| [![Elasticsearch][github-elasticsearch]][github-actions]               |
-| [![Monolith OAuth2][github-monolith-oauth2]][github-actions]           |
-| [![No Database][github-no-database]][github-actions]                   |
-| [![Microservices JWT][github-ms-jwt]][github-actions]                  |
-| [![Microservices OAuth2][github-ms-oauth2]][github-actions]            |
-| [![Docker Image][github-docker-image]][github-actions]                 |
-| [![Official Windows][github-official-windows]][github-actions]         |
+| Pipeline Status                                                                      |
+| :----------------------------------------------------------------------------------- |
+| [![Angular Maven SQL][ng-maven-sql.yaml-badge]][ng-maven-sql.yaml-link]              |
+| [![Angular Maven NoSQL][ng-maven-nosql.yaml-badge]][ng-maven-nosql.yaml-link]        |
+| [![Angular Gradle SQL][ng-gradle-sql.yaml-badge]][ng-gradle-sql.yaml-link]           |
+| [![Angular Gradle NoSQL][ng-gradle-nosql.yaml-badge]][ng-gradle-nosql.yaml-link]     |
+| [![React Maven SQL][react-maven-sql.yaml-badge]][react-maven-sql.yaml-link]          |
+| [![React Maven NoSQL][react-maven-nosql.yaml-badge]][react-maven-nosql.yaml-link]    |
+| [![React Gradle SQL][react-gradle-sql.yaml-badge]][react-gradle-sql.yaml-link]       |
+| [![React Gradle NoSQL][react-gradle-nosql.yaml-badge]][react-gradle-nosql.yaml-link] |
+| [![Vue Maven SQL][vue-maven-sql.yaml-badge]][vue-maven-sql.yaml-link]                |
+| [![Vue Maven NoSQL][vue-maven-nosql.yaml-badge]][vue-maven-nosql.yaml-link]          |
+| [![Vue Gradle SQL][vue-gradle-sql.yaml-badge]][vue-gradle-sql.yaml-link]             |
+| [![Vue Gradle NoSQL][vue-gradle-nosql.yaml-badge]][vue-gradle-nosql.yaml-link]       |
+| [![Elasticsearch][elasticsearch.yaml-badge]][elasticsearch.yaml-link]                |
+| [![Monolith OAuth 2.0][monolith-oauth2.yaml-badge]][monolith-oauth2.yaml-link]       |
+| [![No Database][no-database.yaml-badge]][no-database.yaml-link]                      |
+| [![Microservices JWT][ms-jwt.yaml-badge]][ms-jwt.yaml-link]                          |
+| [![Microservices OAuth 2.0][ms-oauth2.yaml-badge]][ms-oauth2.yaml-link]              |
+| [![Docker Image][docker-image.yaml-badge]][docker-image.yaml-link]                   |
+| [![Official Windows][windows.yaml-badge]][windows.yaml-link]                         |
 ## Analysis of the sample JHipster project
 [![sonar-quality-gate][sonar-quality-gate]][sonar-url] [![sonar-coverage][sonar-coverage]][sonar-url] [![sonar-bugs][sonar-bugs]][sonar-url] [![sonar-vulnerabilities][sonar-vulnerabilities]][sonar-url]
-[github-actions]: https://github.com/hipster-labs/jhipster-daily-builds/actions
-[github-official-windows]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Official%20Windows/badge.svg
-[github-angular-maven-sql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Angular%20Maven%20SQL/badge.svg
-[github-angular-maven-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Angular%20Maven%20NoSQL/badge.svg
-[github-angular-gradle-sql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Angular%20Gradle%20SQL/badge.svg
-[github-angular-gradle-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Angular%20Gradle%20NoSQL/badge.svg
-[github-react-maven-sql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/React%20Maven%20SQL/badge.svg
-[github-react-maven-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/React%20Maven%20NoSQL/badge.svg
-[github-react-gradle-sql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/React%20Gradle%20SQL/badge.svg
-[github-react-gradle-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/React%20Gradle%20NoSQL/badge.svg
-[github-vue-maven-sql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Vue%20Maven%20SQL/badge.svg
-[github-vue-maven-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Vue%20Maven%20NoSQL/badge.svg
-[github-vue-gradle-sql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Vue%20Gradle%20SQL/badge.svg
-[github-vue-gradle-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Vue%20Gradle%20NoSQL/badge.svg
-[github-elasticsearch]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Elasticsearch/badge.svg
-[github-monolith-oauth2]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Monolith%20OAuth%202.0/badge.svg
-[github-no-database]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/No%20Database/badge.svg
-[github-ms-jwt]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Microservices%20JWT/badge.svg
-[github-ms-oauth2]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Microservices%20OAuth%202.0/badge.svg
-[github-docker-image]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Docker%20Image/badge.svg
+[ng-maven-sql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-maven-sql.yaml/badge.svg
+[ng-maven-sql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-maven-sql.yaml
+[ng-maven-nosql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-maven-nosql.yaml/badge.svg
+[ng-maven-nosql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-maven-nosql.yaml
+[ng-gradle-sql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-gradle-sql.yaml/badge.svg
+[ng-gradle-sql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-gradle-sql.yaml
+[ng-gradle-nosql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-gradle-nosql.yaml/badge.svg
+[ng-gradle-nosql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ng-gradle-nosql.yaml
+[react-maven-sql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-maven-sql.yaml/badge.svg
+[react-maven-sql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-maven-sql.yaml
+[react-maven-nosql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-maven-nosql.yaml/badge.svg
+[react-maven-nosql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-maven-nosql.yaml
+[react-gradle-sql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-gradle-sql.yaml/badge.svg
+[react-gradle-sql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-gradle-sql.yaml
+[react-gradle-nosql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-gradle-nosql.yaml/badge.svg
+[react-gradle-nosql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/react-gradle-nosql.yaml
+[vue-maven-sql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-maven-sql.yaml/badge.svg
+[vue-maven-sql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-maven-sql.yaml
+[vue-maven-nosql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-maven-nosql.yaml/badge.svg
+[vue-maven-nosql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-maven-nosql.yaml
+[vue-gradle-sql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-gradle-sql.yaml/badge.svg
+[vue-gradle-sql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-gradle-sql.yaml
+[vue-gradle-nosql.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-gradle-nosql.yaml/badge.svg
+[vue-gradle-nosql.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/vue-gradle-nosql.yaml
+[elasticsearch.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/elasticsearch.yaml/badge.svg
+[elasticsearch.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/elasticsearch.yaml
+[monolith-oauth2.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/monolith-oauth2.yaml/badge.svg
+[monolith-oauth2.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/monolith-oauth2.yaml
+[no-database.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/no-database.yaml/badge.svg
+[no-database.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/no-database.yaml
+[ms-jwt.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ms-jwt.yaml/badge.svg
+[ms-jwt.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ms-jwt.yaml
+[ms-oauth2.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ms-oauth2.yaml/badge.svg
+[ms-oauth2.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/ms-oauth2.yaml
+[docker-image.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/docker-image.yaml/badge.svg
+[docker-image.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/docker-image.yaml
+[windows.yaml-badge]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/windows.yaml/badge.svg
+[windows.yaml-link]: https://github.com/hipster-labs/jhipster-daily-builds/actions/workflows/windows.yaml
 [sonar-url]: https://sonarcloud.io/dashboard?id=jhipster-sample-application
 [sonar-quality-gate]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=alert_status
 [sonar-coverage]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=coverage

package/dist/cli/environment-builder.mjs CHANGED Viewed

@@ -31,6 +31,7 @@ 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';
+const localBlueprintNamespace = '@jhipster/jhipster-local';
 function loadYoRc(filePath = '.yo-rc.json') {
     if (!existsSync(filePath)) {
         return undefined;
@@ -43,6 +44,8 @@ const createEnvironment = (options = {}) => {
 };
 export default class EnvironmentBuilder {
     devBlueprintPath;
+    localBlueprintPath;
+    localBlueprintExists;
     /**
      * Creates a new EnvironmentBuilder with a new Environment.
      *
@@ -91,6 +94,8 @@ export default class EnvironmentBuilder {
     }
     async prepare({ blueprints, lookups, devBlueprintPath = jhipsterDevBlueprintPath } = {}) {
         this.devBlueprintPath = existsSync(devBlueprintPath) ? devBlueprintPath : undefined;
+        this.localBlueprintPath = path.join(process.cwd(), '.blueprint');
+        this.localBlueprintExists = this.localBlueprintPath !== this.devBlueprintPath && existsSync(this.localBlueprintPath);
         await this._lookupJHipster();
         await this._lookupLocalBlueprint();
         await this._lookupDevBlueprint();
@@ -103,7 +108,7 @@ export default class EnvironmentBuilder {
     getBlueprintsNamespaces() {
         return [
             ...Object.keys(this._blueprintsWithVersion).map(packageName => packageNameToNamespace(packageName)),
-            '@jhipster/jhipster-local',
+            localBlueprintNamespace,
             ...(this.devBlueprintPath ? [devBlueprintNamespace] : []),
         ];
     }
@@ -143,10 +148,9 @@ export default class EnvironmentBuilder {
         return this;
     }
     async _lookupLocalBlueprint() {
-        const localBlueprintPath = path.join(process.cwd(), '.blueprint');
-        if (existsSync(localBlueprintPath)) {
+        if (this.localBlueprintExists) {
             // Register jhipster generators.
-            const generators = await this.env.lookup({ packagePaths: [localBlueprintPath], lookups: ['.'] });
+            const generators = await this.env.lookup({ packagePaths: [this.localBlueprintPath], lookups: ['.'] });
             if (generators.length > 0) {
                 this.env.alias(/^@jhipster\/jhipster-local(:(.*))?$/, '.blueprint$1');
                 this.env.sharedOptions.composeWithLocalBlueprint = true;
@@ -190,10 +194,10 @@ export default class EnvironmentBuilder {
      * @return {EnvironmentBuilder} this for chaining.
      */
     async _lookupBlueprints(options) {
-        const allBlueprints = Object.keys(this._blueprintsWithVersion);
-        if (allBlueprints && allBlueprints.length > 0) {
+        const missingBlueprints = Object.keys(this._blueprintsWithVersion).filter(blueprint => !this.env.isPackageRegistered(packageNameToNamespace(blueprint)));
+        if (missingBlueprints && missingBlueprints.length > 0) {
             // Lookup for blueprints.
-            await this.env.lookup({ ...options, filterPaths: true, packagePatterns: allBlueprints });
+            await this.env.lookup({ ...options, filterPaths: true, packagePatterns: missingBlueprints });
         }
         return this;
     }
@@ -233,6 +237,9 @@ export default class EnvironmentBuilder {
         if (this.devBlueprintPath) {
             blueprintsPackagePath = blueprintsPackagePath ?? [];
             blueprintsPackagePath.push([devBlueprintNamespace, this.devBlueprintPath]);
+            if (this.localBlueprintExists) {
+                blueprintsPackagePath.push([localBlueprintNamespace, this.localBlueprintPath]);
+            }
         }
         return this._getBlueprintCommands(blueprintsPackagePath);
     }

package/dist/cli/jhipster-command.mjs CHANGED Viewed

@@ -192,9 +192,13 @@ export default class JHipsterCommand extends Command {
         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);
+        // Passing default to `commander` (`.default(optionDefinition.default)`), will set at options passed to initial generator, so it's used in entire generation process.
+        // We want default value to be set on jhipster options parsing so ignore default at commander.
+        let defaultDescription = '';
+        if (optionDefinition.default !== undefined && (!Array.isArray(optionDefinition.default) || optionDefinition.default.length !== 0)) {
+            defaultDescription = ` (default: ${optionDefinition.default})`;
+        }
+        const option = new Option(cmdString, optionDefinition.description + defaultDescription + additionalDescription).hideHelp(optionDefinition.hide ?? false);
         if (optionDefinition.env) {
             option.env(optionDefinition.env);
         }

package/dist/cli/program.mjs CHANGED Viewed

@@ -199,7 +199,7 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
                 const boostrapGen = ['bootstrap', generator];
                 const allDependencies = await buildAllDependencies(boostrapGen, {
                     env,
-                    blueprintNamespaces: blueprint ? [] : envBuilder.getBlueprintsNamespaces(),
+                    blueprintNamespaces: envBuilder.getBlueprintsNamespaces(),
                 });
                 for (const [metaName, { meta: generatorMeta, blueprintNamespace }] of Object.entries(allDependencies)) {
                     if (blueprintNamespace) {
@@ -232,7 +232,7 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
             };
             if (options.installPath) {
                 // eslint-disable-next-line no-console
-                console.log(`Using jhipster at ${path.dirname(__dirname)}`);
+                console.log(path.dirname(__dirname));
                 return Promise.resolve();
             }
             printLogo();

package/dist/generators/angular/cleanup.mjs CHANGED Viewed

@@ -273,4 +273,11 @@ export default function cleanupOldFilesTask({ application }) {
         this.removeFile(`${application.clientSrcDir}app/admin/tracker/tracker.module.ts`);
         this.removeFile(`${application.clientSrcDir}app/account/account.module.ts`);
     }
+    if (this.isJhipsterVersionLessThan('8.0.1')) {
+        this.removeFile(`${application.clientSrcDir}app/layouts/main/main.module.ts`);
+        this.removeFile(`${application.clientSrcDir}app/admin/admin-routing.module.ts`);
+        this.removeFile(`${application.clientSrcDir}app/app.module.ts`);
+        this.removeFile(`${application.clientSrcDir}app/app-routing.module.ts`);
+        this.removeFile(`${application.clientSrcDir}app/entities/entity-routing.module.ts`);
+    }
 }

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

@@ -54,7 +54,7 @@ export const files = {
         },
         {
             ...clientApplicationTemplatesBlock(),
-            templates: ['app.module.ts', 'app-routing.module.ts', 'app.constants.ts', 'app-page-title-strategy.ts'],
+            templates: ['app.config.ts', 'app.component.ts', 'app.routes.ts', 'app.constants.ts', 'app-page-title-strategy.ts'],
         },
     ],
     microfrontend: [
@@ -74,7 +74,7 @@ export const files = {
             templates: [
                 // entities
                 'entities/entity-navbar-items.ts',
-                'entities/entity-routing.module.ts',
+                'entities/entity.routes.ts',
                 // home module
                 'home/home.component.ts',
                 'home/home.component.html',
@@ -84,7 +84,6 @@ export const files = {
                 'layouts/profiles/profile-info.model.ts',
                 'layouts/main/main.component.ts',
                 'layouts/main/main.component.html',
-                'layouts/main/main.module.ts',
                 'layouts/navbar/navbar-item.model.d.ts',
                 'layouts/navbar/navbar.component.ts',
                 'layouts/navbar/navbar.component.html',
@@ -170,7 +169,7 @@ export const files = {
             condition: generator => !generator.applicationTypeMicroservice,
             ...clientApplicationTemplatesBlock(),
             templates: [
-                'admin/admin-routing.module.ts',
+                'admin/admin.routes.ts',
                 'admin/docs/docs.component.ts',
                 'admin/docs/docs.component.html',
                 'admin/docs/docs.component.scss',

package/dist/generators/angular/generator.mjs CHANGED Viewed

@@ -18,7 +18,7 @@
  */
 import * as _ from 'lodash-es';
 import chalk from 'chalk';
-import { isFilePending } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_ANGULAR, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.mjs';
 import { defaultLanguage } from '../languages/support/index.mjs';
@@ -63,7 +63,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
                     this.addEntitiesToModule({ application, entities });
                     this.addEntitiesToMenu({ application, entities });
                 };
-                source.addAdminRoute = (args) => this.editFile(`${application.srcMainWebapp}app/admin/admin-routing.module.ts`, addRoute({
+                source.addAdminRoute = (args) => this.editFile(`${application.srcMainWebapp}app/admin/admin.routes.ts`, addRoute({
                     needle: 'add-admin-route',
                     ...args,
                 }));
@@ -102,6 +102,13 @@ export default class AngularGenerator extends BaseApplicationGenerator {
                 const entities = this.sharedData.getEntities().map(({ entity }) => entity);
                 this.localEntities = entities.filter(entity => !entity.builtIn && !entity.skipClient);
             },
+            queueTranslateTransform({ control, application }) {
+                this.queueTransformStream({
+                    name: 'translating angular application',
+                    filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && isTranslatedAngularFile(file),
+                    refresh: false,
+                }, translateAngularFilesTransform(control.getWebappTranslation, application.enableTranslation));
+            },
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
@@ -111,12 +118,6 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         return this.asWritingTaskGroup({
             cleanupOldFilesTask,
             writeFiles,
-            queueTranslateTransform({ control, application }) {
-                this.queueTransformStream(translateAngularFilesTransform(control.getWebappTranslation, application.enableTranslation), {
-                    name: 'translating webapp',
-                    streamOptions: { filter: file => isFilePending(file) && isTranslatedAngularFile(file) },
-                });
-            },
         });
     }
     get [BaseApplicationGenerator.WRITING]() {
@@ -176,19 +177,6 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     addVendorSCSSStyle(style, comment) {
         this.needleApi.clientAngular.addVendorSCSSStyle(style, comment);
     }
-    /**
-     * @private
-     * Add a new admin in the TS modules file.
-     *
-     * @param {string} appName - Angular2 application name.
-     * @param {string} adminAngularName - The name of the new admin item.
-     * @param {string} adminFolderName - The name of the folder.
-     * @param {string} adminFileName - The name of the file.
-     * @param {boolean} enableTranslation - If translations are enabled or not.
-     */
-    addAdminToModule(appName, adminAngularName, adminFolderName, adminFileName, enableTranslation) {
-        this.needleApi.clientAngular.addToAdminModule(appName, adminAngularName, adminFolderName, adminFileName, enableTranslation);
-    }
     /**
      * @private
      * Add a new lazy loaded module to admin routing file.
@@ -244,7 +232,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         this.editFile(filePath, { ignoreNonExisting }, editCallback);
     }
     addEntitiesToModule({ application, entities }) {
-        const filePath = `${application.clientSrcDir}app/entities/entity-routing.module.ts`;
+        const filePath = `${application.clientSrcDir}app/entities/entity.routes.ts`;
         const ignoreNonExisting = chalk.yellow(`Route(s) not added to ${filePath}.`);
         const addRouteCallback = addEntitiesRoute({ application, entities });
         this.editFile(filePath, { ignoreNonExisting }, addRouteCallback);

package/dist/generators/angular/needle-api/needle-client-angular.mjs CHANGED Viewed

@@ -34,17 +34,11 @@ export default class extends needleClientBase {
         super.addStyle(style, comment, filePath, 'jhipster-needle-scss-add-vendor');
     }
     addModule(appName, angularName, folderName, fileName, enableTranslation) {
-        const modulePath = `${this.clientSrcDir}app/app.module.ts`;
+        const modulePath = `${this.clientSrcDir}app/app.config.ts`;
         const importNeedle = 'jhipster-needle-angular-add-module-import';
         const moduleNeedle = 'jhipster-needle-angular-add-module';
         this._genericAddModule(appName, angularName, folderName, fileName, enableTranslation, ANGULAR, modulePath, importNeedle, moduleNeedle);
     }
-    addToAdminModule(appName, adminAngularName, adminFolderName, adminFileName, enableTranslation) {
-        const adminModulePath = `${this.clientSrcDir}app/admin/admin-routing.module.ts`;
-        const importNeedle = 'jhipster-needle-add-admin-module-import';
-        const moduleNeedle = 'jhipster-needle-add-admin-module';
-        this._genericAddModule(appName, adminAngularName, adminFolderName, adminFileName, enableTranslation, ANGULAR, adminModulePath, importNeedle, moduleNeedle);
-    }
     _genericAddModule(appName, angularName, folderName, fileName, enableTranslation, clientFramework, modulePath, importNeedle, moduleNeedle) {
         const errorMessage = `${chalk.yellow('Reference to ') + angularName + folderName + fileName + enableTranslation + clientFramework} ${chalk.yellow(`not added to ${modulePath}.\n`)}`;
         const importRewriteFileModel = this._generateRewriteFileModelWithImportStatement(appName, angularName, folderName, fileName, modulePath, importNeedle);
@@ -130,7 +124,7 @@ export default class extends needleClientBase {
         }));
     }
     addAdminRoute(route, modulePath, moduleName, pageTitle) {
-        const adminModulePath = `${this.clientSrcDir}app/admin/admin-routing.module.ts`;
+        const adminModulePath = `${this.clientSrcDir}app/admin/admin.routes.ts`;
         this._addRoute(route, modulePath, moduleName, 'jhipster-needle-add-admin-route', adminModulePath, pageTitle);
     }
 }

package/dist/generators/angular/resources/package.json CHANGED Viewed

@@ -1,51 +1,52 @@
 {
   "dependencies": {
-    "@angular/common": "16.2.9",
-    "@fortawesome/angular-fontawesome": "0.13.0",
-    "@fortawesome/fontawesome-svg-core": "6.4.2",
-    "@fortawesome/free-solid-svg-icons": "6.4.2",
-    "@ng-bootstrap/ng-bootstrap": "15.1.1",
+    "@angular/common": "17.0.6",
+    "@fortawesome/angular-fontawesome": "0.14.0",
+    "@fortawesome/fontawesome-svg-core": "6.5.1",
+    "@fortawesome/free-solid-svg-icons": "6.5.1",
+    "@ng-bootstrap/ng-bootstrap": "16.0.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
     "bootstrap": "5.3.2",
     "bootswatch": "5.3.2",
-    "ngx-cookie-service": "16.0.1",
-    "ngx-infinite-scroll": "16.0.0",
+    "ngx-cookie-service": "17.0.1",
+    "ngx-infinite-scroll": "17.0.0",
     "rxjs": "7.8.1",
     "tslib": "2.6.2",
-    "zone.js": "0.13.3"
+    "zone.js": "0.14.2"
   },
   "devDependencies": {
-    "@angular-architects/module-federation-runtime": "16.0.4",
-    "@angular-builders/custom-webpack": "16.0.1",
-    "@angular-builders/jest": "16.0.1",
-    "@angular-eslint/eslint-plugin": "16.2.0",
-    "@angular/cli": "16.2.6",
-    "@types/jest": "29.5.5",
-    "@types/node": "18.18.5",
-    "@typescript-eslint/eslint-plugin": "6.7.5",
+    "@angular-architects/module-federation": "17.0.1",
+    "@angular-architects/module-federation-runtime": "17.0.1",
+    "@angular-builders/custom-webpack": "17.0.0",
+    "@angular-builders/jest": "17.0.0",
+    "@angular-eslint/eslint-plugin": "17.1.1",
+    "@angular/cli": "17.0.6",
+    "@types/jest": "29.5.11",
+    "@types/node": "18.19.3",
+    "@typescript-eslint/eslint-plugin": "6.13.2",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.51.0",
-    "eslint-config-prettier": "9.0.0",
+    "eslint": "8.55.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
     "jest": "29.7.0",
     "jest-date-mock": "1.0.8",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "13.1.2",
+    "jest-preset-angular": "13.1.4",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "4.0.8",
+    "postcss-rtlcss": "4.0.9",
     "rimraf": "5.0.5",
     "ts-jest": "29.1.1",
-    "typescript": "5.1.6",
-    "webpack": "5.88.2",
-    "webpack-bundle-analyzer": "4.9.1",
-    "webpack-merge": "5.9.0",
+    "typescript": "5.2.2",
+    "webpack": "5.89.0",
+    "webpack-bundle-analyzer": "4.10.1",
+    "webpack-merge": "5.10.0",
     "webpack-notifier": "1.15.0"
   }
 }

package/dist/generators/angular/support/translate-angular.mjs CHANGED Viewed

@@ -94,8 +94,8 @@ function replaceErrorMessage(getWebappTranslation, content) {
  * @this {import('../generator-base.js')}
  */
 export const createTranslationReplacer = (getWebappTranslation, enableTranslation) => {
-    const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation);
-    const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation);
+    const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation, { escapeHtml: true });
+    const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation, { escapeHtml: true });
     return function replaceAngularTranslations(content, filePath) {
         if (/\.html$/.test(filePath)) {
             if (!enableTranslation) {

package/dist/generators/angular/templates/README.md.jhi.client.angular.ejs CHANGED Viewed

@@ -39,7 +39,7 @@ will generate few files:
 ```
 create <%= clientSrcDir %>app/my-component/my-component.component.html
 create <%= clientSrcDir %>app/my-component/my-component.component.ts
-update <%= clientSrcDir %>app/app.module.ts
+update <%= clientSrcDir %>app/app.config.ts
 ```
 <&_ } -&>

package/dist/generators/angular/templates/angular.json.ejs CHANGED Viewed

@@ -48,11 +48,7 @@
 <%_ if (communicationSpringWebsocket) { _%>
               "./<%= this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill",
 <%_ } _%>
-<%_ if (microfrontend) { _%>
-              "zone.js/dist/zone"
-<%_ } else { _%>
               "zone.js"
-<%_ } _%>
             ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
@@ -106,15 +102,15 @@
         "serve": {
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
-            "browserTarget": "<%= dasherizedBaseName %>:build:development",
+            "buildTarget": "<%= dasherizedBaseName %>:build:development",
             "port": <%= devServerPort %>
           },
           "configurations": {
             "production": {
-              "browserTarget": "<%= dasherizedBaseName %>:build:production"
+              "buildTarget": "<%= dasherizedBaseName %>:build:production"
             },
             "development": {
-              "browserTarget": "<%= dasherizedBaseName %>:build:development"
+              "buildTarget": "<%= dasherizedBaseName %>:build:development"
             }
           },
           "defaultConfiguration": "development"

package/dist/generators/angular/templates/package.json.ejs CHANGED Viewed

@@ -57,16 +57,17 @@
 <%_ if (communicationSpringWebsocket) { _%>
     "sockjs-client": "1.6.1",
     "@stomp/rx-stomp": "1.2.0",
-<%_ } _%>
-<%_ if (skipServer) { _%>
-    "sonar-scanner": "3.1.0",
 <%_ } _%>
     "tslib": "<%= nodeDependencies['tslib'] %>",
     "zone.js": "<%= nodeDependencies['zone.js'] %>"
   },
   "devDependencies": {
+<%_ if (skipServer) { _%>
+    "sonar-scanner": "3.1.0",
+<%_ } _%>
 <%_ if (microfrontend && applicationTypeGateway) { _%>
     "@angular-architects/module-federation-runtime": "<%= nodeDependencies['@angular-architects/module-federation-runtime'] %>",
+    "@angular-architects/module-federation": "<%= nodeDependencies['@angular-architects/module-federation'] %>",
 <%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
     "@types/sockjs-client": "1.5.1",
@@ -77,9 +78,6 @@
 <%_ if (enableTranslation) { _%>
     "folder-hash": "<%= nodeDependencies['folder-hash'] %>",
     "merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
-<%_ } _%>
-<%_ if (!skipServer) { _%>
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
 <%_ } _%>
     "@angular/cli": "<%= nodeDependencies['@angular/cli'] %>",
     "@angular/compiler-cli": "<%= nodeDependencies['@angular/common'] %>",
@@ -105,8 +103,6 @@
     "jest-date-mock": "<%= nodeDependencies['jest-date-mock'] %>",
     "jest-junit": "<%= nodeDependencies['jest-junit'] %>",
     "jest-sonar": "<%= nodeDependencies['jest-sonar'] %>",
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>",
 <%_ if (enableI18nRTL) { _%>
     "postcss-rtlcss": "<%= nodeDependencies['postcss-rtlcss'] %>",
 <%_ } _%>