Merge branch 'main' into translation-entities

jhipster · Apr 6, 2024 · f24a2ac · f24a2ac
2 parents b0827fb + 9f9132d
commit f24a2ac
Show file tree

Hide file tree

Showing 285 changed files with 4,768 additions and 2,921 deletions.
diff --git a/.blueprint/code-workspace/generator.mjs b/.blueprint/code-workspace/generator.mjs
@@ -1,20 +1,16 @@
 import { join } from 'path';
-import * as _ from 'lodash-es';
+import { merge } from 'lodash-es';
 import BaseGenerator from '../../generators/base/index.js';
 import { getPackageRoot } from '../../lib/index.js';
-import command from './command.mjs';
 import { defaultSamplesFolder, promptSamplesFolder, samplesFolderConfig } from '../support.mjs';
 
-const { merge } = _;
-
 export default class extends BaseGenerator {
   samplePath;
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
-      async initializeOptions() {
-        this.parseJHipsterArguments(command.arguments);
-        this.parseJHipsterOptions(command.options);
+      async parseCommand() {
+        await this.parseCurrentJHipsterCommand();
       },
     });
   }

diff --git a/.blueprint/from-issue/generator.mjs b/.blueprint/from-issue/generator.mjs
@@ -1,7 +1,6 @@
 import { Octokit } from 'octokit';
 import { setOutput } from '@actions/core';
 import BaseGenerator from '../../generators/base/index.js';
-import command from './command.mjs';
 import { promptSamplesFolder } from '../support.mjs';
 import { join } from 'path';
 import { GENERATOR_APP, GENERATOR_JDL } from '../../generators/generator-list.js';
@@ -31,9 +30,8 @@ export default class extends BaseGenerator {
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
-      async initializeOptions() {
-        this.parseJHipsterArguments(command.arguments);
-        this.parseJHipsterOptions(command.options);
+      async parseCommand() {
+        await this.parseCurrentJHipsterCommand();
       },
     });
   }

diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs
@@ -1,7 +1,6 @@
 import { extname } from 'path';
 import { transform } from '@yeoman/transform';
 import BaseGenerator from '../../generators/base/index.js';
-import command from './command.mjs';
 import { generateSample } from './support/generate-sample.js';
 import { promptSamplesFolder } from '../support.mjs';
 import { GENERATOR_APP, GENERATOR_JDL } from '../../generators/generator-list.js';
@@ -13,9 +12,8 @@ export default class extends BaseGenerator {
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
-      async initializeOptions() {
-        this.parseJHipsterArguments(command.arguments);
-        this.parseJHipsterOptions(command.options);
+      async parseCommand() {
+        await this.parseCurrentJHipsterCommand();
       },
     });
   }

diff --git a/.blueprint/update-vscode/generator.mjs b/.blueprint/update-vscode/generator.mjs
@@ -1,15 +1,13 @@
 import { join } from 'path';
 import BaseGenerator from '../../generators/base/index.js';
 import { getPackageRoot } from '../../lib/index.js';
-import command from './command.mjs';
 import { getWorkflowSamples } from '../generate-sample/support/get-workflow-samples.js';
 
 export default class extends BaseGenerator {
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
-      async initializeOptions() {
-        this.parseJHipsterArguments(command.arguments);
-        this.parseJHipsterOptions(command.options);
+      async parseCommand() {
+        await this.parseCurrentJHipsterCommand();
       },
     });
   }

diff --git a/.github/actions/build-matrix/action.yml b/.github/actions/build-matrix/action.yml
@@ -93,7 +93,7 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        node-version: 20.12.0
+        node-version: 20.12.1
     - name: 'Check changes'
       id: build-changes
       run: |

diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.12.0
+          node-version: 20.12.1
       - name: 'SETUP: load npm cache'
         uses: actions/cache/restore@v4
         with:

diff --git a/cli/environment-builder.mjs b/cli/environment-builder.mjs
@@ -21,7 +21,7 @@ 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 { cloneDeep, mergeWith } from 'lodash-es';
 import Environment from 'yeoman-environment';
 import { QueuedAdapter } from '@yeoman/adapter';
 
@@ -407,7 +407,7 @@ export default class EnvironmentBuilder {
         const blueprintCommandsUrl = pathToFileURL(resolve(`${blueprintCommandFile}${blueprintCommandExtension}`));
         try {
           blueprintCommand = (await import(blueprintCommandsUrl)).default;
-          const blueprintCommands = _.cloneDeep(blueprintCommand);
+          const blueprintCommands = cloneDeep(blueprintCommand);
           Object.entries(blueprintCommands).forEach(([_command, commandSpec]) => {
             commandSpec.blueprint = commandSpec.blueprint || blueprint;
           });
@@ -480,7 +480,7 @@ export default class EnvironmentBuilder {
     for (const [blueprint, packagePath] of blueprintPackagePaths) {
       const errorMsg = `No custom sharedOptions found within blueprint: ${blueprint} at ${packagePath}`;
       const opts = await loadSharedOptionsFromFile(`${packagePath}/cli/sharedOptions`, undefined, errorMsg);
-      result = _.mergeWith(result, opts, joiner);
+      result = mergeWith(result, opts, joiner);
     }
     return result;
   }

diff --git a/cli/jhipster-command.mjs b/cli/jhipster-command.mjs
@@ -19,11 +19,9 @@
 
 import chalk from 'chalk';
 import { Command, Option } from 'commander';
-import lodash from 'lodash';
+import { kebabCase } from 'lodash-es';
 import { convertConfigToOption } from '../lib/internal/index.js';
 
-const { kebabCase } = lodash;
-
 export default class JHipsterCommand extends Command {
   createCommand(name) {
     return new JHipsterCommand(name);

diff --git a/generators/java/cleanup.ts → generators/angular/command.ts b/generators/java/cleanup.ts → generators/angular/command.ts
@@ -16,9 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { JHipsterCommandDefinition } from '../base/api.js';
 
-/**
- * Removes server files that where generated in previous JHipster versions and therefore
- * need to be removed.
- */
-export default function cleanupTask() {}
+const command: JHipsterCommandDefinition = {
+  options: {},
+  import: [],
+};
+
+export default command;
diff --git a/generators/angular/generator.spec.ts b/generators/angular/generator.spec.ts
@@ -1,7 +1,7 @@
 import { basename, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { before, it, describe, after, expect } from 'esmocha';
-import lodash from 'lodash';
+import { snakeCase } from 'lodash-es';
 
 import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers } from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js';
@@ -10,8 +10,6 @@ import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
 import { GENERATOR_ANGULAR } from '../generator-list.js';
 
-const { snakeCase } = lodash;
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 

diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { camelCase } from 'lodash-es';
 import chalk from 'chalk';
 import { isFileStateModified } from 'mem-fs-editor/state';
 
@@ -55,7 +55,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
 
   async beforeQueue() {
     if (!this.fromBlueprint) {
-      await this.composeWithBlueprints(GENERATOR_ANGULAR);
+      await this.composeWithBlueprints();
     }
 
     if (!this.delegateToBlueprint) {
@@ -334,7 +334,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
    * @param {boolean} enableTranslation - If translations are enabled or not
    * @param {string} translationKeyMenu - i18n key for entry in the admin menu
    */
-  addElementToAdminMenu(routerName, iconName, enableTranslation, translationKeyMenu = _.camelCase(routerName), jhiPrefix?) {
+  addElementToAdminMenu(routerName, iconName, enableTranslation, translationKeyMenu = camelCase(routerName), jhiPrefix?) {
     this.needleApi.clientAngular.addElementToAdminMenu(routerName, iconName, enableTranslation, translationKeyMenu, jhiPrefix);
   }
 
@@ -450,7 +450,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
    * @param {string} clientFramework - The name of the client framework
    * @param {string} translationKeyMenu - i18n key for entry in the menu
    */
-  addElementToMenu(routerName, iconName, enableTranslation, clientFramework, translationKeyMenu = _.camelCase(routerName)) {
+  addElementToMenu(routerName, iconName, enableTranslation, clientFramework, translationKeyMenu = camelCase(routerName)) {
     this.needleApi.clientAngular.addElementToMenu(routerName, iconName, enableTranslation, translationKeyMenu);
   }
 }
diff --git a/generators/angular/index.ts b/generators/angular/index.ts
@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.js';
+export { default as command } from './command.js';
diff --git a/generators/angular/needle-api/needle-client-angular.ts b/generators/angular/needle-api/needle-client-angular.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { startCase } from 'lodash-es';
 
 import needleClientBase from '../../client/needle-api/needle-client.js';
 import { LINE_LENGTH } from '../../generator-constants.js';
@@ -124,7 +124,7 @@ export default class extends needleClientBase {
     const entityEntry = `<li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
                                 <a class="nav-link" ${routerLink} (click)="collapseNavbar()">
                                     <fa-icon icon="${iconName}" [fixedWidth]="true"></fa-icon>
-                                    <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.${translationKeyMenu}"` : ''}>${_.startCase(routerName)}</span>
+                                    <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.${translationKeyMenu}"` : ''}>${startCase(routerName)}</span>
                                 </a>
                             </li>`;
     const rewriteFileModel = this.generateFileModel(entityMenuPath, 'jhipster-needle-add-element-to-menu', entityEntry);
@@ -142,7 +142,7 @@ export default class extends needleClientBase {
     const entityEntry = `<li>
                         <a class="dropdown-item" ${routerLink} routerLinkActive="active" (click)="collapseNavbar()">
                             <fa-icon icon="${iconName}" [fixedWidth]="true"></fa-icon>
-                            <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.admin.${translationKeyMenu}"` : ''}>${_.startCase(routerName)}</span>
+                            <span${enableTranslation ? ` ${jhiPrefix}Translate="global.menu.admin.${translationKeyMenu}"` : ''}>${startCase(routerName)}</span>
                         </a>
                     </li>`;
     const rewriteFileModel = this.generateFileModel(navbarAdminPath, 'jhipster-needle-add-element-to-admin-menu', entityEntry);

diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "@angular/common": "17.3.2",
+    "@angular/common": "17.3.3",
     "@fortawesome/angular-fontawesome": "0.14.1",
-    "@fortawesome/fontawesome-svg-core": "6.5.1",
-    "@fortawesome/free-solid-svg-icons": "6.5.1",
+    "@fortawesome/fontawesome-svg-core": "6.5.2",
+    "@fortawesome/free-solid-svg-icons": "6.5.2",
     "@ng-bootstrap/ng-bootstrap": "16.0.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
@@ -21,14 +21,14 @@
   "devDependencies": {
     "@angular-architects/module-federation": "17.0.8",
     "@angular-architects/module-federation-runtime": "17.0.8",
-    "@angular-builders/custom-webpack": "17.0.1",
-    "@angular-builders/jest": "17.0.2",
+    "@angular-builders/custom-webpack": "17.0.2",
+    "@angular-builders/jest": "17.0.3",
     "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular/cli": "17.3.2",
+    "@angular/cli": "17.3.3",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
-    "@typescript-eslint/eslint-plugin": "7.4.0",
+    "@typescript-eslint/eslint-plugin": "7.5.0",
     "browser-sync": "3.0.2",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
@@ -46,7 +46,7 @@
     "postcss-rtlcss": "5.1.0",
     "rimraf": "5.0.5",
     "ts-jest": "29.1.2",
-    "typescript": "5.4.3",
+    "typescript": "5.4.4",
     "webpack": "5.91.0",
     "webpack-bundle-analyzer": "4.10.1",
     "webpack-merge": "5.10.0",

diff --git a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs
@@ -24,8 +24,8 @@ import SharedModule from 'app/shared/shared.module';
 import { ActivateService } from './activate.service';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-activate',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-activate',
   imports: [SharedModule, RouterModule],
   templateUrl: './activate.component.html',
 })

diff --git a/.../src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs b/.../src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs
@@ -25,8 +25,8 @@ import SharedModule from 'app/shared/shared.module';
 import { PasswordResetFinishService } from './password-reset-finish.service';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password-reset-finish',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-password-reset-finish',
   imports: [SharedModule, RouterModule, FormsModule, ReactiveFormsModule, PasswordStrengthBarComponent],
   templateUrl: './password-reset-finish.component.html',
 })

diff --git a/...ates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs b/...ates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs
@@ -23,8 +23,8 @@ import SharedModule from 'app/shared/shared.module';
 import { PasswordResetInitService } from './password-reset-init.service';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password-reset-init',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-password-reset-init',
   imports: [SharedModule, FormsModule, ReactiveFormsModule],
   templateUrl: './password-reset-init.component.html',
 })

diff --git a/.../webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs b/.../webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs
@@ -21,8 +21,8 @@ import { Component, ElementRef, inject, Input, Renderer2 } from '@angular/core';
 import SharedModule from 'app/shared/shared.module';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password-strength-bar',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-password-strength-bar',
   imports: [SharedModule],
   templateUrl: './password-strength-bar.component.html',
   styleUrl: './password-strength-bar.component.scss',

diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs
@@ -27,8 +27,8 @@ import { PasswordService } from './password.service';
 import PasswordStrengthBarComponent from './password-strength-bar/password-strength-bar.component';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-password',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-password',
   imports: [SharedModule, FormsModule, ReactiveFormsModule, PasswordStrengthBarComponent],
   templateUrl: './password.component.html',
 })

diff --git a/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs
@@ -30,8 +30,8 @@ import SharedModule from 'app/shared/shared.module';
 import PasswordStrengthBarComponent from '../password/password-strength-bar/password-strength-bar.component';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-register',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-register',
   imports: [SharedModule, RouterModule, FormsModule, ReactiveFormsModule, PasswordStrengthBarComponent],
   templateUrl: './register.component.html',
 })

diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs
@@ -25,8 +25,8 @@ import { SessionsService } from './sessions.service';
 import { Account } from 'app/core/auth/account.model';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-sessions',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-sessions',
   imports: [SharedModule],
   templateUrl: './sessions.component.html',
 })

diff --git a/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs
@@ -32,8 +32,8 @@ import { LANGUAGES } from 'app/config/language.constants';
 const initialAccount: Account = {} as Account;
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-settings',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-settings',
   imports: [SharedModule, FormsModule, ReactiveFormsModule],
   templateUrl: './settings.component.html',
 })

diff --git a/...rs/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs b/...rs/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs
@@ -35,7 +35,7 @@ export class ConfigurationService {
         Object.values(
           Object.values(configProps.contexts)
             .map(context => context.beans)
-            .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }))
+            .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }), {})
         )
       )
     );

diff --git a/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs
@@ -24,8 +24,8 @@ import { TrackerActivity } from 'app/core/tracker/tracker-activity.model';
 import SharedModule from 'app/shared/shared.module';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-tracker',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-tracker',
   imports: [SharedModule],
   templateUrl: './tracker.component.html',
 })